CI: stembuild construct/package run with -debug

- move artifacts to a single directory
- cleanup shellcheck issues
- harmonize windows script

wip

Author: aramprice

ci/tasks/run-construct-stembuild-linux/run.sh

@@ -1,25 +1,27 @@
 #!/usr/bin/env bash
-set -ex
+set -eu -o pipefail
+set -x
 
+ROOT_DIR="$( pwd )"
 SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
 
-source ${SCRIPT_DIR}/../../common-scripts/update_nimbus_urls_and_cert.sh
+source "${SCRIPT_DIR}/../../common-scripts/update_nimbus_urls_and_cert.sh"
 
-cat > ca.crt <<END_OF_CERT
-$VCENTER_CA_CERT
-END_OF_CERT
+cp lgpo-binary/LGPO*.zip "${ROOT_DIR}/LGPO.zip"
 
-pushd stembuild-untested-linux
-  mv stembuild* stembuild
-popd
-mv stembuild-untested-linux/stembuild .
+ca_cert_file="${ROOT_DIR}/vcenter_ca.crt"
+echo "${VCENTER_CA_CERT}" > "${ca_cert_file}"
 
-mv lgpo-binary/LGPO*.zip LGPO.zip
+cp stembuild-untested-linux/stembuild* "${ROOT_DIR}/stembuild"
+chmod 500 "${ROOT_DIR}/stembuild"
 
-chmod 500 stembuild
-./stembuild construct \
-  -vcenter-url ${VCENTER_BASE_URL} -vcenter-username ${VCENTER_USERNAME} -vcenter-password ${VCENTER_PASSWORD} \
-  -vcenter-ca-certs ca.crt \
-  -vm-inventory-path ${VCENTER_VM_FOLDER}/${STEMBUILD_BASE_VM_NAME} \
-  -vm-ip ${STEMBUILD_BASE_VM_IP} -vm-username ${STEMBUILD_BASE_VM_USERNAME} -vm-password ${STEMBUILD_BASE_VM_PASSWORD} \
+./stembuild -debug construct \
+  -vcenter-url "${VCENTER_BASE_URL}" \
+    -vcenter-username "${VCENTER_USERNAME}" \
+    -vcenter-password "${VCENTER_PASSWORD}" \
+  -vcenter-ca-certs "${ca_cert_file}" \
+  -vm-inventory-path "${VCENTER_VM_FOLDER}/${STEMBUILD_BASE_VM_NAME}" \
+  -vm-ip "${STEMBUILD_BASE_VM_IP}" \
+    -vm-username "${STEMBUILD_BASE_VM_USERNAME}" \
+    -vm-password "${STEMBUILD_BASE_VM_PASSWORD}" \
   -setup-arg FailOnInstallWUCerts

ci/tasks/run-construct-stembuild-windows/run.ps1

@@ -1,27 +1,31 @@
+Set-PSDebug -Trace 2
+
 $ErrorActionPreference = "Stop";
 trap { Exit 1 }
 
+$ROOT_DIR=Get-Location
+
 Import-Module ./bosh-windows-stemcell-builder-ci/ci/common-scripts/setup-windows-container.psm1
 Set-TmpDir
 Set-VCenterHostAndCert
 
-$env:VCENTER_CA_CERT | Set-Content ca.crt
-
-pushd stembuild-untested-windows
-    Move-Item stembuild* stembuild.exe
-popd
+Copy-Item lgpo-binary/LGPO*.zip "$ROOT_DIR\LGPO.zip"
 
-Move-Item stembuild-untested-windows/stembuild.exe .
+$ca_cert_file="$ROOT_DIR\ca.crt"
+$env:VCENTER_CA_CERT | Set-Content "$ca_cert_file"
 
-Move-Item lgpo-binary/LGPO*.zip LGPO.zip
+Copy-Item -Path stembuild-untested-windows/stembuild* "$ROOT_DIR\stembuild.exe"
+ICACLS "$ROOT_DIR\stembuild.exe" /grant:r "users:(RX)" /C
 
