diff --git a/.ci/packaging.groovy b/.ci/packaging.groovy index 0cc1110e084..4df1b5a4cbc 100644 --- a/.ci/packaging.groovy +++ b/.ci/packaging.groovy @@ -17,6 +17,7 @@ pipeline { JOB_GCS_BUCKET = 'beats-ci-artifacts' JOB_GCS_BUCKET_STASH = 'beats-ci-temp' JOB_GCS_CREDENTIALS = 'beats-ci-gcs-plugin' + JOB_GCS_EXT_CREDENTIALS = 'beats-ci-gcs-plugin-file-credentials' DOCKERELASTIC_SECRET = 'secret/observability-team/ci/docker-registry/prod' DOCKER_REGISTRY = 'docker.elastic.co' GITHUB_CHECK_E2E_TESTS_NAME = 'E2E Tests' @@ -450,7 +451,7 @@ def publishPackages(baseDir){ def uploadPackages(bucketUri, beatsFolder){ googleStorageUploadExt(bucket: bucketUri, - credentialsId: "${JOB_GCS_CREDENTIALS}", + credentialsId: "${JOB_GCS_EXT_CREDENTIALS}", pattern: "${beatsFolder}/build/distributions/**/*", sharedPublicly: true) } diff --git a/Jenkinsfile b/Jenkinsfile index e776a765d86..55405b8cff3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,6 +14,7 @@ pipeline { DOCKER_REGISTRY = 'docker.elastic.co' JOB_GCS_BUCKET = 'beats-ci-temp' JOB_GCS_CREDENTIALS = 'beats-ci-gcs-plugin' + JOB_GCS_EXT_CREDENTIALS = 'beats-ci-gcs-plugin-file-credentials' OSS_MODULE_PATTERN = '^[a-z0-9]+beat\\/module\\/([^\\/]+)\\/.*' PIPELINE_LOG_LEVEL = 'INFO' PYTEST_ADDOPTS = "${params.PYTEST_ADDOPTS}" @@ -312,7 +313,7 @@ def publishPackages(beatsFolder){ */ def uploadPackages(bucketUri, beatsFolder){ googleStorageUploadExt(bucket: bucketUri, - credentialsId: "${JOB_GCS_CREDENTIALS}", + credentialsId: "${JOB_GCS_EXT_CREDENTIALS}", pattern: "${beatsFolder}/build/distributions/**/*", sharedPublicly: true) } @@ -691,7 +692,7 @@ def archiveTestOutput(Map args = [:]) { def tarAndUploadArtifacts(Map args = [:]) { tar(file: args.file, dir: args.location, archive: false, allowMissing: true) googleStorageUploadExt(bucket: "gs://${JOB_GCS_BUCKET}/${env.JOB_NAME}-${env.BUILD_ID}", - credentialsId: "${JOB_GCS_CREDENTIALS}", + credentialsId: "${JOB_GCS_EXT_CREDENTIALS}", pattern: "${args.file}", sharedPublicly: true) }