From 8396c12e50208beba91590b5db0776e209e59679 Mon Sep 17 00:00:00 2001 From: qxmips Date: Sun, 4 Apr 2021 22:25:31 -0400 Subject: Fixed s3 upload path --- Jenkinsfile | 6 +++--- 1 file 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') } } -- cgit v1.2.3