summaryrefslogtreecommitdiff
path: root/Jenkinsfile
diff options
context:
space:
mode:
authorqxmips <qxmips@gmail.com>2021-04-04 22:25:31 -0400
committerqxmips <qxmips@gmail.com>2021-04-04 22:25:31 -0400
commit8396c12e50208beba91590b5db0776e209e59679 (patch)
tree5e761e1037ccd9cf7d70a7ae4ab2b621be920620 /Jenkinsfile
parent1dc49e8c90b1eb0113863b27a901f8da9cc3a8b1 (diff)
downloadvyos-build-8396c12e50208beba91590b5db0776e209e59679.tar.gz
vyos-build-8396c12e50208beba91590b5db0776e209e59679.zip
Fixed s3 upload path
Diffstat (limited to 'Jenkinsfile')
-rw-r--r--Jenkinsfile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 8e4df860..aced50c7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -181,9 +181,9 @@ pipeline {
}
}
withAWS(region: 'us-east-1', credentials: 's3-vyos-downloads-rolling-rw') {
- s3Upload(bucket: 's3-us.vyos.io', path: 'rolling/',
+ s3Upload(bucket: 's3-us.vyos.io', path: 'rolling/' + getGitBranchName() + '/',
workingDir: 'build', includePathPattern: 'vyos*.iso, packer_build/qemu/*.img')
- s3Copy(fromBucket: 's3-us.vyos.io', fromPath: getGitBranchName() + '/' + files[0].name,
+ s3Copy(fromBucket: 's3-us.vyos.io', fromPath: 'rolling/' + getGitBranchName() + '/' + files[0].name,
toBucket: 's3-us.vyos.io', toPath: getGitBranchName() + '/vyos-rolling-latest.iso')
}
}
@@ -191,7 +191,7 @@ pipeline {
// Publish ISO image to snapshot bucket
if (files && params.BUILD_SNAPSHOT) {
withAWS(region: 'us-east-1', credentials: 's3-vyos-downloads-rolling-rw') {
- s3Upload(bucket: 's3-us.vyos.io', path: 'snapshot/',
+ s3Upload(bucket: 's3-us.vyos.io', path: 'snapshot/' + getGitBranchName() + '/',
workingDir: 'build', includePathPattern: 'vyos*.iso, packer_build/qemu/*.img')
}
}