Consolidate duplicate powershell code

- delete `stembuild/modules/` in favor of `modules/`
- consolidate `bin/build-stemcell-automation-zip.sh` into
  `ci/tasks/zip-files/run.bash`
- update `ci/tasks/build-psmodules-zip/run.sh` to use `modules/`
- remove tests for `stembuild/modules/` code from
  `stemcells-windows.yml` pipeline
- update various docs

Author: aramprice

bin/build-stemcell-automation-zip.sh

@@ -686,11 +686,6 @@ jobs:
       tags: [windows-nimbus]
       params:
         MODULES_DIR: modules
-    - task: test-units-stembuild-psmodules
-      file: bosh-windows-stemcell-builder-ci/ci/tasks/test-units-bosh-psmodules/task.yml
-      tags: [windows-nimbus]
-      params:
-        MODULES_DIR: stembuild/modules
     - task: test-units-stembuild-stemcell-automation-psmodules
       file: bosh-windows-stemcell-builder-ci/ci/tasks/test-units-bosh-psmodules/task.yml
       tags: [windows-nimbus]

ci/pipelines/stemcells-windows.yml

@@ -8,6 +8,6 @@ zip_output_dir="${CONCOURSE_ROOT}/${ZIP_OUTPUT_DIR:-"stemcell-builder/build"}"
 
 mkdir -p "${zip_output_dir}"
 
-pushd "${CONCOURSE_ROOT}/stemcell-builder/modules"
-  zip -r "${zip_output_dir}/bosh-psmodules.zip" ./*
+pushd "${CONCOURSE_ROOT}/modules"
+  zip -r "${zip_output_dir}/bosh-psmodules.zip" ./BOSH.*
 popd

ci/tasks/build-psmodules-zip/run.sh

@@ -3,12 +3,27 @@ set -eu -o pipefail
 
 ROOT_DIR=$(pwd)
 
-export OPENSSH_ZIP=open-ssh/OpenSSH-Win64.zip
-export BOSH_PSMODULES_ZIP=psmodules-zip-output/bosh-psmodules.zip
-export AGENT_ZIP=bosh-agent/agent.zip
-export DEPS_JSON=deps-file/deps.json
+REPO_ROOT="${REPO_ROOT:-"$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"}"
+ZIP_FILE_DESTINATION="${ZIP_FILE_DESTINATION:-"${ROOT_DIR}/zip-file/StemcellAutomation-$(date +"%s").zip"}"
 
-"${ROOT_DIR}/stemcell-builder/bin/build-stemcell-automation-zip.sh"
+OPENSSH_ZIP="${OPENSSH_ZIP:-"${ROOT_DIR}/open-ssh/OpenSSH-Win64.zip"}"
+BOSH_PSMODULES_ZIP="${BOSH_PSMODULES_ZIP:-"${ROOT_DIR}/psmodules-zip-output/bosh-psmodules.zip"}"
+AGENT_ZIP="${AGENT_ZIP:-"${ROOT_DIR}/bosh-agent/agent.zip"}"
+DEPS_JSON="${DEPS_JSON:-"${ROOT_DIR}/deps-file/deps.json"}"
 
-cp "${ROOT_DIR}/stemcell-builder/stembuild/assets/StemcellAutomation.zip" \
-  "zip-file/StemcellAutomation-$(date +"%s").zip"
+TEMP_DIR=$(mktemp -d)
+trap 'rm -r "${TEMP_DIR}"' EXIT
+stemcell_automation_dir="${TEMP_DIR}/stemcell_automation"
+stemcell_automation_zip="${TEMP_DIR}/StemcellAutomation.zip"
+
+mkdir -p "${stemcell_automation_dir}"
+
+declare -a files_to_zip
+mapfile -t files_to_zip < <(find "${REPO_ROOT}/stembuild/stemcell-automation" -type f -not -name "*Test*" -name "*.ps*1")
+files_to_zip+=("${OPENSSH_ZIP}" "${BOSH_PSMODULES_ZIP}" "${AGENT_ZIP}" "${DEPS_JSON}")
+
+cp "${files_to_zip[@]}" "${stemcell_automation_dir}"
+
+zip -rj "${stemcell_automation_zip}" "${stemcell_automation_dir}"
+
+cp "${stemcell_automation_zip}" "${ZIP_FILE_DESTINATION}"

ci/tasks/zip-files/run.bash

@@ -10,8 +10,7 @@ The test suite for each module currently assumes that the tests are being run wi
 This requires iterating through the module directories to run all the tests:
 
 ```powershell
-# Where MODULES_DIR is "stembuild/modules", or "modules"
-cd $MODULES_DIR
+cd modules
 foreach ($module in (Get-ChildItem "./modules").Name) {
   Push-Location "modules/$module"
     $results=Invoke-Pester -PassThru
@@ -26,21 +25,17 @@ echo "Failed Tests: $result"
 If you just need to test a single module, you could do this:
 
 ```powershell
-# Where MODULES_DIR is "stembuild/modules", or "modules"
-cd "${MODULES_DIR}/BOSH.<module>"
+cd "modules/BOSH.<module>"
 Install-Module -Name Pester -Force
 Invoke-Pester
 ```
 
 ### Running tests via Concourse
 
 ```shell
-# Where MODULES_DIR is "stembuild/modules", or "modules"
-export MODULES_DIR="${MODULES_DIR}"
-
 WINDOWS_STEMCELL_BUILDER=${WINDOWS_STEMCELL_BUILDER:-~/workspace/bosh-windows-stemcell-builder}
 
-fly -t "${CONCOURSE_TARGET:-bosh-ecosystem}" \
+MODULES_DIR="${DIR_WITH_PESTER_TESTS}" fly -t "${CONCOURSE_TARGET:-bosh-ecosystem}" \
     --tag="${WINDOWS_TAG:-windows-nimbus}" \
     --input=stemcell-builder="${WINDOWS_STEMCELL_BUILDER}" \
     --input-mapping="bosh-windows-stemcell-builder-ci=stemcell-builder" \

modules/README.md

@@ -263,13 +263,13 @@ You will need to construct `assets/StemcellAutomation.zip`. This file represents
 ```json
 {
   "OpenSSH-Win64.zip": {
-    "sha": "SOME-SHA256",
+    "sha": "SOME-SHA256"
   },
   "bosh-psmodules.zip": {
-    "sha": "SOME-SHA256",
+    "sha": "SOME-SHA256"
   },
   "agent.zip": {
-    "sha": "SOME-SHA256",
+    "sha": "SOME-SHA256"
   },
   "LGPO.zip": {
     "sha": "SOME-SHA256",
@@ -278,13 +278,14 @@ You will need to construct `assets/StemcellAutomation.zip`. This file represents
 }
 ```
 
-Once you have these files, run `./bin/build-stemcell-automation-zip.sh`:
+Once you have these files, run:
 ```bash
-OPENSSH_ZIP=OpenSSH-Win64.zip \
+OPENSSH_ZIP="OpenSSH-Win64.zip" \
 BOSH_PSMODULES_ZIP="bosh-psmodules.zip" \
 AGENT_ZIP="agent.zip" \
 DEPS_JSON="deps.json" \
-./bin/build-stemcell-automation-zip.sh
+ZIP_FILE_DESTINATION="stembuild/assets/StemcellAutomation.zip" \
+./ci/tasks/zip-files/run.bash
 ```
 
 Use `make build` to build stembuild, providing the corresponding values for the stemcell version you