Skip to content

Commit 2c17a00

Browse files
author
git
committed
Merge branch 'main' of github.com:cloudfoundry/bosh into HEAD
2 parents 9fff419 + 90ee751 commit 2c17a00

File tree

2 files changed

+47
-29
lines changed

2 files changed

+47
-29
lines changed

ci/pipeline.yml

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ groups:
2828
- create-bosh-candidate-release-compiled
2929
- bats
3030
- bats-cleanup-leftovers
31-
- bats-fips
32-
- bats-fips-cleanup-leftovers
31+
- fips-bats
32+
- fips-bats-cleanup-leftovers
3333
- brats-acceptance
3434
- brats-utils
3535
- brats-performance
@@ -514,9 +514,10 @@ jobs:
514514
LEFTOVERS_PREFIX: bats
515515
GCP_JSON_KEY: ((gcp_json_key))
516516

517-
- name: bats-fips
517+
- name: fips-bats
518+
old_name: bats-fips
518519
serial: true
519-
serial_groups: [ bats-fips ]
520+
serial_groups: [ fips-bats ]
520521
plan:
521522
- do:
522523
- in_parallel:
@@ -542,10 +543,11 @@ jobs:
542543
- put: terraform
543544
resource: gcp-terraform
544545
params:
545-
env_name: bats-fips
546+
# NOTE: prefix must not start with "bats" to avoid being deleted by the bats cleanup-leftovers job
547+
env_name: fips-bats
546548
terraform_source: bosh-ci/ci/bats/iaas/gcp/terraform
547549
vars:
548-
name: bats-fips
550+
name: fips-bats
549551
- do:
550552
- task: deploy-director
551553
file: bosh-ci/ci/bats/tasks/deploy-director.yml
@@ -577,20 +579,22 @@ jobs:
577579
no_get: true
578580
params:
579581
action: destroy
580-
env_name: bats-fips
582+
env_name: fips-bats
581583
terraform_source: bosh-ci/ci/bats/iaas/gcp/terraform
582584
vars:
583-
name: bats-fips
585+
name: fips-bats
584586
- task: cleanup-leftover-environments
585587
file: bosh-ci/ci/tasks/cleanup-leftovers.yml
586588
image: integration-image
587589
params:
588-
LEFTOVERS_PREFIX: bats-fips
590+
# NOTE: prefix must not start with "bats" to avoid being deleted by the bats cleanup-leftovers job
591+
LEFTOVERS_PREFIX: fips-bats
589592
GCP_JSON_KEY: ((gcp_json_key))
590593

591-
- name: bats-fips-cleanup-leftovers
594+
- name: fips-bats-cleanup-leftovers
595+
old_name: bats-fips-cleanup-leftovers
592596
serial: true
593-
serial_groups: [ bats-fips ]
597+
serial_groups: [ fips-bats ]
594598
plan:
595599
- in_parallel:
596600
- get: bosh-ci
@@ -601,7 +605,8 @@ jobs:
601605
file: bosh-ci/ci/tasks/cleanup-leftovers.yml
602606
image: integration-image
603607
params:
604-
LEFTOVERS_PREFIX: bats-fips
608+
# NOTE: prefix must not start with "bats" to avoid being deleted by the bats cleanup-leftovers job
609+
LEFTOVERS_PREFIX: fips-bats
605610
GCP_JSON_KEY: ((gcp_json_key))
606611

607612
- name: brats-acceptance
@@ -615,6 +620,8 @@ jobs:
615620
- get: bosh-dns-release
616621
- get: stemcell
617622
resource: warden-stemcell
623+
- get: director-stemcell
624+
resource: warden-stemcell
618625
- get: bosh-candidate-release-tarballs
619626
passed: [ create-bosh-candidate-release-compiled ]
620627
- get: bosh-release
@@ -655,6 +662,7 @@ jobs:
655662
GCP_POSTGRES_EXTERNAL_DB_USER: ((brats_database_user.username))
656663
GCP_POSTGRES_EXTERNAL_DB_PASSWORD: ((brats_database_user.password))
657664
GCP_POSTGRES_EXTERNAL_DB_NAME: brats
665+
DIRECTOR_STEMCELL_OS: ubuntu-noble
658666
STEMCELL_OS: ubuntu-noble
659667
ensure:
660668
put: brats-terraform
@@ -679,12 +687,17 @@ jobs:
679687
- get: cf-deployment
680688
- get: docker-cpi-image
681689
- get: stemcell
690+
resource: warden-stemcell-jammy
691+
- get: director-stemcell
682692
resource: warden-stemcell
683693
- do:
684694
- task: test-brats-performance
685695
image: docker-cpi-image
686696
file: bosh-ci/ci/shared/brats/test-performance.yml
687697
privileged: true
698+
params:
699+
DIRECTOR_STEMCELL_OS: ubuntu-noble
700+
STEMCELL_OS: ubuntu-jammy
688701

