Updated latest ci templates

Author: geofffranks

ci/pipeline.yml

@@ -14,6 +14,7 @@
 
 meta:
   name:     (( param "Please name your pipeline" ))
+  release:  (( grab meta.name ))
   target:   (( param "Please identify the name of the target Concourse CI" ))
   url:      (( param "Please specify the full url of the target Concourse CI" ))
   pipeline: (( grab meta.name ))
@@ -39,7 +40,7 @@ meta:
 
   slack:
     webhook:       (( param "Please specify your Slack Incoming Webhook Integration URL" ))
-    notification: '(( concat ":concourse-fail: <" meta.url "/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME| Failed to build " meta.name "!  Click for details.>" ))'
+    notification: '(( concat ":concourse-fail: <" meta.url "/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME| Failed to build " meta.name "!  Click for details.>" ))'
     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
@@ -106,38 +107,32 @@ jobs:
           params:
             REPO_ROOT:    git
             RELEASE_ROOT: gh
+            RELEASE_NAME: (( grab meta.release ))
             REPO_OUT:     pushme/git
             VERSION_FROM: version/number
 
       - put: latest # as 'latest'
         params:
-          load_base:       edge
-          load_file:       edge/image
-          load_repository: (( grab meta.dockerhub.repository ))
-          load_tag:        edge
+          load:       edge
 
       - put: latest # as 'vX.Y.Z'
         params:
           tag:             version/number
           tag_prefix:      v
-          load_base:       edge
-          load_file:       edge/image
-          load_repository: (( grab meta.dockerhub.repository ))
-          load_tag:        edge
+          load:       edge
 
-      - aggregate:
-        - put: version
-          params:
-            bump: patch
-        - put: git
-          params:
-            rebase: true
-            repository: pushme/git
-        - put: github
-          params:
-            name: gh/name
-            tag:  gh/tag
-            body: gh/notes.md
+      - put: version
+        params:
+          bump: patch
+      - put: git
+        params:
+          rebase: true
+          repository: pushme/git
+      - put: github
+        params:
+          name: gh/name
+          tag:  gh/tag
+          body: gh/notes.md
 
 resource_types:
   - name: slack-notification
@@ -173,7 +168,7 @@ resources:
       key:               version
       access_key_id:     (( grab meta.aws.access_key ))
       secret_access_key: (( grab meta.aws.secret_key ))
-      initial_version:   (( grab meta.initial_version || 0.0.1 ))
+      initial_version:   (( grab meta.initial_version || "0.0.1" ))
 
   - name: notify
     type: slack-notification

ci/repipe

@@ -25,33 +25,45 @@ cd $(dirname $BASH_SOURCE[0])
 echo "Working in $(pwd)"
 need_command spruce
 
-if [[ -z "$VAULT_ADDR" ]] ; then
-	echo >&2 "Vault address not specified in VAULT_ADDR environment variable"
-	exit 1
+# Allow for target-specific settings
+settings_file="$(ls -1 settings.yml ${CONCOURSE_TARGET:+"settings-${CONCOURSE_TARGET}.yml"} 2>/dev/null | tail -n1)"
+if [[ -z "$settings_file" ]]
+then
+  echo >&2 "Missing local settings in ci/settings.yml${CONCOURSE_TARGET:+" or ci/settings-${CONCOURSE_TARGET}.yml"}!"
+  exit 1
 fi
 
-if [[ ! -f settings.yml ]]; then
-	echo >&2 "Missing local settings in ci/settings.yml!"
-	exit 1
-fi
+echo >&2 "Using settings found in ${settings_file}"
 
 set -e
 trap "rm -f .deploy.yml" QUIT TERM EXIT INT
-spruce merge pipeline.yml settings.yml > .deploy.yml
+spruce merge pipeline.yml ${settings_file} > .deploy.yml
 PIPELINE=$(spruce json .deploy.yml | jq -r '.meta.pipeline // ""')
 if [[ -z ${PIPELINE} ]]; then
 	echo >&2 "Missing pipeline name in ci/settings.yml!"
 	exit 1
 fi
-[ -n ${CONCOURSE_TARGET} ] && TARGET=${CONCOURSE_TARGET}
-if [[ -z ${TARGET} ]]; then
-	TARGET=$(spruce json .deploy.yml | jq -r '.meta.target // ""')
+
+TARGET_FROM_SETTINGS=$(spruce json .deploy.yml | jq -r '.meta.target // ""')
+if [[ -z ${CONCOURSE_TARGET} ]]; then
+  TARGET=${TARGET_FROM_SETTINGS}
+elif [[ "$CONCOURSE_TARGET" != "$TARGET_FROM_SETTINGS" ]]
+then
+  echo >&2 "Target in {$settings_file} differs from target in \$CONCOURSE_TARGET"
+  echo >&2 "  \$CONCOURSE_TARGET: $CONCOURSE_TARGET"
+  echo >&2 "  Target in file:    $TARGET_FROM_SETTINGS"
+  exit 1
+else
+  TARGET=${CONCOURSE_TARGET}
 fi
+
 if [[ -z ${TARGET} ]]; then
 	echo >&2 "Missing Concourse Target in ci/settings.yml!"
 	exit 1
 fi
 
+fly_cmd="${FLY_CMD:-fly}"
+
 set +x
-fly --target ${TARGET} set-pipeline     --pipeline ${PIPELINE} --config .deploy.yml
-fly --target ${TARGET} unpause-pipeline --pipeline ${PIPELINE}
+$fly_cmd --target ${TARGET} set-pipeline     --pipeline ${PIPELINE} --config .deploy.yml
+$fly_cmd --target ${TARGET} unpause-pipeline --pipeline ${PIPELINE}

ci/scripts/release

@@ -30,9 +30,9 @@ if [[ -z ${VERSION} ]]; then
   exit 2
 fi
 
-echo "v${VERSION}"                             > ${RELEASE_ROOT}/tag
-echo "Slack Notification Resource v${VERSION}" > ${RELEASE_ROOT}/name
-mv ${REPO_ROOT}/ci/release_notes.md              ${RELEASE_ROOT}/notes.md
+echo "v${VERSION}"                  > ${RELEASE_ROOT}/tag
+echo "${RELEASE_NAME} v${VERSION}"  > ${RELEASE_ROOT}/name
+mv ${REPO_ROOT}/ci/release_notes.md   ${RELEASE_ROOT}/notes.md
 
 # GIT!
 if [[ -z $(git config --global user.email) ]]; then