CI: remove single-use YTT functions

Author: aramprice

ci/pipelines/publisher.yml

@@ -94,68 +94,6 @@ in_parallel:
   #@ end
 #@ end
 
-#@ def get_google_light_inputs(stemcell_os, stemcell_version):
-in_parallel:
-- get: stemcell
-  params:
-    include_files:
-    - bosh-stemcell-*-google-kvm-(@= stemcell_os @)*.tgz
-  resource: candidate-(@= stemcell_os @)-stemcell-(@= str(stemcell_version) @)
-  trigger: true
-  version: every
-- get: bosh-stemcells-ci
-- get: bosh-cpi-release
-  resource: bosh-google-cpi-release
-#@ end
-
-#@ def deploy_skeletal_google_light_stemcell(terraform_resource, credentials):
-do:
-- params:
-    generate_random_name: true
-    terraform_source: bosh-stemcells-ci/ci/tasks/light-google/terraform/
-  put: terraform
-  resource: (@= terraform_resource @)
-- file: bosh-stemcells-ci/ci/tasks/light-google/deploy-skeletal.yml
-  image: bosh-integration-registry-image
-  params:
-    GCE_CREDENTIALS_JSON: (@= credentials @)
-    SSH_PRIVATE_KEY: ((ssh.private_key))
-  task: deploy-skeletal
-ensure:
-  ensure:
-    get_params:
-      action: destroy
-    params:
-      action: destroy
-      env_name_file: terraform/name
-      terraform_source: bosh-stemcells-ci/ci/tasks/light-google/terraform/
-    put: terraform
-    resource: (@= terraform_resource @)
-  file: bosh-stemcells-ci/ci/tasks/light-google/destroy-skeletal.yml
-  image: bosh-integration-registry-image
-  task: destroy-skeletal
-on_failure:
-  image: bosh-integration-registry-image
-  config:
-    platform: linux
-    run:
-      args:
-      - |
-        * remove artifacts of failed jobs:
-        ```bash
-        gcloud auth revoke --all # start with clean slate
-        gcloud auth activate-service-account concourse@((gcp_project_id)).iam.gserviceaccount.com --key-file <( ((gcp_json_key)) )
-        gsutil rm gs://bosh-gce-raw-stemcells-new/STEMCELL_TO_BE_DELETED_raw.tar.gz
-        gsutil rm gs://bosh-gce-raw-stemcells-new/STEMCELL_TO_BE_DELETED_raw.tar.gz.sha1
-        gcloud auth revoke --all
-        ```
-        * re-fly pipeline after commenting-out `disable_manual_trigger: true`
-        * trigger failed jobs
-        * re-fly pipeline after uncommenting `disable_manual_trigger: true`
-      path: echo
-  task: cleanup-failed-run-instructions
-#@ end
-
 #@ def run_stemcell_upload_tests():
 do:
 - in_parallel:
@@ -225,10 +163,7 @@ ensure:
       env_name_file: environment/name
       terraform_source: bosh-cpi-src/ci/assets/terraform
 #@ end
----
 
-#@yaml/text-templated-strings
----
 anchors:
   ci_bot:
     email: &ci_bot_email bots@cloudfoundry.org
@@ -392,7 +327,17 @@ jobs:
 
 - name: build-light-google-(@= data.values.stemcell_details.os_name @)-(@= str(data.values.stemcell_details.major_version) @)
   plan:
-  - #@ get_google_light_inputs(data.values.stemcell_details.os_name, str(data.values.stemcell_details.major_version))
+  - in_parallel:
+    - get: stemcell
+      params:
+        include_files:
+          - bosh-stemcell-*-google-kvm-(@= data.values.stemcell_details.os_name @)*.tgz
+      resource: candidate-(@= data.values.stemcell_details.os_name @)-stemcell-(@= str(data.values.stemcell_details.major_version) @)
+      trigger: true
+      version: every
+    - get: bosh-stemcells-ci
+    - get: bosh-cpi-release
+      resource: bosh-google-cpi-release
   - get: light-stemcell-builder-registry-image
   - get: gce-cpi-release-registry-image
   - get: bosh-integration-registry-image
@@ -414,8 +359,51 @@ jobs:
       GCP_SERVICE_ACCOUNT_KEY: ((gcp_json_key))
       PROJECT_NAME: ((gcp_project_id))
       EFI: #@ data.values.stemcell_details.use_efi
-
-  - #@ deploy_skeletal_google_light_stemcell("light-google-environment-oss", "((gcp_json_key))")
+  - do:
+          - params:
+              generate_random_name: true
+              terraform_source: bosh-stemcells-ci/ci/tasks/light-google/terraform/
+            put: terraform
+            resource: light-google-environment-oss
+          - file: bosh-stemcells-ci/ci/tasks/light-google/deploy-skeletal.yml
+            image: bosh-integration-registry-image
+            params:
+              GCE_CREDENTIALS_JSON: ((gcp_json_key))
+              SSH_PRIVATE_KEY: ((ssh.private_key))
+            task: deploy-skeletal
+    ensure:
+      ensure:
+        get_params:
+          action: destroy
+        params:
+          action: destroy
+          env_name_file: terraform/name
+          terraform_source: bosh-stemcells-ci/ci/tasks/light-google/terraform/
+        put: terraform
+        resource: light-google-environment-oss
+      file: bosh-stemcells-ci/ci/tasks/light-google/destroy-skeletal.yml
+      image: bosh-integration-registry-image
+      task: destroy-skeletal
+    on_failure:
+      image: bosh-integration-registry-image
+      config:
+        platform: linux
+        run:
+          args:
+            - |
+              * remove artifacts of failed jobs:
+              ```bash
+              gcloud auth revoke --all # start with clean slate
+              gcloud auth activate-service-account concourse@((gcp_project_id)).iam.gserviceaccount.com --key-file <( ((gcp_json_key)) )
+              gsutil rm gs://bosh-gce-raw-stemcells-new/STEMCELL_TO_BE_DELETED_raw.tar.gz
+              gsutil rm gs://bosh-gce-raw-stemcells-new/STEMCELL_TO_BE_DELETED_raw.tar.gz.sha1
+              gcloud auth revoke --all
+              ```
+              * re-fly pipeline after commenting-out `disable_manual_trigger: true`
+              * trigger failed jobs
+              * re-fly pipeline after uncommenting `disable_manual_trigger: true`
+          path: echo
+      task: cleanup-failed-run-instructions
   - params:
       files:
       - light-stemcell/*.tgz