CI: use integrated bosh-psmodules instead of separate repo

aramprice · ystros · commit d2deff14f3a6 · 2025-05-09T12:05:24.000-07:00
Signed-off-by: Brian Upton &lt;brian.upton@broadcom.com&gt;
diff --git a/ci/pipelines/windows-2019-ng.yml b/ci/pipelines/windows-2019-ng.yml
@@ -167,13 +167,6 @@ resources:
     branch: windows-2019
     username: bosh-admin-bot
     password: ((github_public_repo_token))
-- name: bosh-psmodules-repo
-  type: git
-  source:
-    uri: https://github.com/cloudfoundry/bosh-psmodules.git
-    branch: windows-2019
-    username: bosh-admin-bot
-    password: ((github_public_repo_token))
 - name: bosh-stemcells-ci
   type: git
   source:
@@ -757,7 +750,7 @@ jobs:
         steps:
           - get: pester
           - get: bosh-windows-stemcell-builder-ci
-          - get: bosh-psmodules-repo
+          - get: stemcell-builder
             trigger: true
     - task: test-units-bosh-psmodules
       file: bosh-windows-stemcell-builder-ci/ci/tasks/test-units-bosh-psmodules/task.yml
@@ -790,10 +783,10 @@ jobs:
       - get: bosh-windows-stemcell-builder-ci-image
       - get: stemcell-builder
         trigger: true
-        passed: [test-stemcell-builder]
+        passed:
+        - test-stemcell-builder
+        - test-bosh-psmodules
       - get: stembuild
-      - get: bosh-psmodules-repo
-        passed: [test-bosh-psmodules]
       - get: lgpo-binary
       - get: version
         resource: main-version
@@ -902,8 +895,6 @@ jobs:
       - get: lgpo-binary
       - get: bosh-agent-release
         passed: [build]
-      - get: bosh-psmodules-repo
-        passed: [build]
       - get: stembuild
         passed: [build]
       - get: ovftool
@@ -927,10 +918,10 @@ jobs:
       - task: test-units-stemcell-automation
         file: bosh-windows-stemcell-builder-ci/ci/tasks/test-units-stemcell-automation/task.yml
         tags: [windows-nimbus]
-      - task: build-agent
+      - task: build-agent-zip
         file: bosh-windows-stemcell-builder-ci/ci/tasks/build-agent-zip/task.yml
         image: bosh-windows-stemcell-builder-ci-image
-      - task: build-psmodules
+      - task: build-psmodules-zip
         file: bosh-windows-stemcell-builder-ci/ci/tasks/build-psmodules-zip/task.yml
         image: bosh-windows-stemcell-builder-ci-image
       - task: unit-test
@@ -1016,8 +1007,6 @@ jobs:
       - get: lgpo-binary
       - get: bosh-agent-release
         passed: [build]
-      - get: bosh-psmodules-repo
-        passed: [build]
       - get: stembuild
         passed: [build]
       - get: ovftool
@@ -1042,10 +1031,10 @@ jobs:
       - task: test-units-stemcell-automation
         file: bosh-windows-stemcell-builder-ci/ci/tasks/test-units-stemcell-automation/task.yml
         tags: [windows-nimbus]
-      - task: build-agent
+      - task: build-agent-zip
         file: bosh-windows-stemcell-builder-ci/ci/tasks/build-agent-zip/task.yml
         image: bosh-windows-stemcell-builder-ci-image
-      - task: build-psmodules
+      - task: build-psmodules-zip
         file: bosh-windows-stemcell-builder-ci/ci/tasks/build-psmodules-zip/task.yml
         image: bosh-windows-stemcell-builder-ci-image
       - task: unit-test
@@ -1483,8 +1472,6 @@ jobs:
         resource: openssh-release
       - get: bosh-agent-release
         passed: [build]
-      - get: bosh-psmodules-repo
-        passed: [build]
       - get: blobstore-dav-cli
       - get: blobstore-s3-cli
       - get: blobstore-gcs-cli
@@ -1677,8 +1664,6 @@ jobs:
         resource: openssh-release
       - get: bosh-agent-release
         passed: [wuts-aws]
-      - get: bosh-psmodules-repo
-        passed: [build]
       - get: blobstore-dav-cli
       - get: blobstore-s3-cli
       - get: blobstore-gcs-cli
@@ -1844,8 +1829,6 @@ jobs:
         resource: openssh-release
       - get: bosh-agent-release
         passed: [build]
-      - get: bosh-psmodules-repo
-        passed: [build]
       - get: blobstore-dav-cli
       - get: blobstore-s3-cli
       - get: blobstore-gcs-cli
@@ -2039,8 +2022,6 @@ jobs:
         resource: openssh-release
       - get: bosh-agent-release
         passed: [build]
-      - get: bosh-psmodules-repo
-        passed: [build]
       - get: blobstore-dav-cli
       - get: blobstore-s3-cli
       - get: blobstore-gcs-cli
