From 2a50c5e3be873f459d6e854f540d30962ebe3b56 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 26 Mar 2021 19:23:38 +0100 Subject: Jenkins: upload ISO image to folder named after the Git branch instead of rolling By default all uploads are uploaded to the "rolling" folder and a symlink for the latest upload is created. If a 1.3 beta image is build after a 1.4 run - the resulting "latest-rolling.iso" image will be 1.3 instead of 1.4 --- Jenkinsfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 72def173..f8a20b31 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -226,13 +226,11 @@ pipeline { """ } } - - // Upload to Amazon S3 storage withAWS(region: 'us-east-1', credentials: 's3-vyos-downloads-rolling-rw') { s3Upload(bucket: 's3-us.vyos.io', path: 'rolling/', workingDir: 'build', includePathPattern: 'vyos*.iso') - s3Copy(fromBucket: 's3-us.vyos.io', fromPath: 'rolling/' + files[0].name, - toBucket: 's3-us.vyos.io', toPath: 'rolling/vyos-rolling-latest.iso') + s3Copy(fromBucket: 's3-us.vyos.io', fromPath: getGitBranchName() + '/' + files[0].name, + toBucket: 's3-us.vyos.io', toPath: getGitBranchName() + '/vyos-rolling-latest.iso') } } } -- cgit v1.2.3