-ICACLS stembuild.exe /grant:r "users:(RX)" /C
-
-Write-Host ".\stembuild.exe construct -vcenter-url $env:VCENTER_BASE_URL -vcenter-username $env:VCENTER_USERNAME -vcenter-password <redacted> -vm-inventory-path $env:VCENTER_VM_FOLDER/$env:STEMBUILD_BASE_VM_NAME -vm-ip $env:STEMBUILD_BASE_VM_IP -vm-username $env:STEMBUILD_BASE_VM_USERNAME -vm-password STEMBUILD_BASE_VM_PASSWORD -vcenter-ca-certs ca.crt"
-.\stembuild.exe construct `
-    -vcenter-url $env:VCENTER_BASE_URL -vcenter-username $env:VCENTER_USERNAME -vcenter-password $env:VCENTER_PASSWORD `
-    -vcenter-ca-certs ca.crt `
+.\stembuild.exe -debug construct `
+    -vcenter-url $env:VCENTER_BASE_URL `
+        -vcenter-username $env:VCENTER_USERNAME `
+        -vcenter-password $env:VCENTER_PASSWORD `
+    -vcenter-ca-certs $ca_cert_file `
     -vm-inventory-path $env:VCENTER_VM_FOLDER/$env:STEMBUILD_BASE_VM_NAME `
-    -vm-ip $env:STEMBUILD_BASE_VM_IP -vm-username $env:STEMBUILD_BASE_VM_USERNAME -vm-password $env:STEMBUILD_BASE_VM_PASSWORD `
+    -vm-ip $env:STEMBUILD_BASE_VM_IP `
+        -vm-username $env:STEMBUILD_BASE_VM_USERNAME `
+        -vm-password $env:STEMBUILD_BASE_VM_PASSWORD `
     -setup-arg FailOnInstallWUCerts
+
 exit $LASTEXITCODE

ci/tasks/run-package-stembuild-linux/run.sh

@@ -2,33 +2,28 @@
 set -eu -o pipefail
 set -x
 
+ROOT_DIR="$( pwd )"
 SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
 
 source "${SCRIPT_DIR}/../../common-scripts/update_nimbus_urls_and_cert.sh"
 
-cat > ca.crt <<END_OF_CERT
-$VCENTER_CA_CERT
-END_OF_CERT
+build_version="$(cat build-number/number)"
+build_patch="$(echo "${build_version}" | cut -d . -f3,4)"
+build_date="$(date -u +"%Y%m%d%H%M")"
+patch_version="${build_patch}${build_date}"
 
-pushd stembuild-untested-linux
-  mv stembuild* stembuild
-popd
-mv stembuild-untested-linux/stembuild .
+ca_cert_file="${ROOT_DIR}/vcenter_ca.crt"
+echo "${VCENTER_CA_CERT}" > "${ca_cert_file}"
 
-chmod 500 stembuild
+cp stembuild-untested-linux/stembuild* "${ROOT_DIR}/stembuild"
+chmod 500 "${ROOT_DIR}/stembuild"
 
-version="$(cat build-number/number)"
-stemcell_build_number="$(date -u +"%Y%m%d%H%M")"
-IFS='.' read -r -a array <<< "$version"
-patch_version="${array[2]}.${array[3]}${stemcell_build_number}"
-
-./stembuild package \
-  -vcenter-ca-certs ca.crt \
+./stembuild -debug package \
   -vcenter-url "${VCENTER_BASE_URL}" \
-  -vcenter-username "${VCENTER_USERNAME}" \
-  -vcenter-password "${VCENTER_PASSWORD}" \
+    -vcenter-username "${VCENTER_USERNAME}" \
+    -vcenter-password "${VCENTER_PASSWORD}" \
+  -vcenter-ca-certs "${ca_cert_file}" \
   -vm-inventory-path "${VCENTER_VM_FOLDER}/${STEMBUILD_BASE_VM_NAME}" \
   -patch-version "${patch_version}"
 
 mv *.tgz stembuild-built-stemcell
-

ci/tasks/run-package-stembuild-windows/run.ps1

@@ -1,26 +1,32 @@
+Set-PSDebug -Trace 2
+
 $ErrorActionPreference = "Stop";
 trap { Exit 1 }
 
+$ROOT_DIR=Get-Location
+
 Import-Module ./bosh-windows-stemcell-builder-ci/ci/common-scripts/setup-windows-container.psm1
 Set-TmpDir
 Set-VCenterHostAndCert
 
-$env:VCENTER_CA_CERT | Set-Content ca.crt
-
-pushd stembuild-untested-windows
-    Move-Item stembuild* stembuild.exe
-popd
-
-Move-Item stembuild-untested-windows/stembuild.exe .
-
-ICACLS stembuild.exe /grant:r "users:(RX)" /C
-
 $version="$(cat .\build-number\number)"
 $stemcellBuildNumber="$(Get-Date -Format "yyyyMMddHHmm")"
 $patch,$build=$version.split('.')[2,3]
 $patch_version="$patch.$build$stemcellBuildNumber"
 
-.\stembuild.exe package -vcenter-url $env:VCENTER_BASE_URL -vcenter-username $env:VCENTER_USERNAME -vcenter-password $env:VCENTER_PASSWORD -vm-inventory-path $env:VCENTER_VM_FOLDER/$env:STEMBUILD_BASE_VM_NAME -patch-version $patch_version -vcenter-ca-certs "ca.crt"
+$ca_cert_file="$ROOT_DIR\ca.crt"
+$env:VCENTER_CA_CERT | Set-Content "$ca_cert_file"
+
+Copy-Item -Path stembuild-untested-windows/stembuild* "$ROOT_DIR\stembuild.exe"
+ICACLS "$ROOT_DIR\stembuild.exe" /grant:r "users:(RX)" /C
+
+.\stembuild.exe package `
+    -vcenter-url $env:VCENTER_BASE_URL `
+        -vcenter-username $env:VCENTER_USERNAME `
+        -vcenter-password $env:VCENTER_PASSWORD `
+    -vcenter-ca-certs $ca_cert_file `
+    -vm-inventory-path $env:VCENTER_VM_FOLDER/$env:STEMBUILD_BASE_VM_NAME `
+    -patch-version $patch_version
 
 $stembuild_exit_code=$LASTEXITCODE
 If (!($stembuild_exit_code -eq 0)) {