diff --git a/atom-extensions/atom-bosh/.gitignore-release b/atom-extensions/atom-bosh/.gitignore-release new file mode 100644 index 000000000..51786ff67 --- /dev/null +++ b/atom-extensions/atom-bosh/.gitignore-release @@ -0,0 +1,6 @@ +/.idea +/node_modules +/server +*.tgz +*.iml +*.log \ No newline at end of file diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml index f6324a16f..d6b71810a 100644 --- a/concourse/pipeline.yml +++ b/concourse/pipeline.yml @@ -796,13 +796,13 @@ jobs: # text: | # Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed! - name: build-bosh-atom-package + serial: true plan: - aggregate: - get: sts4 passed: - atom-language-servers-test - get: atom-bosh - trigger: true - get: s3-bosh-fatjar-snapshot trigger: true passed: @@ -812,11 +812,17 @@ jobs: package_name: atom-bosh input_mapping: fatjar: s3-bosh-fatjar-snapshot + release_repo: atom-bosh file: sts4/concourse/tasks/build-atom-package.yml - # - put: s3-bosh-atom-snapshot - # params: - # file: out/bosh-yaml-*.tgz - # acl: public-read + - aggregate: + - put: s3-bosh-atom-snapshot + params: + file: out/bosh-yaml-*.tgz + acl: public-read + - put: atom-bosh + params: + repository: out/repo + rebase: true on_failure: put: slack-notification params: diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index 69b527f36..e97790549 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -25,6 +25,28 @@ EOF npm install +# push code to release repository + +cd $workdir +mkdir -p out/repo +cp -a $atom_package/* out/repo +cp -a release_repo/.git out/repo/.git +cp $atom_package/.gitignore-release out/repo/.gitignore +rm -f out/repo/.gitignore-release + +cd out/repo + +git config user.email "kdevolder@pivotal.io" +git config user.name "Kris De Volder" + +git add . + +git commit \ + -m "Publish ${fatjar_version}" + +# Publsuh linkable artifact to S3 + +cd $atom_package npm install bundle-deps node ./node_modules/bundle-deps/bundle-deps . @@ -38,13 +60,3 @@ length=${#basename} newName=${basename:0:${length}-4}-$timestamp${basename:${length}-4:${length}} cp ${basename} $output/${newName} - -git config user.email "kdevolder@pivotal.io" -git config user.name "Kris De Volder" - -git add . - -git commit \ - -m "Use fatjar version ${fatjar_version}" - -git clone $atom_package $workdir/out/repo diff --git a/concourse/tasks/build-atom-package.yml b/concourse/tasks/build-atom-package.yml index 562f7fcfd..edec0589e 100644 --- a/concourse/tasks/build-atom-package.yml +++ b/concourse/tasks/build-atom-package.yml @@ -1,7 +1,9 @@ inputs: - name: sts4 -- name: package_sources +- name: release_repo - name: fatjar +params: + package_name: atom-bosh outputs: - name: out platform: linux