Merge branch 'master' into add-ansible-package

Author: Bryan Oakley-Wiggins

ci/pipeline.yml

@@ -72,7 +72,14 @@ resources:
   source:
     bucket: ((dev-build-automate-release-tarballs.bucket))
     json_key: ((concourse_project_google_key))
-    versioned_file: devtools-boshrelease/dev-release.tgz
+    versioned_file: devtools-boshrelease/devtools-boshrelease-v(.*).tgz
+- name: final-release-tarball
+  type: google-cloud-storage
+  source:
+    bucket: ((dev-build-automate-release-tarballs.bucket))
+    json_key: ((concourse_project_google_key))
+    regexp: devtools-boshrelease/devtools-release.tgz
+- name: warden-stemcell
 - name: warden-stemcell
   type: bosh-io-stemcell
   source:
@@ -92,7 +99,7 @@ resources:
   type: github-release
   source:
     <<: *github-release-source
-    drafts: true  
+    #drafts: true 
 - name: set-pipeline
   type: concourse-pipeline
   source:
@@ -368,6 +375,8 @@ jobs:
         - test-sonarqube
     - task: create-release
       file: devtools-boshrelease/ci/tasks/create-final-release.yml
+    - put: final-release-tarball
+      params: { file: final-release-tarball/devtools-boshrelease-v*.tgz }
     - put: github-release
       params: &put-github-release-params
         name: version/version

config/blobs.yml

@@ -2,6 +2,10 @@ ansible/ansible-v2.5.2.tar.gz:
   size: 10192927
   object_id: a449d0df-70e7-4843-4bb5-00396cb58357
   sha: 959523a9b1db5a34cb3c3f6d37137f5b8895a55d
+cf-cli/cf-6.46.1.tgz:
+  size: 5910456
+  object_id: 4e1d0b05-5da2-41fd-4df8-f3c059c98240
+  sha: faade069c0e7a76cb3bb1c9dfd69da2d340155c9
 git/git-2.14.1.tar.gz:
   size: 6987933
   object_id: 4c11f3bb-d077-4a0d-6a81-2cb433fb2964

jobs/jenkins-slave/spec

@@ -7,6 +7,7 @@ packages:
 - apache-maven
 - git-client
 - ansible
+- cf-cli
 
 consumes:
 - name: jenkins_master

packages/cf-cli/packaging

@@ -0,0 +1,6 @@
+set -e
+set -i
+cd cf-cli
+tar -xzvf cf-*.tgz
+chmod +x cf
+cp cf -v  ${BOSH_INSTALL_TARGET}

packages/cf-cli/spec

@@ -0,0 +1,4 @@
+---
+name: cf-cli
+files:
+- cf-cli/cf-6.46.1.tgz