Update compute engine script (#3040)

* update compute engine script * fix test gcp dm wf * fix test gcp dm wf
elastic · Feb 19, 2025 · 581c207 · 581c207
1 parent d11abd3
commit 581c207
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/test-gcp-dm.yml b/.github/workflows/test-gcp-dm.yml
@@ -84,6 +84,7 @@ jobs:
         id: cspm-gcp-integration
         working-directory: ${{ env.INTEGRATIONS_SETUP_DIR }}
         env:
+          AGENT_VERSION: ${{ env.ELK_VERSION }}
           STACK_VERSION: ${{ env.ELK_VERSION }}
           DEPLOYMENT_NAME: ${{env.GCP_DEPLOYMENT_NAME}}
         run: |
@@ -188,6 +189,7 @@ jobs:
       - name: Deploy GCP Service Account and Agent
         id: gcp_deploy
         env:
+          AGENT_VERSION: ${{ env.ELK_VERSION }}
           STACK_VERSION: ${{ env.ELK_VERSION }}
         run: |
           # Deploys a GCP Service Account

diff --git a/deploy/deployment-manager/compute_engine.py b/deploy/deployment-manager/compute_engine.py
@@ -33,6 +33,10 @@ def generate_config(context):
         },
     }
 
+    cmnd = "sudo ./elastic-agent install --non-interactive"
+    if agent_version.startswith("9."):
+        cmnd = f"{cmnd} --install-servers"
+
     instance = {
         "name": deployment_name,
         "type": "compute.v1.instance",
@@ -89,9 +93,7 @@ def generate_config(context):
                                 f"curl -L -O {artifact_server}/$ElasticAgentArtifact.tar.gz\n",
                                 "tar xzvf $ElasticAgentArtifact.tar.gz\n",
                                 "cd $ElasticAgentArtifact\n",
-                                "sudo ./elastic-agent install ",
-                                "--non-interactive --install-servers ",
-                                f"--url={fleet_url} --enrollment-token={enrollment_token}",
+                                f"{cmnd} --url={fleet_url} --enrollment-token={enrollment_token}",
                             ],
                         ),
                     },