689702
- name: brats-utils
690703
serial: true
@@ -1826,6 +1839,11 @@ resources:
18261839
source:
18271840
name: bosh-warden-boshlite-ubuntu-noble
18281841

1842+
- name: warden-stemcell-jammy
1843+
type: bosh-io-stemcell
1844+
source:
1845+
name: bosh-warden-boshlite-ubuntu-jammy-go_agent
1846+
18291847
- name: bosh-agent
18301848
type: git
18311849
source:

config/blobs.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
azure-storage-cli/azure-storage-cli-0.0.219-linux-amd64:
1+
azure-storage-cli/azure-storage-cli-0.0.220-linux-amd64:
22
size: 10668982
3-
object_id: b68881d5-ca56-4fb2-6fe0-b5d2b8102170
4-
sha: sha256:8e738d78d7d8add10e0a027b52f0967fdd88c215a8050e113e7b11ee5908d025
5-
bosh-gcscli/bosh-gcscli-0.0.366-linux-amd64:
3+
object_id: 239ad0a6-177c-4949-4e44-4b2af96a888f
4+
sha: sha256:a178520b8d414f637cfd70202d20d16b7a2f4cdc78c08d20fc926bd0f84c7284
5+
bosh-gcscli/bosh-gcscli-0.0.367-linux-amd64:
66
size: 46479925
7-
object_id: 3bc76a22-7bda-4138-703a-e6bca63597df
8-
sha: sha256:2ac55c73da0bd6f302ed09baca6dc57b0c6af6a3fc278a0d5e43bd073d965b67
9-
davcli/davcli-0.0.460-linux-amd64:
7+
object_id: 68a8105a-dec2-4428-7e2b-39b33eeeb3bd
8+
sha: sha256:1e51b1befdebf6e3e17592acc31b146df45d8a94da48de53109309712cf6c1bb
9+
davcli/davcli-0.0.461-linux-amd64:
1010
size: 10426081
11-
object_id: 553d212e-d2df-43fd-4518-1c3f9cc13bd8
12-
sha: sha256:3a89a64a135072f3c68730f3507a1ff80cd3534b8606f914b7f63e67d276c099
11+
object_id: c98b7488-0d5c-4be5-43c6-d13544d0a1fa
12+
sha: sha256:892f1e38fd3a6784db5faeacbc917046071160174fe7fb4dbfaa682c9d576d6a
1313
mysql/mariadb-connector-c-3.4.8-src.tar.gz:
1414
size: 1380411
1515
object_id: 31e2e6c6-eefe-4512-68bd-757a7c27b044
@@ -30,11 +30,11 @@ postgres/postgresql-15.17.tar.gz:
3030
size: 30677569
3131
object_id: adf29718-e438-4621-56c9-11cd357973c0
3232
sha: sha256:f7fc926ea77ffc52e9d6fd58276427e3fe14d35fd9ff3ccf724ca88a28bcb4df
33-
s3cli/s3cli-0.0.394-linux-amd64:
34-
size: 16180856
35-
object_id: e60a992e-9b39-4e5a-6887-afce4f8599e0
36-
sha: sha256:159d6085ce560f6734c3150084a70c1998675bab20ee14a2a1981d50900bb6c8
37-
verify-multidigest/verify-multidigest-0.0.595-linux-amd64:
38-
size: 4304283
39-
object_id: 375c2b4d-013c-4d62-51d5-3262bea63873
40-
sha: sha256:5325b7d067e22560ee6e5d03edad8d8f42b9c2901710114b6d173db3e161ef08
33+
s3cli/s3cli-0.0.395-linux-amd64:
34+
size: 16186658
35+
object_id: 422320e3-3502-4672-75f1-94e53f2b0268
36+
sha: sha256:46b576c4a9a3c08701da5183784d0b45309f6a15f92a4a9a7a7bf5d0a2482f09
37+
verify-multidigest/verify-multidigest-0.0.596-linux-amd64:
38+
size: 4304275
39+
object_id: 960804b2-5f0b-4642-6f83-90ec61263ae0
40+
sha: sha256:a7f2febf5881ab7ec57b868b6fec09606327d84ae7b83d3128d37a26c67b0f41

0 commit comments

Comments
 (0)