CI: residual fixes for Jammy -> Noble

Author: aramprice

ci/pipeline.yml

@@ -430,6 +430,7 @@ jobs:
       - do:
           - in_parallel:
               - get: bosh-ci
+              - get: integration-image
               - get: bosh-candidate-release-tarballs
                 passed: [ compile-bosh-dev-release-jammy ]
               - get: bosh-release
@@ -446,7 +447,6 @@ jobs:
               - get: bosh-deployment
               - get: bosh
                 passed: [ compile-bosh-dev-release-jammy ]
-              - get: integration-image
           - put: terraform
             resource: gcp-terraform
             params:
@@ -499,8 +499,8 @@ jobs:
     serial_groups: [ bats-ubuntu-jammy ]
     plan:
       - in_parallel:
-          - get: integration-image
           - get: bosh-ci
+          - get: integration-image
           - get: daily
             trigger: true
       - task: cleanup-leftover-environments
@@ -517,6 +517,7 @@ jobs:
       - do:
           - in_parallel:
               - get: bosh-ci
+              - get: integration-image
               - get: bosh-candidate-release-tarballs
                 passed: [ compile-bosh-dev-release-jammy ]
               - get: bosh-release
@@ -533,7 +534,6 @@ jobs:
               - get: bosh-deployment
               - get: bosh
                 passed: [ compile-bosh-dev-release-jammy ]
-              - get: integration-image
           - put: terraform
             resource: gcp-terraform
             params:
@@ -587,8 +587,8 @@ jobs:
     serial_groups: [ bats-fips-ubuntu-jammy ]
     plan:
       - in_parallel:
-          - get: integration-image
           - get: bosh-ci
+          - get: integration-image
           - get: daily
             trigger: true
       - task: cleanup-leftover-environments
@@ -603,6 +603,7 @@ jobs:
     plan:
       - in_parallel:
           - get: bosh-ci
+          - get: integration-image
           - get: bosh
             passed: [ compile-bosh-dev-release-jammy ]
           - get: bosh-dns-release
@@ -616,7 +617,6 @@ jobs:
             passed: [ compile-bosh-dev-release-jammy ]
           - get: bosh-deployment
           - get: docker-cpi-image
-          - get: integration-image
       - do:
           - put: brats-terraform
             params:
@@ -662,6 +662,7 @@ jobs:
     plan:
       - in_parallel:
           - get: bosh-ci
+          - get: integration-image
           - get: bosh
             passed: [ compile-bosh-dev-release-jammy ]
           - get: bosh-release
@@ -683,9 +684,9 @@ jobs:
     plan:
       - in_parallel:
           - get: bosh-ci
+          - get: integration-image
           - get: bosh
             passed: [ compile-bosh-dev-release-jammy ]
-          - get: integration-image
       - do:
           - task: test-brats-utils
             file: bosh-ci/ci/shared/brats/test-utils.yml
@@ -696,6 +697,7 @@ jobs:
     plan:
       - in_parallel:
           - get: bosh-ci
+          - get: integration-image
           - get: bosh
             passed: [ compile-bosh-dev-release-jammy ]
           - get: stemcell
@@ -725,6 +727,7 @@ jobs:
       - do:
           - in_parallel:
               - get: bosh-ci
+              - get: integration-image
               - get: bosh
                 passed: [ compile-bosh-dev-release-jammy ]
               - get: stemcell
@@ -740,7 +743,6 @@ jobs:
                 passed: [ compile-bosh-dev-release-jammy ]
               - get: last-released-bosh-release
               - get: zookeeper-release
-              - get: integration-image
           - put: terraform
             resource: gcp-terraform
             params:
@@ -815,8 +817,8 @@ jobs:
     serial_groups: [ upgrade-postgres ]
     plan:
       - in_parallel:
-          - get: integration-image
           - get: bosh-ci
+          - get: integration-image
           - get: daily
             trigger: true
       - task: cleanup-leftover-environments
@@ -833,6 +835,7 @@ jobs:
       - do:
           - in_parallel:
               - get: bosh-ci
+              - get: integration-image
               - get: bosh
                 passed: [ compile-bosh-dev-release-jammy ]
               - get: stemcell
@@ -848,7 +851,6 @@ jobs:
                 passed: [ compile-bosh-dev-release-jammy ]
               - get: last-released-bosh-release
               - get: zookeeper-release
-              - get: integration-image
           - put: terraform
             resource: gcp-terraform
             params:
@@ -926,8 +928,8 @@ jobs:
     serial_groups: [ upgrade-mysql ]
     plan:
       - in_parallel:
-          - get: integration-image
           - get: bosh-ci
+          - get: integration-image
           - get: daily
             trigger: true
       - task: cleanup-leftover-environments
@@ -956,6 +958,7 @@ jobs:
     plan:
       - in_parallel:
           - get: bosh-ci
+          - get: integration-image
           - get: bosh-cli-registry-image
           - get: bosh-shared-ci
           - get: bosh
@@ -964,7 +967,6 @@ jobs:
             params:
               globs:
                 - "bosh-cli-*-linux-amd64"
-          - get: integration-image
           - get: version
             trigger: true
           - get: release-notes
@@ -1179,7 +1181,7 @@ jobs:
         image: ubuntu-docker-image
         params:
           GITHUB_ACCESS_TOKEN: ((github_public_repo_token))
-      - put: integration-image
+      - put: integration-image-jammy
         inputs:
           - bosh-ci-dockerfiles
           - docker-build-args
@@ -1279,7 +1281,7 @@ jobs:
       - in_parallel:
           - get: bosh-ci
           - get: bosh-ci-dockerfiles
-          - get: integration-image
+          - get: integration-image-jammy
             trigger: true
           - get: bosh-deployment
             trigger: true
@@ -1419,6 +1421,7 @@ jobs:
     plan:
       - in_parallel:
           - get: bosh-ci
+          - get: integration-image
           - get: bosh
           - get: nginx-release
             trigger: true

ci/tasks/cleanup-leftovers.yml

@@ -1,4 +1,6 @@
 ---
+platform: linux
+
 inputs:
   - name: bosh-ci