bk: use elastic/vault-secrets and test-collector plugins together (#8311) (#8361)

(cherry picked from commit 9206f0b)

Co-authored-by: Victor Martinez <[email protected]>

Author: mergify[bot]

.buildkite/bk.integration.pipeline.yml

@@ -441,7 +441,11 @@ steps:
     soft_fail:
       - exit_status: "*"
     plugins:
-      - test-collector#v1.10.1:
+      - elastic/vault-secrets#v0.1.0:
+          path: "kv/ci-shared/platform-ingest/buildkite_analytics_token"
+          field: "token"
+          env_var: "BUILDKITE_ANALYTICS_TOKEN"
+      - test-collector#v1.11.0:
           files: "build/*.xml"
           format: "junit"
           branches: "main"

.buildkite/hooks/pre-command

@@ -58,18 +58,6 @@ if [[ "$BUILDKITE_STEP_KEY" == *"integration-tests"* ]]; then
   export API_KEY_TOKEN=$(vault kv get -field apiKey ${CI_ESS_PATH})
   echo ${API_KEY_TOKEN} > ./apiKey
   export TEST_INTEG_AUTH_ESS_APIKEY_FILE=$(realpath ./apiKey)
-
-  # BK analytics
-  echo "--- Prepare BK test analytics token :vault:"
-  BUILDKITE_ANALYTICS_TOKEN=$(vault kv get -field token kv/ci-shared/platform-ingest/buildkite_analytics_token)
-  export BUILDKITE_ANALYTICS_TOKEN
-fi
-
-if [[ "$BUILDKITE_STEP_KEY" == *"aggregate-reports"* ]]; then
-  # BK analytics
-  echo "--- Prepare BK test analytics token :vault:"
-  BUILDKITE_ANALYTICS_TOKEN=$(vault kv get -field token kv/ci-shared/platform-ingest/buildkite_analytics_token)
-  export BUILDKITE_ANALYTICS_TOKEN
 fi
 
 if [[ "$BUILDKITE_PIPELINE_SLUG" == "elastic-agent-binary-dra" ]]; then

.buildkite/scripts/steps/integration_tests_tf.sh

@@ -52,12 +52,6 @@ else
   export KIBANA_PASSWORD=$(buildkite-agent meta-data get "kibana.pwd")
 fi
 
-# TODO: move to common.sh when it's refactored
-# BK analytics
-echo "--- Prepare BK test analytics token :vault:"
-BUILDKITE_ANALYTICS_TOKEN=$(vault kv get -field token kv/ci-shared/platform-ingest/buildkite_analytics_token)
-export BUILDKITE_ANALYTICS_TOKEN
-
 # Run integration tests
 echo "~~~ Running integration tests"
 

docs/test-framework-dev-guide.md

@@ -351,7 +351,11 @@ out weight the benefits of creating another group.
           machineType: "n1-standard-8"
           image: "family/platform-ingest-elastic-agent-ubuntu-2404"
         plugins:
-          - test-collector#v1.10.1:
+          - elastic/vault-secrets#v0.1.0:
+              path: "kv/ci-shared/platform-ingest/buildkite_analytics_token"
+              field: "token"
+              env_var: "BUILDKITE_ANALYTICS_TOKEN"
+          - test-collector#v1.11.0:
               files: "build/TEST-*.xml"
               format: "junit"
               branches: "main"