summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-03-26 19:23:38 +0100
committerChristian Poessinger <christian@poessinger.com>2021-03-26 19:33:33 +0100
commit7e104dbc56fbd713cd96cc5c1e136bb15635664b (patch)
treed52788d7d912be9a0f80ecc1c0f3c6817e5c0ad1
parent9e128d4dc13c8f902224309bf287a2e3de7adc3c (diff)
downloadvyos-build-7e104dbc56fbd713cd96cc5c1e136bb15635664b.tar.gz
vyos-build-7e104dbc56fbd713cd96cc5c1e136bb15635664b.zip
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 (cherry picked from commit 2a50c5e3be873f459d6e854f540d30962ebe3b56)
-rw-r--r--Jenkinsfile6
1 files changed, 2 insertions, 4 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 2432f6ac..dc07c0a2 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')
}
}
}