CI: stop defaultling AGENT_SUFFIX

- set explicitly in pipeline config

Author: aramprice

ci/pipelines/builder.yml

@@ -480,7 +480,7 @@ jobs:
       STEMCELL_BUCKET: bosh-core-stemcells-candidate(@= FIPS @)
       GIT_USER_EMAIL: *ci_bot_email
       GIT_USER_NAME: *ci_bot_name
-      #! AGENT_SUFFIX: ""
+      AGENT_SUFFIX: (@= data.values.stemcell_details.agent_suffix @)
       #@ if/end FIPS != "":
       UBUNTU_ADVANTAGE_TOKEN: ((ubuntu_advantage_token))
     privileged: true
@@ -492,7 +492,7 @@ jobs:
       params:
         files:
         - stemcell/*.tgz
-        rename: "{{.Version}}/(@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @)-go_agent.meta4"
+        rename: "{{.Version}}/(@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @)(@= data.values.stemcell_details.agent_suffix @).meta4"
         options:
           author_email: *ci_bot_email
           author_name: *ci_bot_name
@@ -577,7 +577,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_short_name @)-go_agent
+          VARS_STEMCELL_NAME: bosh-google-kvm-ubuntu-(@= data.values.stemcell_details.os_short_name @)(@= data.values.stemcell_details.agent_suffix @)
           VARS_NETWORK_DEFAULT: bosh-concourse
           VARS_AVAILABILITY_ZONE: europe-north2-a
           VARS_MACHINE_TYPE: e2-standard-2
@@ -641,7 +641,7 @@ jobs:
       COMMIT_PREFIX: candidate
       COPY_KEYS:
       #@ for iaas in data.values.stemcell_details.include_fips_iaas:
-        - (@= iaas.iaas @)/bosh-stemcell-%s-(@= iaas.iaas @)-(@= iaas.hypervisor @)-(@= data.values.stemcell_details.os_name @)-fips-go_agent.tgz
+        - (@= iaas.iaas @)/bosh-stemcell-%s-(@= iaas.iaas @)-(@= iaas.hypervisor @)-(@= data.values.stemcell_details.os_name @)-fips(@= data.values.stemcell_details.agent_suffix @).tgz
       #@ end
       FROM_BUCKET_NAME: bosh-core-stemcells-candidate-fips
       FROM_INDEX: dev
@@ -663,7 +663,7 @@ jobs:
       COMMIT_PREFIX: candidate
       COPY_KEYS:
       #@ for iaas in data.values.stemcell_details.include_iaas:
-        - (@= iaas.iaas @)/bosh-stemcell-%s-(@= iaas.iaas @)-(@= iaas.hypervisor @)-(@= data.values.stemcell_details.os_name @)-go_agent.tgz
+        - (@= iaas.iaas @)/bosh-stemcell-%s-(@= iaas.iaas @)-(@= iaas.hypervisor @)-(@= data.values.stemcell_details.os_name @)(@= data.values.stemcell_details.agent_suffix @).tgz
       #@ end
       FROM_BUCKET_NAME: bosh-core-stemcells-candidate
       FROM_INDEX: dev
@@ -916,7 +916,7 @@ resources:
     options:
       private_key: ((github_deploy_key_bosh-io-stemcells-core-index.private_key))
     filters:
-    - repositorypath: "*/(@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @)-go_agent.meta4"
+    - repositorypath: "*/(@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @)(@= data.values.stemcell_details.agent_suffix @).meta4"
     uri: git+ssh://git@github.com:cloudfoundry/bosh-io-stemcells-core-index.git//dev/(@= data.values.stemcell_details.os_name @)(@= FIPS @)/
     url_handlers:
     - include:

ci/pipelines/vars.yml

@@ -1,6 +1,7 @@
 #@data/values
 ---
 stemcell_details:
+  agent_suffix: "-go_agent"
   branch: ubuntu-jammy
   major_version: 1
   os_version: "22.04"

ci/tasks/build.sh

@@ -23,7 +23,6 @@ check_param IAAS
 check_param HYPERVISOR
 check_param OS_NAME
 check_param OS_VERSION
-AGENT_SUFFIX="${AGENT_SUFFIX--go_agent}"
 
 export CANDIDATE_BUILD_NUMBER=$( cat "${REPO_PARENT}/version/number" | sed 's/\.0$//;s/\.0$//' )
 

ci/tasks/build.yml

@@ -27,6 +27,6 @@ params:
   STEMCELL_BUCKET: replace-me
   S3_API_ENDPOINT: s3.amazonaws.com
   ESM_TOKEN:
-  AGENT_SUFFIX: -go_agent
+  AGENT_SUFFIX:
   GIT_USER_EMAIL:
   GIT_USER_NAME: