From fbb93c2a1fd637d0bc48a0bb0cd75ccb8174bf35 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Tue, 19 Dec 2023 11:42:00 +0100 Subject: [PATCH 1/4] Update bucket name --- .buildkite/scripts/integration_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/scripts/integration_tests.sh b/.buildkite/scripts/integration_tests.sh index 335d96b806..c676adc0d6 100755 --- a/.buildkite/scripts/integration_tests.sh +++ b/.buildkite/scripts/integration_tests.sh @@ -40,7 +40,7 @@ KIND_TARGET="test-check-packages-with-kind" TMP_FOLDER_TEMPLATE="${TMP_FOLDER_TEMPLATE_BASE}.XXXXXXXXX" GOOGLE_CREDENTIALS_FILENAME="google-cloud-credentials.json" -JOB_GCS_BUCKET_INTERNAL="fleet-ci-temp-internal" +JOB_GCS_BUCKET_INTERNAL="ingest-bucket-ci" REPO_NAME=$(repo_name "${BUILDKITE_REPO}") REPO_BUILD_TAG="${REPO_NAME}/$(buildkite_pr_branch_build_id)" From d7b9d8e82fc2468b1d7e55cf19278cea0ad679b4 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Tue, 19 Dec 2023 12:11:35 +0100 Subject: [PATCH 2/4] Update bucket name --- .buildkite/scripts/integration_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/scripts/integration_tests.sh b/.buildkite/scripts/integration_tests.sh index c676adc0d6..85e2be2a0f 100755 --- a/.buildkite/scripts/integration_tests.sh +++ b/.buildkite/scripts/integration_tests.sh @@ -40,7 +40,7 @@ KIND_TARGET="test-check-packages-with-kind" TMP_FOLDER_TEMPLATE="${TMP_FOLDER_TEMPLATE_BASE}.XXXXXXXXX" GOOGLE_CREDENTIALS_FILENAME="google-cloud-credentials.json" -JOB_GCS_BUCKET_INTERNAL="ingest-bucket-ci" +JOB_GCS_BUCKET_INTERNAL="ingest-buildkite-ci" REPO_NAME=$(repo_name "${BUILDKITE_REPO}") REPO_BUILD_TAG="${REPO_NAME}/$(buildkite_pr_branch_build_id)" From f3cfd2c8c8ac00d3e086b5beb7b7cc24c7d6d4ce Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Wed, 20 Dec 2023 10:06:49 +0100 Subject: [PATCH 3/4] Update vault path --- .buildkite/hooks/pre-command | 3 ++- .buildkite/scripts/integration_tests.sh | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index 0a873082e0..bc797035d9 100644 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -12,7 +12,7 @@ GITHUB_TOKEN_VAULT_PATH=kv/ci-shared/platform-ingest/github_token JENKINS_API_TOKEN_PATH=kv/ci-shared/platform-ingest/jenkins_api_tokens SIGNING_PACKAGES_GCS_CREDENTIALS_PATH=kv/ci-shared/platform-ingest/signing_packages_gcs_artifacts_credentials PACKAGE_UPLOADER_GCS_CREDENTIALS_PATH=kv/ci-shared/platform-ingest/package_storage_uploader -PRIVATE_CI_GCS_CREDENTIALS_PATH=kv/ci-shared/platform-ingest/private_ci_artifacts_gcs_credentials +PRIVATE_CI_GCS_CREDENTIALS_PATH=kv/ci-shared/platform-ingest/gcp-platform-ingest-ci-service-account # Secrets must be redacted # https://buildkite.com/docs/pipelines/managing-log-output#redacted-environment-variables @@ -20,6 +20,7 @@ PRIVATE_CI_GCS_CREDENTIALS_PATH=kv/ci-shared/platform-ingest/private_ci_artifact if [[ "$BUILDKITE_PIPELINE_SLUG" == "elastic-package" && ("$BUILDKITE_STEP_KEY" =~ ^integration-parallel || "$BUILDKITE_STEP_KEY" =~ ^integration-false_positives) ]]; then PRIVATE_CI_GCS_CREDENTIALS_SECRET=$(retry 5 vault kv get -field plaintext ${PRIVATE_CI_GCS_CREDENTIALS_PATH}) export PRIVATE_CI_GCS_CREDENTIALS_SECRET + export JOB_GCS_BUCKET_INTERNAL="ingest-buildkite-ci" fi if [[ "$BUILDKITE_PIPELINE_SLUG" == "elastic-package" && "$BUILDKITE_STEP_KEY" == "integration-parallel-gcp" ]]; then diff --git a/.buildkite/scripts/integration_tests.sh b/.buildkite/scripts/integration_tests.sh index 92db9caf86..101a48a10d 100755 --- a/.buildkite/scripts/integration_tests.sh +++ b/.buildkite/scripts/integration_tests.sh @@ -41,8 +41,6 @@ KIND_TARGET="test-check-packages-with-kind" TMP_FOLDER_TEMPLATE="${TMP_FOLDER_TEMPLATE_BASE}.XXXXXXXXX" GOOGLE_CREDENTIALS_FILENAME="google-cloud-credentials.json" -JOB_GCS_BUCKET_INTERNAL="ingest-buildkite-ci" - REPO_NAME=$(repo_name "${BUILDKITE_REPO}") REPO_BUILD_TAG="${REPO_NAME}/$(buildkite_pr_branch_build_id)" TARGET="" From 14c8a0930dd7f20b65f200fdb26a6cf907e665d2 Mon Sep 17 00:00:00 2001 From: Mario Rodriguez Molins Date: Wed, 20 Dec 2023 10:37:19 +0100 Subject: [PATCH 4/4] Set format json --- .buildkite/hooks/pre-command | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index bc797035d9..965b12a64d 100644 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -18,7 +18,7 @@ PRIVATE_CI_GCS_CREDENTIALS_PATH=kv/ci-shared/platform-ingest/gcp-platform-ingest # https://buildkite.com/docs/pipelines/managing-log-output#redacted-environment-variables if [[ "$BUILDKITE_PIPELINE_SLUG" == "elastic-package" && ("$BUILDKITE_STEP_KEY" =~ ^integration-parallel || "$BUILDKITE_STEP_KEY" =~ ^integration-false_positives) ]]; then - PRIVATE_CI_GCS_CREDENTIALS_SECRET=$(retry 5 vault kv get -field plaintext ${PRIVATE_CI_GCS_CREDENTIALS_PATH}) + PRIVATE_CI_GCS_CREDENTIALS_SECRET=$(retry 5 vault kv get -field plaintext -format=json ${PRIVATE_CI_GCS_CREDENTIALS_PATH}) export PRIVATE_CI_GCS_CREDENTIALS_SECRET export JOB_GCS_BUCKET_INTERNAL="ingest-buildkite-ci" fi