Skip to content

Commit 7cf401e

Browse files
authored
Merge pull request #2686 from cloudfoundry/bats-fips-rename
CI: Rename bats-fips to fips-bats
2 parents 9b67735 + c6ce579 commit 7cf401e

1 file changed

Lines changed: 17 additions & 12 deletions

File tree

ci/pipeline.yml

Lines changed: 17 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

0 commit comments

Comments
 (0)