Simplify pipeline scripts / vars

Author: aramprice

ci/configure.sh

@@ -3,29 +3,6 @@ set -eu -o pipefail
 
 REPO_ROOT="$( cd "$( dirname "${0}" )/.." && pwd )"
 
-if [ "$#" == 0 ]; then
-  mapfile -t available_pipelines < <(find "${REPO_ROOT}/ci/pipelines" -type f -name '*.yml' -depth 1 | sort)
-
-  i=1
-  echo "Choose a pipeline to configure:"
-  for pipeline in "${available_pipelines[@]}"; do
-    printf "%4s. $(basename "${pipeline}" '.yml')\n" "${i}"
-    i=$((i + 1))
-  done
-  read -rp "pipeline: " pipeline_index
-  echo ""
-
-  pipeline_name="$(basename "${available_pipelines[(pipeline_index-1)]}" .yml)"
-elif [ "$#" == 1 ]; then
-  # Allow just pipeline name or path to yml file
-  pipeline_name="$(basename "${1}" .yml)"
-else
-  echo "Usage: configure.sh [PIPELINE_NAME_OR_FILE]"
-  exit 1
-fi
-
-echo "Configuring ${pipeline_name}..."
-
 fly="${FLY_CLI:-fly}"
 concourse_target="${CONCOURSE_TARGET:-bosh-ecosystem}"
 
@@ -34,16 +11,7 @@ until "${fly}" -t "${concourse_target}" status;do
   sleep 1
 done
 
-if [ -d  "${REPO_ROOT}/ci/pipelines/${pipeline_name}" ]; then
-  pipeline_file_path="${REPO_ROOT}/ci/pipelines/${pipeline_name}"
-else
-  pipeline_file_path="${REPO_ROOT}/ci/pipelines/${pipeline_name}.yml"
-fi
-
 "${fly}" -t "${concourse_target}" set-pipeline \
-  -p "${pipeline_name}" \
-  -c <( \
-        bosh int "${pipeline_file_path}" \
-            -l "${REPO_ROOT}/ci/pipelines/vars/2019-vars.yml" \
-    ) \
-  -l "${REPO_ROOT}/ci/pipelines/vars/vars.yml"
+  -p "stemcells-windows-2019" \
+  -c "${REPO_ROOT}/ci/pipelines/stemcells-windows.yml" \
+  -l "${REPO_ROOT}/ci/pipelines/vars.yml"

ci/pipelines/stemcells-windows-2019.yml ci/pipelines/stemcells-windows.ymlci/pipelines/stemcells-windows-2019.yml renamed to ci/pipelines/stemcells-windows.yml

@@ -1,5 +1,8 @@
 ---
-#Common Variables
+ROOT_EPHEMERAL_VM_TYPE: "use_root_disk_as_ephemeral"
+BOSH_AGENT_RELEASE_VERSION: "~2"
+
+# Common Variables
 AWS_LOCK: 'stemcells-aws'
 AZURE_LOCK: 'stemcells-azure'
 BASE_FOLDER_NAME: '2019'
@@ -25,20 +28,20 @@ GOOSE_POOL_NAME: 'goose-2019'
 GCP_POOL_NAME: 'gcp-wuts-2019'
 VSPHERE_POOL_NAME: 'vsphere-2019'
 
-#AWS Base Image Info
+# AWS Base Image Info
 BASE_AMI_NAME: 'Windows_Server-2019-English-Core-Base-*'
-#AWS Output Info
+# AWS Output Info
 AWS_REGIONAL_BUCKET: 'aws-regional-stemcells-2019'
-#AWS Packer Info
+# AWS Packer Info
 AWS_PACKER_REGION: 'us-east-1'
 AWS_CHINA_PACKER_REGION: 'cn-north-1'
 AWS_GOVCLOUD_PACKER_REGION: 'us-gov-west-1'
 
-#GCP Base Image Info
+# GCP Base Image Info
 BASE_IMAGE_REGEX: 'windows-server-2019-dc-core-v.*'
 IMAGE_FAMILY: 'windows-2019-core'
 
-#Azure Create & Publish Variables
+# Azure Create & Publish Variables
 AZURE_BASE_IMAGE: '2019-Datacenter-Core-smalldisk'
 AZURE_BASE_IMAGE_OFFER: 'WindowsServer'
 AZURE_CONTAINER_NAME: 'system'
@@ -67,4 +70,3 @@ BOSHIO_OS_VERSION: '2019'
 OVA_SOURCE_S3_REGION: "us-east-1"
 OVA_SOURCE_S3_BUCKET: "all-bosh-windows"
 OVA_SOURCE_S3_FILENAME: "ova-for-stembuild-test/Windows2019_VMWTools10.3.10_NoPassExp.ova"
-