Skip to content

Commit fdb526c

Browse files
committed
Pick a non-conflicting env name for fips bats
Leftovers uses substring matching to decide which resources to destroy, so we CANNOT share any substrings involved in cleanup with ANY other resources. Using just "fips" lead to the unintentional deletion of several buckets not related to the fips bats tests: https://bosh.ci.cloudfoundry.org/teams/main/pipelines/bosh-director/jobs/bats-fips-cleanup-leftovers/builds/468#L69a9299f:936:937 ai-assisted=yes
1 parent cdbdff8 commit fdb526c

1 file changed

Lines changed: 16 additions & 9 deletions

File tree

ci/pipeline.yml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,8 @@ jobs:
495495
file: bosh-ci/ci/tasks/cleanup-leftovers.yml
496496
image: integration-image
497497
params:
498+
# NOTE: leftovers uses substring matching. This filter must not match
499+
# other env filters (e.g. bats-fips) or persistent GCS buckets in the project.
498500
LEFTOVERS_FILTER: bats
499501
GCP_JSON_KEY: ((gcp_json_key))
500502

@@ -511,6 +513,8 @@ jobs:
511513
file: bosh-ci/ci/tasks/cleanup-leftovers.yml
512514
image: integration-image
513515
params:
516+
# NOTE: leftovers uses substring matching. This filter must not match
517+
# other env filters (e.g. bats-fips) or persistent GCS buckets in the project.
514518
LEFTOVERS_FILTER: bats
515519
GCP_JSON_KEY: ((gcp_json_key))
516520

@@ -543,11 +547,10 @@ jobs:
543547
- put: terraform
544548
resource: gcp-terraform
545549
params:
546-
# NOTE: filter must not contain "bats" to avoid being deleted by the bats cleanup-leftovers job
547-
env_name: fips
550+
env_name: fips-director
548551
terraform_source: bosh-ci/ci/bats/iaas/gcp/terraform
549552
vars:
550-
name: fips
553+
name: fips-director
551554
- do:
552555
- task: deploy-director
553556
file: bosh-ci/ci/bats/tasks/deploy-director.yml
@@ -579,16 +582,18 @@ jobs:
579582
no_get: true
580583
params:
581584
action: destroy
582-
env_name: fips
585+
env_name: fips-director
583586
terraform_source: bosh-ci/ci/bats/iaas/gcp/terraform
584587
vars:
585-
name: fips
588+
name: fips-director
586589
- task: cleanup-leftover-environments
587590
file: bosh-ci/ci/tasks/cleanup-leftovers.yml
588591
image: integration-image
589592
params:
590-
# NOTE: filter must not contain "bats" to avoid being deleted by the bats cleanup-leftovers job
591-
LEFTOVERS_FILTER: fips
593+
# NOTE: leftovers uses substring matching. This filter must not be a
594+
# substring of other env filters or persistent GCS buckets in the project
595+
# (e.g. "fips" alone would match bosh-core-stemcells-candidate-fips).
596+
LEFTOVERS_FILTER: fips-director
592597
GCP_JSON_KEY: ((gcp_json_key))
593598

594599
- name: bats-fips-cleanup-leftovers
@@ -605,8 +610,10 @@ jobs:
605610
file: bosh-ci/ci/tasks/cleanup-leftovers.yml
606611
image: integration-image
607612
params:
608-
# NOTE: filter must not contain "bats" to avoid being deleted by the bats cleanup-leftovers job
609-
LEFTOVERS_FILTER: fips
613+
# NOTE: leftovers uses substring matching. This filter must not be a
614+
# substring of other env filters or persistent GCS buckets in the project
615+
# (e.g. "fips" alone would match bosh-core-stemcells-candidate-fips).
616+
LEFTOVERS_FILTER: fips-director
610617
GCP_JSON_KEY: ((gcp_json_key))
611618

612619
- name: brats-acceptance

0 commit comments

Comments
 (0)