Skip to content

Commit 5d3dc67

Browse files
arampricearamprice
committed
CI: residual fixes for Jammy -> Noble
1 parent 270bf37 commit 5d3dc67

File tree

2 files changed

+20
-13
lines changed

2 files changed

+20
-13
lines changed

‎ci/pipeline.yml‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@ jobs:
430430
- do:
431431
- in_parallel:
432432
- get: bosh-ci
433+
- get: integration-image
433434
- get: bosh-candidate-release-tarballs
434435
passed: [ compile-bosh-dev-release-jammy ]
435436
- get: bosh-release
@@ -446,7 +447,6 @@ jobs:
446447
- get: bosh-deployment
447448
- get: bosh
448449
passed: [ compile-bosh-dev-release-jammy ]
449-
- get: integration-image
450450
- put: terraform
451451
resource: gcp-terraform
452452
params:
@@ -499,8 +499,8 @@ jobs:
499499
serial_groups: [ bats-ubuntu-jammy ]
500500
plan:
501501
- in_parallel:
502-
- get: integration-image
503502
- get: bosh-ci
503+
- get: integration-image
504504
- get: daily
505505
trigger: true
506506
- task: cleanup-leftover-environments
@@ -517,6 +517,7 @@ jobs:
517517
- do:
518518
- in_parallel:
519519
- get: bosh-ci
520+
- get: integration-image
520521
- get: bosh-candidate-release-tarballs
521522
passed: [ compile-bosh-dev-release-jammy ]
522523
- get: bosh-release
@@ -533,7 +534,6 @@ jobs:
533534
- get: bosh-deployment
534535
- get: bosh
535536
passed: [ compile-bosh-dev-release-jammy ]
536-
- get: integration-image
537537
- put: terraform
538538
resource: gcp-terraform
539539
params:
@@ -587,8 +587,8 @@ jobs:
587587
serial_groups: [ bats-fips-ubuntu-jammy ]
588588
plan:
589589
- in_parallel:
590-
- get: integration-image
591590
- get: bosh-ci
591+
- get: integration-image
592592
- get: daily
593593
trigger: true
594594
- task: cleanup-leftover-environments
@@ -603,6 +603,7 @@ jobs:
603603
plan:
604604
- in_parallel:
605605
- get: bosh-ci
606+
- get: integration-image
606607
- get: bosh
607608
passed: [ compile-bosh-dev-release-jammy ]
608609
- get: bosh-dns-release
@@ -616,7 +617,6 @@ jobs:
616617
passed: [ compile-bosh-dev-release-jammy ]
617618
- get: bosh-deployment
618619
- get: docker-cpi-image
619-
- get: integration-image
620620
- do:
621621
- put: brats-terraform
622622
params:
@@ -662,6 +662,7 @@ jobs:
662662
plan:
663663
- in_parallel:
664664
- get: bosh-ci
665+
- get: integration-image
665666
- get: bosh
666667
passed: [ compile-bosh-dev-release-jammy ]
667668
- get: bosh-release
@@ -683,9 +684,9 @@ jobs:
683684
plan:
684685
- in_parallel:
685686
- get: bosh-ci
687+
- get: integration-image
686688
- get: bosh
687689
passed: [ compile-bosh-dev-release-jammy ]
688-
- get: integration-image
689690
- do:
690691
- task: test-brats-utils
691692
file: bosh-ci/ci/shared/brats/test-utils.yml
@@ -696,6 +697,7 @@ jobs:
696697
plan:
697698
- in_parallel:
698699
- get: bosh-ci
700+
- get: integration-image
699701
- get: bosh
700702
passed: [ compile-bosh-dev-release-jammy ]
701703
- get: stemcell
@@ -725,6 +727,7 @@ jobs:
725727
- do:
726728
- in_parallel:
727729
- get: bosh-ci
730+
- get: integration-image
728731
- get: bosh
729732
passed: [ compile-bosh-dev-release-jammy ]
730733
- get: stemcell
@@ -740,7 +743,6 @@ jobs:
740743
passed: [ compile-bosh-dev-release-jammy ]
741744
- get: last-released-bosh-release
742745
- get: zookeeper-release
743-
- get: integration-image
744746
- put: terraform
745747
resource: gcp-terraform
746748
params:
@@ -815,8 +817,8 @@ jobs:
815817
serial_groups: [ upgrade-postgres ]
816818
plan:
817819
- in_parallel:
818-
- get: integration-image
819820
- get: bosh-ci
821+
- get: integration-image
820822
- get: daily
821823
trigger: true
822824
- task: cleanup-leftover-environments
@@ -833,6 +835,7 @@ jobs:
833835
- do:
834836
- in_parallel:
835837
- get: bosh-ci
838+
- get: integration-image
836839
- get: bosh
837840
passed: [ compile-bosh-dev-release-jammy ]
838841
- get: stemcell
@@ -848,7 +851,6 @@ jobs:
848851
passed: [ compile-bosh-dev-release-jammy ]
849852
- get: last-released-bosh-release
850853
- get: zookeeper-release
851-
- get: integration-image
852854
- put: terraform
853855
resource: gcp-terraform
854856
params:
@@ -926,8 +928,8 @@ jobs:
926928
serial_groups: [ upgrade-mysql ]
927929
plan:
928930
- in_parallel:
929-
- get: integration-image
930931
- get: bosh-ci
932+
- get: integration-image
931933
- get: daily
932934
trigger: true
933935
- task: cleanup-leftover-environments
@@ -956,6 +958,7 @@ jobs:
956958
plan:
957959
- in_parallel:
958960
- get: bosh-ci
961+
- get: integration-image
959962
- get: bosh-cli-registry-image
960963
- get: bosh-shared-ci
961964
- get: bosh
@@ -964,7 +967,6 @@ jobs:
964967
params:
965968
globs:
966969
- "bosh-cli-*-linux-amd64"
967-
- get: integration-image
968970
- get: version
969971
trigger: true
970972
- get: release-notes
@@ -1179,7 +1181,7 @@ jobs:
11791181
image: ubuntu-docker-image
11801182
params:
11811183
GITHUB_ACCESS_TOKEN: ((github_public_repo_token))
1182-
- put: integration-image
1184+
- put: integration-image-jammy
11831185
inputs:
11841186
- bosh-ci-dockerfiles
11851187
- docker-build-args
@@ -1278,8 +1280,9 @@ jobs:
12781280
plan:
12791281
- in_parallel:
12801282
- get: bosh-ci
1281-
- get: bosh-ci-dockerfiles
12821283
- get: integration-image
1284+
- get: bosh-ci-dockerfiles
1285+
- get: integration-image-jammy
12831286
trigger: true
12841287
- get: bosh-deployment
12851288
trigger: true
@@ -1329,6 +1332,7 @@ jobs:
13291332
plan:
13301333
- in_parallel:
13311334
- get: bosh-ci
1335+
- get: integration-image
13321336
- get: bosh-ci-dockerfiles
13331337
- get: integration-image-jammy
13341338
trigger: true
@@ -1419,6 +1423,7 @@ jobs:
14191423
plan:
14201424
- in_parallel:
14211425
- get: bosh-ci
1426+
- get: integration-image
14221427
- get: bosh
14231428
- get: nginx-release
14241429
trigger: true

‎ci/tasks/cleanup-leftovers.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
---
2+
platform: linux
3+
24
inputs:
35
- name: bosh-ci
46

0 commit comments

Comments
 (0)