[#154735316] Refactor bosh-upload-stemcell-from-cf-deployment to bosh-upload-stemcells

- The old task name didn't quite make sense when multiple stemcells
  could be added from outside cf-deployment.
- The old task has been symlinked to the new task.

Author: vitreuz

bosh-upload-stemcell-from-cf-deployment

@@ -0,0 +1 @@
+bosh-upload-stemcells/

bosh-upload-stemcell-from-cf-deployment/task renamed to bosh-upload-stemcells/task

@@ -34,6 +34,13 @@ upload_stemcell() {
   # Hardcode a couple of stable stemcell paramaters
   local stemcells_url
   stemcells_url="https://bosh.io/d/stemcells"
+  
+  # Ask bosh if it already has our OS / version stemcell combination
+  # As of this writing, the new bosh cli doesn't have --skip-if-exists
+  set +e
+  local existing_stemcell
+  existing_stemcell=$(bosh stemcells | grep "${os}" | awk '{print $2}' | tr -d "\*" | grep ^"${version}"$ )
+  set -e
 
   local stemcell_name
 
@@ -61,7 +68,7 @@ upload_stemcell() {
   # If bosh already has our stemcell, exit 0
   if [ "${existing_stemcell}" ]; then
     echo "Task bosh-upload-stemcell-from-cf-deployment:"
-    echo "Stemcell '${stemcell_name}/${version}' already exists.  Exiting..."
+    echo "Stemcell '${stemcell_name}/${version}' already exists.  Skipping..."
     return
   fi
 
@@ -82,9 +89,9 @@ upload_stemcell() {
 
 function upload_stemcells() {
   local arguments=''
-  for op in ${OPS_FILES_WITH_STEMCELLS}
+  for op in ${OPS_FILES}
   do
-    arguments="${arguments} -o stemcells-ops-files/${op}"
+    arguments="${arguments} -o ops-files/${op}"
   done
 
   bosh interpolate ${arguments} cf-deployment/${MANIFEST_FILE} > /tmp/cf.yml

bosh-upload-stemcell-from-cf-deployment/task.yml renamed to bosh-upload-stemcells/task.yml

@@ -11,11 +11,11 @@ inputs:
 - name: cf-deployment-concourse-tasks  # - This repo
 - name: cf-deployment  # - The cf-deployment manifest
 - name: bbl-state  # - The repo containing the Director's bbl state dir
-- name: stemcells-ops-files  # - Stemcells operations files to be made available
+- name: ops-files  # - Oplitonal operations files to be made available
   optional: true
 
 run:
-  path: cf-deployment-concourse-tasks/bosh-upload-stemcell-from-cf-deployment/task
+  path: cf-deployment-concourse-tasks/bosh-upload-stemcells/task
 
 params:
   BBL_STATE_DIR: bbl-state
@@ -34,8 +34,10 @@ params:
   # - Filepath to the manifest file within the cf-deployment resource
   # - The path is relative to root of the `cf-deployment` input
 
-  OPS_FILES_WITH_STEMCELLS:
+  OPS_FILES:
   # - Optional
-  # - List of operations files that contain additional stemcells to be uploaded
+  # - List of operations files to be applied to the manifest.
+  # - Additional stemcells specified by operations will also be uploaded.
   # - Quoted and space-separated
-  # - Paths are relative to root of the `stemcell-ops-files` input
+  # - Ops will be applied in the order they're listed
+  # - Paths are relative to root of the `ops-files` input