From 530551f669e1e61709ba9ce58434d4eb72b766de Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 15 Feb 2022 15:07:56 +0000 Subject: [PATCH 01/11] test: if publish works --- .ci/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 19c96e485..ef9bef3eb 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -1,6 +1,6 @@ #!/usr/bin/env groovy -@Library('apm@current') _ +@Library('apm@test/publish') _ pipeline { agent { label 'ubuntu-18 && immutable' } From b987458ebea29f5146e475d10b25c11a60e3f1c0 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 15 Feb 2022 15:12:48 +0000 Subject: [PATCH 02/11] ci: enable upload artifacts --- .ci/Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index ef9bef3eb..3beee8c92 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -10,6 +10,8 @@ pipeline { DOCKER_COMPOSE_VERSION = '1.25.5' JOB_GIT_CREDENTIALS = "f6c7695a-671e-4f4f-a331-acdce44ff9ba" PIPELINE_LOG_LEVEL='INFO' + JOB_GCS_BUCKET = 'beats-ci-artifacts' + JOB_GCS_CREDENTIALS = 'beats-ci-gcs-plugin-file-credentials' } options { timeout(time: 1, unit: 'HOURS') @@ -100,6 +102,7 @@ pipeline { dir("${BASE_DIR}"){ withGoEnv(){ sh(label: 'Create release artifacts', script: 'make docker-release') + uploadPackagesToGoogleBucket(pattern: 'build/binaries/**/*') } } } From 499da3338e0ef53772fe8b34f3e6ebdfce75a59e Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 15 Feb 2022 15:38:08 +0000 Subject: [PATCH 03/11] use top level folder --- .ci/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 3beee8c92..73032933c 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -102,7 +102,7 @@ pipeline { dir("${BASE_DIR}"){ withGoEnv(){ sh(label: 'Create release artifacts', script: 'make docker-release') - uploadPackagesToGoogleBucket(pattern: 'build/binaries/**/*') + uploadPackagesToGoogleBucket(pattern: 'build/binaries/*') } } } From b56372e8a606a063bc2c6d707e9ad5f0a3945a54 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 15 Feb 2022 16:00:13 +0000 Subject: [PATCH 04/11] Update .ci/Jenkinsfile --- .ci/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 73032933c..8d33c6417 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -102,7 +102,7 @@ pipeline { dir("${BASE_DIR}"){ withGoEnv(){ sh(label: 'Create release artifacts', script: 'make docker-release') - uploadPackagesToGoogleBucket(pattern: 'build/binaries/*') + uploadPackagesToGoogleBucket(pattern: 'build/binaries/**') } } } From e5fabe0613e35b9a2f272b29ed7960b9b7fa06c4 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 15 Feb 2022 16:31:49 +0000 Subject: [PATCH 05/11] add debug traces --- .ci/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 8d33c6417..5ec2e858c 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -102,6 +102,7 @@ pipeline { dir("${BASE_DIR}"){ withGoEnv(){ sh(label: 'Create release artifacts', script: 'make docker-release') + sh(label: 'List files for debugging purposes', script: 'ls -l build/binaries/**') uploadPackagesToGoogleBucket(pattern: 'build/binaries/**') } } From a1752571d68fe0aa63d3e3e04204f4bcc42ba711 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 15 Feb 2022 16:36:42 +0000 Subject: [PATCH 06/11] use path folders --- .ci/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 5ec2e858c..883f26f04 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -103,7 +103,7 @@ pipeline { withGoEnv(){ sh(label: 'Create release artifacts', script: 'make docker-release') sh(label: 'List files for debugging purposes', script: 'ls -l build/binaries/**') - uploadPackagesToGoogleBucket(pattern: 'build/binaries/**') + uploadPackagesToGoogleBucket(pattern: 'build/binaries') } } } From 9f08506907c7afe88e533728bfc12eb52bf4ac99 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 15 Feb 2022 16:59:37 +0000 Subject: [PATCH 07/11] Update .ci/Jenkinsfile --- .ci/Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 883f26f04..07febd2fd 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -102,7 +102,6 @@ pipeline { dir("${BASE_DIR}"){ withGoEnv(){ sh(label: 'Create release artifacts', script: 'make docker-release') - sh(label: 'List files for debugging purposes', script: 'ls -l build/binaries/**') uploadPackagesToGoogleBucket(pattern: 'build/binaries') } } From 8164dce6c3492125565574d7308748964680be61 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 15 Feb 2022 17:18:06 +0000 Subject: [PATCH 08/11] Update .ci/Jenkinsfile --- .ci/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 07febd2fd..73032933c 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -102,7 +102,7 @@ pipeline { dir("${BASE_DIR}"){ withGoEnv(){ sh(label: 'Create release artifacts', script: 'make docker-release') - uploadPackagesToGoogleBucket(pattern: 'build/binaries') + uploadPackagesToGoogleBucket(pattern: 'build/binaries/*') } } } From d10bc78ab677673c5c766d613d0da9d6083c9a7c Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 15 Feb 2022 19:04:51 +0000 Subject: [PATCH 09/11] Update .ci/Jenkinsfile --- .ci/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 73032933c..3beee8c92 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -102,7 +102,7 @@ pipeline { dir("${BASE_DIR}"){ withGoEnv(){ sh(label: 'Create release artifacts', script: 'make docker-release') - uploadPackagesToGoogleBucket(pattern: 'build/binaries/*') + uploadPackagesToGoogleBucket(pattern: 'build/binaries/**/*') } } } From cc8d683d3d9086382752177e8e4cbd42e0f0716d Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 15 Feb 2022 19:43:41 +0000 Subject: [PATCH 10/11] Update .ci/Jenkinsfile --- .ci/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 3beee8c92..c4cd039fe 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -102,7 +102,7 @@ pipeline { dir("${BASE_DIR}"){ withGoEnv(){ sh(label: 'Create release artifacts', script: 'make docker-release') - uploadPackagesToGoogleBucket(pattern: 'build/binaries/**/*') + uploadPackagesToGoogleBucket(pattern: 'build/binaries/') } } } From 04604d564e46f86d623bc54aa30b78179b6362f7 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 21 Feb 2022 17:18:45 +0000 Subject: [PATCH 11/11] Update .ci/Jenkinsfile --- .ci/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 3295b9941..3ff8f75da 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -1,6 +1,6 @@ #!/usr/bin/env groovy -@Library('apm@test/publish') _ +@Library('apm@current') _ pipeline { agent { label 'ubuntu-18 && immutable' }