CI: simplify, consolidate YTT vars file

ci/pipelines/builder.yml

@@ -75,7 +75,7 @@ jobs:
         build: os-image-stemcell-builder-dockerfile/ci/docker/os-image-stemcell-builder
         build_args_file: docker-build-args/docker-build-args.json
         build_args:
-          BASE_IMAGE: ubuntu:(@= data.values.stemcell_details.os @)
+          BASE_IMAGE: ubuntu:(@= data.values.stemcell_details.os_short_name @)
           OVF_TOOL_INSTALLER: "VMware-ovftool-4.4.3-18663434-lin.x86_64.bundle"
           OVF_TOOL_INSTALLER_SHA1: "6c24e473be49c961cfc3bb16774b52b48e822991"
       get_params:
@@ -90,21 +90,21 @@ jobs:
       - get: os-image-stemcell-builder-registry-image
       - get: bosh-linux-stemcell-builder
         resource: bosh-linux-stemcell-builder
-      - get: (@= data.values.stemcell_details.os @)-usn
+      - get: (@= data.values.stemcell_details.os_short_name @)-usn
         version: every
         trigger: true
-      - get: (@= data.values.stemcell_details.os @)-usn-gh-json
+      - get: (@= data.values.stemcell_details.os_short_name @)-usn-gh-json
       - get: usn-log
       - get: high-critical-unfound-usns
     - task: check-if-usn-is-in-github
       file: bosh-stemcells-ci/ci/tasks/check-if-usn-is-in-github.yml
       image: os-image-stemcell-builder-registry-image
       input_mapping:
-        usn: (@= data.values.stemcell_details.os @)-usn
-        usn-gh-json: (@= data.values.stemcell_details.os @)-usn-gh-json
+        usn: (@= data.values.stemcell_details.os_short_name @)-usn
+        usn-gh-json: (@= data.values.stemcell_details.os_short_name @)-usn-gh-json
         unfound-usns: high-critical-unfound-usns
       vars:
-        image_os_tag: (@= data.values.stemcell_details.os @)
+        image_os_tag: (@= data.values.stemcell_details.os_short_name @)
     - put: high-critical-unfound-usns
       params:
         file: updated-unfound-usns/usns.json
@@ -115,11 +115,11 @@ jobs:
         image: os-image-stemcell-builder-registry-image
         input_mapping:
           usns: found-usns
-          usn-gh-json: (@= data.values.stemcell_details.os @)-usn-gh-json
+          usn-gh-json: (@= data.values.stemcell_details.os_short_name @)-usn-gh-json
         params:
-          OS: (@= data.values.stemcell_details.os @)
+          OS: (@= data.values.stemcell_details.os_short_name @)
         vars:
-          image_os_tag: (@= data.values.stemcell_details.os @)
+          image_os_tag: (@= data.values.stemcell_details.os_short_name @)
         on_success:
           in_parallel:
             steps:
@@ -150,19 +150,19 @@ jobs:
         trigger: true
         passed:
           - process-high-critical-cves
-      - get: (@= data.values.stemcell_details.os @)-usn-gh-json
+      - get: (@= data.values.stemcell_details.os_short_name @)-usn-gh-json
         passed:
           - process-high-critical-cves
     - task: check-usn-packages
       file: bosh-stemcells-ci/ci/tasks/check-usn-packages.yml
       image: os-image-stemcell-builder-registry-image
       input_mapping:
         usn-log-in: usn-log
-        usn-gh-json: (@= data.values.stemcell_details.os @)-usn-gh-json
+        usn-gh-json: (@= data.values.stemcell_details.os_short_name @)-usn-gh-json
       params:
-        OS: (@= data.values.stemcell_details.os @)
+        OS: (@= data.values.stemcell_details.os_short_name @)
       vars:
-        image_os_tag: (@= data.values.stemcell_details.os @)
+        image_os_tag: (@= data.values.stemcell_details.os_short_name @)
     - task: write-message
       file: bosh-stemcells-ci/ci/tasks/write-bump-message.yml
       image: bosh-integration-image
@@ -182,21 +182,21 @@ jobs:
       - get: os-image-stemcell-builder-registry-image
       - get: bosh-linux-stemcell-builder
         resource: bosh-linux-stemcell-builder
-      - get: (@= data.values.stemcell_details.os @)-usn-low-medium
+      - get: (@= data.values.stemcell_details.os_short_name @)-usn-low-medium
         version: every
         trigger: true
       - get: usn-log
