Upload stemcells independently of using bosh-deployment resource to

avoid manifest being treated as v2.

Add CREDHUB_MODE parameter for write-cats-config and only set for bal pipeline

Signed-off-by: Keaty Gross <kgross@pivotal.io>
Signed-off-by: Sam Coward <scoward@pivotal.io>

README.md

@@ -165,3 +165,4 @@ Some repositories are private for historical or security reasons. We list them f
 * [buildpacks-ci-robots](https://github.com/pivotal-cf/buildpacks-ci-robots) See repository README.
 * [cflinuxfs2-nc](https://github.com/pivotal-cf/cflinuxfs2-nc) See repository README.
 * [cflinuxfs2-nc-release](https://github.com/pivotal-cf/cflinuxfs2-nc-release) See repository README.
+

pipelines/bal.yml

@@ -238,6 +238,7 @@ jobs:
             CI_CF_PASSWORD: {{ci-cf-bal-password}}
             APPS_DOMAIN: bal.buildpacks-gcp.ci.cf-app.com
             DIEGO_DOCKER_ON: true
+            CREDHUB_MODE: assisted
         - task: add-flake-attempts-to-cats
           file: buildpacks-ci/tasks/add-flake-attempts-to-cats/task.yml
         - task: cats

pipelines/cf-release.yml

@@ -323,6 +323,13 @@ jobs:
           - get: staticfile-buildpack-github-release
           - get: binary-buildpack-github-release
           - get: dotnet-core-buildpack-github-release
+        - task: upload-stemcell-to-bosh-lite
+          file: buildpacks-ci/tasks/upload-stemcell-to-bosh-lite/task.yml
+          params:
+            DEPLOYMENT_NAME: cf-release.buildpacks-gcp.ci
+            BOSH_USER: {{bosh_user}}
+            BOSH_PASSWORD: {{gcp_bosh_lite_admin_password}}
+            BOSH_TARGET: cf-release.buildpacks-gcp.ci.cf-app.com
         - task: generate-manifest
           file: buildpacks-ci/tasks/generate-cf-and-diego-manifests/task.yml
           params:
@@ -341,7 +348,6 @@ jobs:
         - put: cf-release-cf-deployment
           params:
             manifest: generate-manifest-artifacts/cf-release.buildpacks-gcp.ci/manifest.yml
-            stemcells: [lite-stemcell/*.tgz]
             releases: [cf-release-artifacts/dev_releases/cf/*.tgz]
         - task: upload-diego-release
           file: buildpacks-ci/tasks/upload-diego-release/task.yml
@@ -353,7 +359,6 @@ jobs:
         - put: cf-release-diego-deployment
           params:
             manifest: generate-manifest-artifacts/cf-release.buildpacks-gcp.ci/diego.yml
-            stemcells: ['lite-stemcell/stemcell.tgz']
             releases:
               - diego-bosh-release/release.tgz
               - cflinuxfs2-bosh-release/release.tgz

tasks/upload-stemcell-to-bosh-lite/run.sh

@@ -0,0 +1,12 @@
+#!/bin/bash -l
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+pushd buildpacks-ci
+  # shellcheck disable=SC1091
+  source ./bin/target_bosh "$DEPLOYMENT_NAME"
+popd
+
+bosh upload stemcell https://bosh.io/d/stemcells/bosh-warden-boshlite-ubuntu-trusty-go_agent

tasks/upload-stemcell-to-bosh-lite/task.yml

@@ -0,0 +1,20 @@
+---
+platform: linux
+image_resource:
+  type: docker-image
+  source:
+    repository: cfbuildpacks/ci
+inputs:
+  - name: bosh-lite
+  - name: buildpacks-ci
+  - name: cf-release
+  - name: diego-release
+outputs:
+  - name: upload-stemcell-to-bosh-lite
+run:
+  path: buildpacks-ci/tasks/upload-stemcell-to-bosh-lite/run.sh
+params:
+  DEPLOYMENT_NAME:
+  BOSH_USER:
+  BOSH_PASSWORD:
+  BOSH_TARGET:

tasks/write-cats-config/run.rb

@@ -6,13 +6,14 @@
 admin_password = ENV.fetch('CI_CF_PASSWORD')
 apps_domain = ENV.fetch('APPS_DOMAIN')
 diego_docker_on = ENV.fetch('DIEGO_DOCKER_ON')
+credhub_mode = ENV.fetch('CREDHUB_MODE')
 
 cats_config = {
   "admin_password" => admin_password,
   "admin_user" => admin_user,
   "api" => "api.#{apps_domain}",
   "apps_domain" => apps_domain,
-  "credhub_mode" => "assisted",
+  "credhub_mode" => credhub_mode,
   "async_service_operation_timeout" => 1200,
   "backend" => "diego",
   "cf_push_timeout" => 600,

tasks/write-cats-config/task.yml

@@ -18,3 +18,4 @@ params:
   CI_CF_PASSWORD:
   APPS_DOMAIN:
   DIEGO_DOCKER_ON:
+  CREDHUB_MODE: