From 5fcc93aea7b615165a5311bca7de296e8a3e47ee Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 4 Aug 2017 14:44:51 -0400 Subject: [PATCH] Build: correct tarball copying to out folder and upload to s3 --- concourse/pipeline.yml | 14 ++++++++++++++ concourse/tasks/build-atom-package.sh | 5 ++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml index c52a74c4c..4432f41cb 100644 --- a/concourse/pipeline.yml +++ b/concourse/pipeline.yml @@ -101,6 +101,14 @@ resources: secret_access_key: {{s3_secretkey}} region_name: {{s3_region}} regexp: sts4/fatjars/snapshots/concourse-language-server-(.*).jar +- name: s3-atom-cf-manifest-yaml-snapshot + type: s3 + source: + bucket: {{s3_bucket}} + access_key_id: {{s3_accesskey}} + secret_access_key: {{s3_secretkey}} + region_name: {{s3_region}} + regexp: sts4/atom/snapshots/(.*)cf-manifest-yaml-(.*).tgz - name: snapshot-website type: s3-multi source: @@ -491,3 +499,9 @@ jobs: params: text: | Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed! + on_success: + aggregate: + - put: s3-atom-cf-manifest-yaml-snapshot + params: + file: out/*cf-manifest-yaml-*.tgz + acl: public-read diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index 2728b7d8c..bcf1ca728 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -27,10 +27,13 @@ node ./node_modules/bundle-deps/bundle-deps . npm pack +ls *.tgz + timestamp=`date -u +%Y%m%d%H%M` for i in `ls *.tgz`; do basename=$(basename $i) - cp $i $output/${basename/SNAPSHOT/$timestamp} + length = ${#basename} + cp $i $output/${basename:0:$length-4}-$timestamp${basename:$length-4:$length} done ls -la $output \ No newline at end of file