-      - get: (@= data.values.stemcell_details.os @)-usn-gh-json
+      - get: (@= data.values.stemcell_details.os_short_name @)-usn-gh-json
       - get: low-medium-unfound-usns
     - task: check-if-usn-is-in-github
       file: bosh-stemcells-ci/ci/tasks/check-if-usn-is-in-github.yml
       image: os-image-stemcell-builder-registry-image
       input_mapping:
-        usn: (@= data.values.stemcell_details.os @)-usn-low-medium
-        usn-gh-json: (@= data.values.stemcell_details.os @)-usn-gh-json
+        usn: (@= data.values.stemcell_details.os_short_name @)-usn-low-medium
+        usn-gh-json: (@= data.values.stemcell_details.os_short_name @)-usn-gh-json
         unfound-usns: low-medium-unfound-usns
       vars:
-        image_os_tag: (@= data.values.stemcell_details.os @)
+        image_os_tag: (@= data.values.stemcell_details.os_short_name @)
     - put: low-medium-unfound-usns
       params:
         file: updated-unfound-usns/usns.json
@@ -207,11 +207,11 @@ jobs:
         image: os-image-stemcell-builder-registry-image
         input_mapping:
           usns: found-usns
-          usn-gh-json: (@= data.values.stemcell_details.os @)-usn-gh-json
+          usn-gh-json: (@= data.values.stemcell_details.os_short_name @)-usn-gh-json
         params:
-          OS: (@= data.values.stemcell_details.os @)
+          OS: (@= data.values.stemcell_details.os_short_name @)
         vars:
-          image_os_tag: (@= data.values.stemcell_details.os @)
+          image_os_tag: (@= data.values.stemcell_details.os_short_name @)
         on_success:
           put: usn-log
           params:
@@ -243,10 +243,10 @@ jobs:
     image: os-image-stemcell-builder-registry-image
     params:
       OPERATING_SYSTEM_NAME: ubuntu
-      OPERATING_SYSTEM_VERSION: (@= data.values.stemcell_details.os @)
+      OPERATING_SYSTEM_VERSION: (@= data.values.stemcell_details.os_short_name @)
     privileged: true
     vars:
-      image_os_tag: (@= data.values.stemcell_details.os @)
+      image_os_tag: (@= data.values.stemcell_details.os_short_name @)
   - put: os-image-tarball
     params:
       files:
@@ -477,14 +477,14 @@ jobs:
       IAAS: #@ IAAS
       OS_NAME: ubuntu
       S3_API_ENDPOINT: storage.googleapis.com
-      OS_VERSION: (@= data.values.stemcell_details.os @)(@= FIPS @)
+      OS_VERSION: (@= data.values.stemcell_details.os_short_name @)(@= FIPS @)
       STEMCELL_BUCKET: bosh-core-stemcells-candidate(@= FIPS @)
       #! AGENT_SUFFIX: ""
       #@ if/end FIPS != "":
       UBUNTU_ADVANTAGE_TOKEN: ((ubuntu_advantage_token))
     privileged: true
     vars:
-      image_os_tag: (@= data.values.stemcell_details.os @)
+      image_os_tag: (@= data.values.stemcell_details.os_short_name @)
   - in_parallel:
     - put: (@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @)
       attempts: 3
@@ -576,7 +576,7 @@ jobs:
         file: bosh-stemcells-ci/ci/tasks/bats/iaas/gcp/prepare-bats-config.yml
         image: bosh-integration-image
         params:
-          VARS_STEMCELL_NAME: bosh-google-kvm-ubuntu-(@= data.values.stemcell_details.os @)-go_agent
+          VARS_STEMCELL_NAME: bosh-google-kvm-ubuntu-(@= data.values.stemcell_details.os_short_name @)-go_agent
           VARS_NETWORK_DEFAULT: bosh-concourse
           VARS_AVAILABILITY_ZONE: europe-north2-a
           VARS_MACHINE_TYPE: e2-standard-2
@@ -642,7 +642,7 @@ jobs:
       FROM_BUCKET_NAME: bosh-core-stemcells-candidate-fips
       FROM_INDEX: dev
       OS_NAME: ubuntu
-      OS_VERSION: (@= data.values.stemcell_details.os @)-fips
+      OS_VERSION: (@= data.values.stemcell_details.os_short_name @)-fips
       TO_BUCKET_NAME: bosh-core-stemcells-candidate-fips
       TO_INDEX: candidate
       AWS_ENDPOINT: "https://storage.googleapis.com"
