Update from pipeline-templates

Author: geofffranks

ci/pipeline.yml

@@ -18,6 +18,8 @@ meta:
   url:      (( param "Please specify the full url of the target Concourse CI" ))
   pipeline: (( concat meta.name "-boshrelease" ))
 
+  image:    docker:///starkandwayne/concourse
+
   aws:
     bucket:     (( concat meta.pipeline "-pipeline" ))
     access_key: (( param "Please set your AWS Access Key ID for your pipeline S3 Bucket" ))
@@ -39,13 +41,13 @@ meta:
 
   slack:
     webhook:       (( param "Please specify your Slack Incoming Webhook Integration URL" ))
+    success_moji:  ":airplane_departure:"
     fail_moji:     ":airplane_arriving:"
     upset_moji:    ":sad_panda:"
-    build_failure: '(( concat "$BUILD_PIPELINE_NAME: " meta.slack.fail_moji " <" meta.url "/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME| Failed to ship a new bosh release. " meta.slack.upset_moji ">" ))'
-    test_failure:  '(( concat "$BUILD_PIPELINE_NAME: " meta.slack.fail_moji " <" meta.url "/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME| Tests failed! " meta.slack.upset_moji ">" ))'
     channel:       (( param "Please specify the channel (#name) or user (@user) to send messages to" ))
     username:      concourse
     icon:          http://cl.ly/image/3e1h0H3H2s0P/concourse-logo.png
+    fail_url: '(( concat "<" meta.url "/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME| Concourse Failure! " meta.slack.upset_moji ">" ))'
 
 groups:
   - name: (( grab meta.pipeline ))
@@ -61,12 +63,13 @@ jobs:
     public: true
     serial: true
     plan:
+    - do:
       - aggregate:
         - { get: git, trigger: true }
       - task: testflight
         config:
           platform: linux
-          image: docker:///starkandwayne/concourse
+          rootfs_uri:    (( grab meta.image ))
           inputs:
             - { name: git }
           run:
@@ -78,46 +81,74 @@ jobs:
             BOSH_LITE_USERNAME:   (( grab meta.bosh-lite.username ))
             BOSH_LITE_PASSWORD:   (( grab meta.bosh-lite.password ))
             BOSH_LITE_DEPLOYMENT: (( grab meta.bosh-lite.deployment ))
-        on_failure:
-          put: notify
-          params:
-            channel:  (( grab meta.slack.channel ))
-            username: (( grab meta.slack.username ))
-            icon_url: (( grab meta.slack.icon ))
-            text:     (( grab meta.slack.test_failure ))
+            TEST_ERRAND:          (( grab meta.test-errand || ~ ))
+      on_failure:
+        put: notify
+        params:
+          channel:  (( grab meta.slack.channel ))
+          username: (( grab meta.slack.username ))
+          icon_url: (( grab meta.slack.icon ))
+          text:    '(( concat meta.slack.fail_url " " meta.pipeline ": test job failed" ))'
 
   - name: rc
     public: true
     plan:
+    - do:
       - aggregate:
           - { get: git,     trigger: true,  passed: [testflight] }
           - { get: version, trigger: true, params: {pre: rc} }
       - put: version
         params: {file: version/number}
+      on_failure:
+        put: notify
+        params:
+          channel:  (( grab meta.slack.channel ))
+          username: (( grab meta.slack.username ))
+          icon_url: (( grab meta.slack.icon ))
+          text:    '(( concat meta.slack.fail_url " " meta.pipeline ": rc job failed" ))'
 
   - name: minor
     public: true
     plan:
+    - do:
       - { get: version, trigger: false, params: {bump: minor} }
       - { put: version,                 params: {file: version/number} }
+      on_failure:
+        put: notify
+        params:
+          channel:  (( grab meta.slack.channel ))
+          username: (( grab meta.slack.username ))
+          icon_url: (( grab meta.slack.icon ))
+          text:    '(( concat meta.slack.fail_url " " meta.pipeline ": minor job failed" ))'
 
   - name: major
     public: true
     plan:
+    - do:
       - { get: version, trigger: false, params: {bump: major} }
       - { put: version,                 params: {file: version/number} }
+      on_failure:
+        put: notify
+        params:
+          channel:  (( grab meta.slack.channel ))
+          username: (( grab meta.slack.username ))
+          icon_url: (( grab meta.slack.icon ))
+          text:    '(( concat meta.slack.fail_url " " meta.pipeline ": major job failed" ))'
 
   - name: shipit
     public: true
     serial: true
     plan:
-      - aggregate:
+    - do:
+      - name: inputs
+        aggregate:
           - { get: version, passed: [rc], params: {bump: final} }
           - { get: git,     passed: [rc] }
-      - task: release
+      - name: release
+        task: release
         config:
-          image: docker:///starkandwayne/concourse
           platform: linux
+          rootfs_uri:    (( grab meta.image ))
           inputs:
             - name: version
             - name: git
@@ -142,30 +173,34 @@ jobs:
 
             AWS_ACCESS_KEY:       (( grab meta.aws.access_key ))
             AWS_SECRET_KEY:       (( grab meta.aws.secret_key ))
-        on_failure:
-          put: notify
-          params:
-            channel:  (( grab meta.slack.channel ))
-            username: (( grab meta.slack.username ))
-            icon_url: (( grab meta.slack.icon ))
-            text:     (( grab meta.slack.build_failure ))
 
-      - put: git
+      - name: upload-git
+        put: git
         params:
           rebase: true
           repository: pushme/git
-      - put: s3
+      - name: tarball
+        put: s3
         params:
           file:  (( concat "gh/artifacts/" meta.name "-*.tgz" ))
-      - put: github
+      - name: github-release
+        put: github
         params:
           name:   gh/name
           tag:    gh/tag
           body:   gh/notes.md
           globs: [gh/artifacts/*]
-      - put: version
+      - name: version-bump
+        put: version
         params:
           bump: patch
+      on_failure:
+        put: notify
+        params:
+          channel:  (( grab meta.slack.channel ))
+          username: (( grab meta.slack.username ))
+          icon_url: (( grab meta.slack.icon ))
+          text:    '(( concat meta.slack.fail_url " " meta.pipeline ": shipit job failed" ))'
 
 resource_types:
   - name: slack-notification

ci/scripts/testflight

@@ -45,6 +45,11 @@ header "Deploying to BOSH-lite..."
 ./templates/make_manifest warden
 bosh -n deploy
 
+if [[ -n ${TEST_ERRAND} ]]; then
+	header "Running '${TEST_ERRAND}' validation errand"
+	bosh -n run errand ${TEST_ERRAND}
+fi
+
 header "Cleaning up..."
 bosh -n delete deployment ${BOSH_LITE_DEPLOYMENT} --force || echo "continuing on..."
 bosh -n cleanup || echo "continuing on..."