@@ -2239,8 +2220,6 @@ jobs:
         - wuts-gcp
         - wuts-aws-govcloud # implies => aws-build-number
         - wuts-azure
-      - get: bosh-psmodules-repo
-        passed: [build]
   - task: ensure-versions-match
     file: bosh-windows-stemcell-builder-ci/ci/tasks/match-stemcell-versions/task.yml
     image: bosh-windows-stemcell-builder-ci-image
@@ -2279,8 +2258,6 @@ jobs:
       - get: bosh-windows-acceptance-tests
       - get: bosh-agent-release
         passed: [promote]
-      - get: bosh-psmodules-repo
-        passed: [promote]
       - get: blobstore-dav-cli
       - get: blobstore-s3-cli
       - get: blobstore-gcs-cli
diff --git a/ci/tasks/build-psmodules-zip/run.sh b/ci/tasks/build-psmodules-zip/run.sh
@@ -8,8 +8,6 @@ zip_output_dir="${CONCOURSE_ROOT}/${ZIP_OUTPUT_DIR:-"stemcell-builder/build"}"
 
 mkdir -p "${zip_output_dir}"
 
-bosh_psmodules_dir="${CONCOURSE_ROOT}/${BOSH_PSMODULES_DIR:-"bosh-psmodules-repo"}/modules"
-
-pushd "${bosh_psmodules_dir}"
+pushd "${CONCOURSE_ROOT}/stemcell-builder/modules"
   zip -r "${zip_output_dir}/bosh-psmodules.zip" ./*
 popd
diff --git a/ci/tasks/build-psmodules-zip/task.yml b/ci/tasks/build-psmodules-zip/task.yml
@@ -2,16 +2,14 @@
 platform: linux
 
 inputs:
-- name: bosh-psmodules-repo
 - name: bosh-windows-stemcell-builder-ci
 - name: stemcell-builder
 
 outputs:
-- name: bosh-psmodules
+- name: psmodules-zip-output
 
 run:
   path: bosh-windows-stemcell-builder-ci/ci/tasks/build-psmodules-zip/run.sh
 
 params:
-  BOSH_PSMODULES_DIR: bosh-psmodules-repo
-  ZIP_OUTPUT_DIR: bosh-psmodules
+  ZIP_OUTPUT_DIR: psmodules-zip-output
diff --git a/ci/tasks/copy-aws-stemcell/task.yml b/ci/tasks/copy-aws-stemcell/task.yml
@@ -8,7 +8,6 @@ inputs:
   - name: amis
   - name: default-stemcell
   - name: bosh-agent-release
-  - name: bosh-psmodules-repo
   - name: blobstore-dav-cli
   - name: blobstore-s3-cli
   - name: blobstore-gcs-cli
@@ -32,4 +31,3 @@ params:
   AMIS_DIR: ../amis
   DEFAULT_STEMCELL_DIR: ../default-stemcell
   BOSH_AGENT_DIR: bosh-agent-release
-  BOSH_PSMODULES_DIR: bosh-psmodules-repo
diff --git a/ci/tasks/create-aws-stemcell/task.yml b/ci/tasks/create-aws-stemcell/task.yml
@@ -10,7 +10,6 @@ inputs:
   - name: sshd
   - name: packer-ci-private-key
   - name: bosh-agent-release
-  - name: bosh-psmodules-repo
   - name: blobstore-dav-cli
   - name: blobstore-s3-cli
   - name: blobstore-gcs-cli
@@ -42,4 +41,3 @@ params:
   OUTPUT_BUCKET_NAME: aws-regional-stemcells
   OUTPUT_BUCKET_REGION: us-east-1
   BOSH_AGENT_DIR: bosh-agent-release
-  BOSH_PSMODULES_DIR: bosh-psmodules-repo
diff --git a/ci/tasks/create-azure-stemcell/task.yml b/ci/tasks/create-azure-stemcell/task.yml
@@ -8,7 +8,6 @@ inputs:
   - name: lgpo-binary
   - name: sshd
   - name: bosh-agent-release
-  - name: bosh-psmodules-repo
   - name: blobstore-dav-cli
   - name: blobstore-s3-cli
   - name: blobstore-gcs-cli
@@ -42,4 +41,3 @@ params:
   BASE_IMAGE_OFFER:
   VM_PREFIX:
   BOSH_AGENT_DIR: bosh-agent-release
-  BOSH_PSMODULES_DIR: bosh-psmodules-repo
diff --git a/ci/tasks/create-gcp-stemcell/task.yml b/ci/tasks/create-gcp-stemcell/task.yml
@@ -9,7 +9,6 @@ inputs:
   - name: lgpo-binary
   - name: sshd
   - name: bosh-agent-release
-  - name: bosh-psmodules-repo
   - name: blobstore-dav-cli
   - name: blobstore-s3-cli
   - name: blobstore-gcs-cli
@@ -30,4 +29,3 @@ params:
   VERSION_DIR: ../version
   VM_PREFIX:
   BOSH_AGENT_DIR: bosh-agent-release
-  BOSH_PSMODULES_DIR: bosh-psmodules-repo
diff --git a/ci/tasks/test-integration-stembuild-linux/run.sh b/ci/tasks/test-integration-stembuild-linux/run.sh
@@ -14,7 +14,6 @@ echo '***Installing VMWare OVF Tools***'
 chmod +x ./ovftool/VMware-ovftool-4.2.0-5965791-lin.x86_64.bundle
 ./ovftool/VMware-ovftool-4.2.0-5965791-lin.x86_64.bundle --eulas-agreed --required
 
-export BOSH_PSMODULES_REPO="${ROOT_DIR}/bosh-psmodules-repo"
 export STEMBUILD_VERSION
 export TARGET_VM_IP
 export VM_NAME
diff --git a/ci/tasks/test-integration-stembuild-linux/task.yml b/ci/tasks/test-integration-stembuild-linux/task.yml
@@ -8,7 +8,7 @@ inputs:
 - name: ovftool
 - name: nimbus-ips
 - name: integration-vm-name
-- name: bosh-psmodules-repo
+- name: stemcell-builder
 
 run:
   path: bosh-windows-stemcell-builder-ci/ci/tasks/test-integration-stembuild-linux/run.sh
diff --git a/ci/tasks/test-integration-stembuild-windows/run.ps1 b/ci/tasks/test-integration-stembuild-windows/run.ps1
@@ -13,7 +13,6 @@ $ROOT_DIR=Get-Location
 Write-Host "ROOT: $ROOT_DIR"
 
 $env:VM_NAME= cat $ROOT_DIR/integration-vm-name/name
-$env:BOSH_PSMODULES_REPO="$ROOT_DIR/bosh-psmodules-repo"
 
 $TMP_DIR=Join-Path $ROOT_DIR tmp
 
diff --git a/ci/tasks/test-integration-stembuild-windows/task.yml b/ci/tasks/test-integration-stembuild-windows/task.yml
@@ -7,7 +7,7 @@ inputs:
 - name: version
 - name: nimbus-ips
 - name: integration-vm-name
-- name: bosh-psmodules-repo
+- name: stemcell-builder
 
 outputs:
 - name: output
diff --git a/ci/tasks/test-units-bosh-psmodules/run.ps1 b/ci/tasks/test-units-bosh-psmodules/run.ps1
@@ -8,8 +8,8 @@ $startupType = Get-Service "wuauserv" | Select-Object -ExpandProperty StartType
 "wuauserv status = * $status *"
 "wuauserv startuptype = * $startupType *"
 
-foreach ($module in (Get-ChildItem "./bosh-psmodules-repo/modules").Name) {
-  Push-Location "./bosh-psmodules-repo/modules/$module"
+foreach ($module in (Get-ChildItem "./stemcell-builder/modules").Name) {
+  Push-Location "./stemcell-builder/modules/$module"
     $results=Invoke-Pester -PassThru
     if ($results.FailedCount -gt 0) {
       $result += $results.FailedCount
diff --git a/ci/tasks/test-units-bosh-psmodules/task.yml b/ci/tasks/test-units-bosh-psmodules/task.yml
@@ -3,7 +3,7 @@ platform: windows
 
 inputs:
   - name: bosh-windows-stemcell-builder-ci
-  - name: bosh-psmodules-repo
+  - name: stemcell-builder
   - name: pester
 
 run:
diff --git a/ci/tasks/zip-files/run.bash b/ci/tasks/zip-files/run.bash
@@ -2,12 +2,13 @@
 set -eu -o pipefail
 
 ROOT_DIR=$(pwd)
-STEMBUILD_DIR="${ROOT_DIR}/stembuild/stembuild"
 
-OPENSSH_ZIP=open-ssh/OpenSSH-Win64.zip \
-BOSH_PSMODULES_ZIP=bosh-psmodules/bosh-psmodules.zip \
-AGENT_ZIP=bosh-agent/agent.zip \
-DEPS_JSON=deps-file/deps.json \
+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
+
 "${ROOT_DIR}/stembuild/bin/build-stemcell-automation-zip.sh"
 
-cp "${STEMBUILD_DIR}/assets/StemcellAutomation.zip" "zip-file/StemcellAutomation-$(date +"%s").zip"
+cp "${ROOT_DIR}/stembuild/stembuild/assets/StemcellAutomation.zip" \
+  "zip-file/StemcellAutomation-$(date +"%s").zip"
diff --git a/ci/tasks/zip-files/task.yml b/ci/tasks/zip-files/task.yml
@@ -7,7 +7,7 @@ inputs:
   - name: open-ssh
   - name: deps-file
   - name: bosh-agent
-  - name: bosh-psmodules
+  - name: psmodules-zip-output
 
 outputs:
   - name: zip-file
