Skip to content

Commit d0f14e2

Browse files
v1vnarph
authored andcommitted
ci: use stashv2/unstashv2 (#35)
1 parent 78b7b47 commit d0f14e2

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

.ci/Jenkinsfile

+9-8
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ pipeline {
1111
PIPELINE_LOG_LEVEL = 'INFO'
1212
EXTERNAL = true
1313
SNAPSHOT = true
14-
JOB_GCS_BUCKET = 'beats-ci-artifacts'
15-
JOB_GCS_CREDENTIALS = 'beats-ci-gcs-plugin'
16-
JOB_GCS_EXT_CREDENTIALS = 'beats-ci-gcs-plugin-file-credentials'
14+
JOB_GCS_CREDENTIALS = 'beats-ci-gcs-plugin' // Support stash/unstash v2
15+
JOB_GCS_BUCKET = 'beats-ci-temp' // Support stash/unstash v2
16+
JOB_GCS_EXT_BUCKET = 'beats-ci-artifacts' // Support uploadPackagesToGoogleBucket
17+
JOB_GCS_EXT_CREDENTIALS = 'beats-ci-gcs-plugin-file-credentials' // Support uploadPackagesToGoogleBucket
1718
DOCKER_ELASTIC_SECRET = 'secret/observability-team/ci/docker-registry/prod'
1819
DOCKER_REGISTRY = 'docker.elastic.co'
1920
}
@@ -45,7 +46,7 @@ pipeline {
4546
pipelineManager([ cancelPreviousRunningBuilds: [ when: 'PR' ] ])
4647
deleteDir()
4748
gitCheckout(basedir: "${BASE_DIR}", githubNotifyFirstTimeContributor: true)
48-
stash allowEmpty: true, name: 'source', useDefaultExcludes: false
49+
stashV2(name: 'source', bucket: "${JOB_GCS_BUCKET}", credentialsId: "${JOB_GCS_CREDENTIALS}")
4950
dir("${BASE_DIR}"){
5051
setEnvVar('ONLY_DOCS', isGitRegionMatch(patterns: [ '.*\\.(asciidoc|md)' ], shouldMatchAll: true).toString())
5152
setEnvVar('PACKAGING_CHANGES', isGitRegionMatch(patterns: [ '(^dev-tools/packaging/.*|.ci/Jenkinsfile)' ], shouldMatchAll: false).toString())
@@ -97,7 +98,7 @@ pipeline {
9798
steps {
9899
withGithubNotify(context: "Build-${PLATFORM}") {
99100
deleteDir()
100-
unstash 'source'
101+
unstashV2(name: 'source', bucket: "${JOB_GCS_BUCKET}", credentialsId: "${JOB_GCS_CREDENTIALS}")
101102
withMageEnv(){
102103
dir("${BASE_DIR}"){
103104
cmd(label: 'Go build', script: 'mage build')
@@ -158,15 +159,15 @@ pipeline {
158159
steps {
159160
withGithubNotify(context: "Package ${PLATFORM}") {
160161
deleteDir()
161-
unstash 'source'
162+
unstashV2(name: 'source', bucket: "${JOB_GCS_BUCKET}", credentialsId: "${JOB_GCS_CREDENTIALS}")
162163
withMageEnv(){
163164
dir("${BASE_DIR}"){
164165
withPackageEnv("${PLATFORM}") {
165166
cmd(label: 'Go package', script: 'mage package')
166167
uploadPackagesToGoogleBucket(
167168
credentialsId: env.JOB_GCS_EXT_CREDENTIALS,
168169
repo: env.REPO,
169-
bucket: env.JOB_GCS_BUCKET,
170+
bucket: env.JOB_GCS_EXT_BUCKET,
170171
pattern: "build/distributions/**/*")
171172
pushDockerImages(
172173
registry: env.DOCKER_REGISTRY,
@@ -318,7 +319,7 @@ def runAllK8s(versions) {
318319
versions.each { version ->
319320
node('ubuntu-20.04 && immutable') {
320321
deleteDir()
321-
unstash 'source'
322+
unstashV2(name: 'source', bucket: "${JOB_GCS_BUCKET}", credentialsId: "${JOB_GCS_CREDENTIALS}")
322323
runK8s(k8sVersion: version, kindVersion: 'v0.11.1', context: "K8s-${version}")
323324
}
324325
}

0 commit comments

Comments
 (0)