Test windows scope

elastic · Nov 28, 2024 · 8b2f418 · 8b2f418
1 parent 6fe59bc
commit 8b2f418
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/.buildkite/bk.integration.pipeline.yml b/.buildkite/bk.integration.pipeline.yml
@@ -6,21 +6,21 @@ env:
   ASDF_MAGE_VERSION: 1.14.0
 
 steps:
-  - label: "Integration tests: packaging"
-    key: "package-it"
-    command: ".buildkite/scripts/steps/integration-package.sh"
-    artifact_paths:
-      - build/distributions/**
-    agents:
-      provider: "gcp"
-      machineType: "n1-standard-8"
+  # - label: "Integration tests: packaging"
+  #   key: "package-it"
+  #   command: ".buildkite/scripts/steps/integration-package.sh"
+  #   artifact_paths:
+  #     - build/distributions/**
+  #   agents:
+  #     provider: "gcp"
+  #     machineType: "n1-standard-8"
 
   - label: Start ESS stack for integration tests
     key: integration-ess
     env:
       ASDF_TERRAFORM_VERSION: 1.9.2
-    depends_on:
-      - package-it
+    # depends_on:
+    #   - package-it
     command: |
       #!/usr/bin/env bash
       set -euo pipefail
@@ -36,9 +36,10 @@ steps:
     key: integration-tests-win
     depends_on:
       - integration-ess
-      - package-it
+      # - package-it
     steps:
       - label: "Win2022:sudo:{{matrix}}"
+        skip: true
         command: |
           .buildkite/scripts/set-bk-analytics-token.ps1
           buildkite-agent artifact download build/distributions/** . --step 'package-it'
@@ -53,7 +54,7 @@ steps:
           - test-collector#v1.10.1:
               files: "build/TEST-*.xml"
               format: "junit"
-              # branches: "main"
+              branches: "main"
               debug: true
         matrix:
           - default
@@ -64,7 +65,7 @@ steps:
       - label: "Win2022:non-sudo:{{matrix}}"
         command: |
           .buildkite/scripts/set-bk-analytics-token.ps1
-          buildkite-agent artifact download build/distributions/** . --step 'package-it'
+          buildkite-agent artifact download build/distributions/** . --step 'package-it' --build 019372af-c893-4837-adf1-00d1548f0c80
           .buildkite/scripts/integration-tests.ps1 {{matrix}} false
         artifact_paths:
           - build/**
@@ -76,7 +77,7 @@ steps:
           - test-collector#v1.10.1:
               files: "build/TEST-*.xml"
               format: "junit"
-              branches: "main"
+              # branches: "main"
               debug: true
         matrix:
           - default
@@ -85,12 +86,12 @@ steps:
     key: integration-tests-ubuntu
     depends_on:
       - integration-ess
-      - package-it
+      # - package-it
     steps:
       - label: "x86_64:non-sudo: {{matrix}}"
         command: |
           source .buildkite/scripts/set-bk-analytics-token.sh
-          buildkite-agent artifact download build/distributions/** . --step 'package-it'
+          buildkite-agent artifact download build/distributions/** . --step 'package-it' --build 019372af-c893-4837-adf1-00d1548f0c80
           .buildkite/scripts/steps/integration_tests_tf.sh {{matrix}} false
         artifact_paths:
           - build/**
@@ -108,6 +109,7 @@ steps:
           - default
 
       - label: "x86_64:sudo: {{matrix}}"
+        skip: true
         command: |
           source .buildkite/scripts/set-bk-analytics-token.sh
           buildkite-agent artifact download build/distributions/** . --step 'package-it'
@@ -137,6 +139,7 @@ steps:
           - fleet-airgapped-privileged
 
       - label: "arm:sudo: {{matrix}}"
+        skip: true
         command: |
           source .buildkite/scripts/set-bk-analytics-token.sh
           buildkite-agent artifact download build/distributions/** . --step 'package-it'
@@ -166,6 +169,7 @@ steps:
           - fleet-airgapped-privileged
 
       - label: "arm:non-sudo: {{matrix}}"
+        skip: true
         command: |
           source .buildkite/scripts/set-bk-analytics-token.sh
           buildkite-agent artifact download build/distributions/** . --step 'package-it'
@@ -186,6 +190,7 @@ steps:
           - default
 
   - group: "Stateful(Sudo):RHEL8"
+    skip: true
     key: integration-tests-rhel8
     depends_on:
       - package-it

diff --git a/.buildkite/scripts/set-bk-analytics-token.ps1 b/.buildkite/scripts/set-bk-analytics-token.ps1
@@ -6,4 +6,4 @@ Write-Host "--- Set BUILDKITE_ANALYTICS_TOKEN :vault:"
 $BUILDKITE_ANALYTICS_TOKEN = Retry-Command -ScriptBlock {
   vault kv get -field=token kv/ci-shared/platform-ingest/buildkite_analytics_token
 }
-[System.Environment]::SetEnvironmentVariable("BUILDKITE_ANALYTICS_TOKEN", $BUILDKITE_ANALYTICS_TOKEN, [System.EnvironmentVariableTarget]::Machine)
+[System.Environment]::SetEnvironmentVariable("BUILDKITE_ANALYTICS_TOKEN", $BUILDKITE_ANALYTICS_TOKEN, [System.EnvironmentVariableTarget]::User)
diff --git a/.buildkite/scripts/set-bk-analytics-token.sh b/.buildkite/scripts/set-bk-analytics-token.sh
@@ -1,5 +1,7 @@
 # !/bin/bash
 set -euo pipefail
+source .buildkite/scripts/retry.sh
+
 echo "--- Set BUILDKITE_ANALYTICS_TOKEN :vault:"
 BUILDKITE_ANALYTICS_TOKEN=$(retry 5 vault kv get -field token kv/ci-shared/platform-ingest/buildkite_analytics_token)
 export BUILDKITE_ANALYTICS_TOKEN