@@ -662,7 +662,7 @@ jobs:
       FROM_BUCKET_NAME: bosh-core-stemcells-candidate
       FROM_INDEX: dev
       OS_NAME: ubuntu
-      OS_VERSION: (@= data.values.stemcell_details.os @)
+      OS_VERSION: (@= data.values.stemcell_details.os_short_name @)
       TO_BUCKET_NAME: bosh-core-stemcells-candidate
       TO_INDEX: candidate
       AWS_ENDPOINT: "https://storage.googleapis.com"
@@ -681,7 +681,7 @@ jobs:
 
 - name: notify-of-usn
   plan:
-  - get: (@= data.values.stemcell_details.os @)-usn
+  - get: (@= data.values.stemcell_details.os_short_name @)-usn
     passed:
       - process-high-critical-cves
   - get: bosh-integration-image
@@ -693,7 +693,7 @@ jobs:
     image: bosh-integration-image
     config:
       inputs:
-      - name: (@= data.values.stemcell_details.os @)-usn
+      - name: (@= data.values.stemcell_details.os_short_name @)-usn
       outputs:
       - name: slack-message
       platform: linux
@@ -719,8 +719,8 @@ jobs:
             }
           }
           EOF
-          cat (@= data.values.stemcell_details.os @)-usn/usn.json | jq -r "$(cat template.json)" | tee slack-message/attachments
-          cat (@= data.values.stemcell_details.os @)-usn/usn.json | jq -r '"New USN for (@= data.values.stemcell_details.os @): *<\(.url)|\(.title)>*"' | tee slack-message/message
+          cat (@= data.values.stemcell_details.os_short_name @)-usn/usn.json | jq -r "$(cat template.json)" | tee slack-message/attachments
+          cat (@= data.values.stemcell_details.os_short_name @)-usn/usn.json | jq -r '"New USN for (@= data.values.stemcell_details.os_short_name @): *<\(.url)|\(.title)>*"' | tee slack-message/message
         path: /bin/bash
   - put: slack-alert
     params:
@@ -997,14 +997,14 @@ resources:
   source:
     branch: master
     uri: https://github.com/cloudfoundry/bosh-deployment
-- name: (@= data.values.stemcell_details.os @)-usn-low-medium
+- name: (@= data.values.stemcell_details.os_short_name @)-usn-low-medium
   type: usn
   source:
     os: ubuntu-(@= data.values.stemcell_details.os_version @)-lts
     priorities:
     - low
     - medium
-- name: (@= data.values.stemcell_details.os @)-usn
+- name: (@= data.values.stemcell_details.os_short_name @)-usn
   type: usn
   source:
     os: ubuntu-(@= data.values.stemcell_details.os_version @)-lts
@@ -1014,7 +1014,7 @@ resources:
     severities:
     - high
     - critical
-- name: (@= data.values.stemcell_details.os @)-usn-gh-json
+- name: (@= data.values.stemcell_details.os_short_name @)-usn-gh-json
   type: git
   source:
     branch: main
@@ -1030,23 +1030,23 @@ resources:
   type: registry-image
   source:
     repository: ubuntu
-    tag: (@= data.values.stemcell_details.os @)
+    tag: (@= data.values.stemcell_details.os_short_name @)
     username: ((dockerhub_username))
     password: ((dockerhub_password))
 
 - name: os-image-stemcell-builder-registry-image
   type: registry-image
   source:
     repository: bosh/os-image-stemcell-builder
-    tag: (@= data.values.stemcell_details.os @)
+    tag: (@= data.values.stemcell_details.os_short_name @)
     username: ((dockerhub_username))
     password: ((dockerhub_password))
 
 - name: os-image-stemcell-builder-docker-image
   type: docker-image
   source:
     repository: bosh/os-image-stemcell-builder
-    tag: (@= data.values.stemcell_details.os @)
+    tag: (@= data.values.stemcell_details.os_short_name @)
     username: ((dockerhub_username))
     password: ((dockerhub_password))
 
@@ -1055,7 +1055,7 @@ resources:
   source:
     json_key: ((gcp_json_key))
     bucket: bosh-vmware-ovftool
-    regexp: (@= data.values.stemcell_details.os @)/(.*).bundle
+    regexp: (@= data.values.stemcell_details.os_short_name @)/(.*).bundle
 
 - name: bosh-blobstore-dav
   type: s3