From 7cc61f8af6b5d1bfa7b245d064c214958422b784 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Thu, 18 Aug 2022 11:44:33 +0200 Subject: [PATCH 1/2] Try parameters2 syntax on triggerRemoteJob --- .ci/package-storage-publish.groovy | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.ci/package-storage-publish.groovy b/.ci/package-storage-publish.groovy index 35b0ab179b..a56ccca940 100644 --- a/.ci/package-storage-publish.groovy +++ b/.ci/package-storage-publish.groovy @@ -110,7 +110,9 @@ def signUnpublishedArtifactsWithElastic(builtPackagesPath) { triggerRemoteJob(auth: CredentialsAuth(credentials: 'local-readonly-api-token'), job: 'https://internal-ci.elastic.co/job/elastic+unified-release+master+sign-artifacts-with-gpg', token: TOKEN, - parameters: "gcs_input_path=${env.INFRA_SIGNING_BUCKET_ARTIFACTS_PATH}", + parameters2: [ + gcs_input_path: env.INFRA_SIGNING_BUCKET_ARTIFACTS_PATH, + ], useCrumbCache: false, useJobInfoCache: false) } @@ -137,13 +139,13 @@ def uploadUnpublishedToPackageStorage(builtPackagesPath) { triggerRemoteJob(auth: CredentialsAuth(credentials: 'local-readonly-api-token'), job: 'https://internal-ci.elastic.co/job/package_storage/job/publishing-job-remote', token: TOKEN, - parameters: """ - dry_run=true - gs_package_build_zip_path=${env.PACKAGE_STORAGE_INTERNAL_BUCKET_QUEUE_PUBLISHING_PATH}/${packageZip} - gs_package_signature_path=${env.PACKAGE_STORAGE_INTERNAL_BUCKET_QUEUE_PUBLISHING_PATH}/${packageZip}.sig - """, - useCrumbCache: true, - useJobInfoCache: true) + parameters2: [ + dry_run: true, + gs_package_build_zip_path: "${env.PACKAGE_STORAGE_INTERNAL_BUCKET_QUEUE_PUBLISHING_PATH}/${packageZip}", + gs_package_signature_path: "${env.PACKAGE_STORAGE_INTERNAL_BUCKET_QUEUE_PUBLISHING_PATH}/${packageZip}.sig", + ], + useCrumbCache: true, + useJobInfoCache: true) } } } @@ -163,4 +165,4 @@ def cleanup(Map args = [:]) { deleteDir() } unstash source -} \ No newline at end of file +} From 1ace2f2361f42f3f01fb8f5add6e22fd79e513df Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Thu, 18 Aug 2022 12:10:51 +0200 Subject: [PATCH 2/2] Try parameters as map --- .ci/package-storage-publish.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/package-storage-publish.groovy b/.ci/package-storage-publish.groovy index a56ccca940..b8b7c09f70 100644 --- a/.ci/package-storage-publish.groovy +++ b/.ci/package-storage-publish.groovy @@ -110,7 +110,7 @@ def signUnpublishedArtifactsWithElastic(builtPackagesPath) { triggerRemoteJob(auth: CredentialsAuth(credentials: 'local-readonly-api-token'), job: 'https://internal-ci.elastic.co/job/elastic+unified-release+master+sign-artifacts-with-gpg', token: TOKEN, - parameters2: [ + parameters: [ gcs_input_path: env.INFRA_SIGNING_BUCKET_ARTIFACTS_PATH, ], useCrumbCache: false, @@ -139,7 +139,7 @@ def uploadUnpublishedToPackageStorage(builtPackagesPath) { triggerRemoteJob(auth: CredentialsAuth(credentials: 'local-readonly-api-token'), job: 'https://internal-ci.elastic.co/job/package_storage/job/publishing-job-remote', token: TOKEN, - parameters2: [ + parameters: [ dry_run: true, gs_package_build_zip_path: "${env.PACKAGE_STORAGE_INTERNAL_BUCKET_QUEUE_PUBLISHING_PATH}/${packageZip}", gs_package_signature_path: "${env.PACKAGE_STORAGE_INTERNAL_BUCKET_QUEUE_PUBLISHING_PATH}/${packageZip}.sig",