From 8536e473d981ffaa72cf5f58ceb3833997277329 Mon Sep 17 00:00:00 2001 From: Jochen Ehret Date: Thu, 15 Oct 2026 10:40:40 +0200 Subject: [PATCH 1/2] Clean up "trelawney" buckets when deleting --- ci/pipelines/cf-deployment.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/ci/pipelines/cf-deployment.yml b/ci/pipelines/cf-deployment.yml index b33b42eba..3547992b8 100644 --- a/ci/pipelines/cf-deployment.yml +++ b/ci/pipelines/cf-deployment.yml @@ -1068,6 +1068,27 @@ jobs: bbl-state: relint-envs params: BBL_STATE_DIR: environments/test/trelawney/bbl-state + - in_parallel: + - task: empty-packages-bucket + file: runtime-ci/tasks/empty-gcs-bucket/task.yml + params: + GCP_SERVICE_ACCOUNT_JSON: ((trelawney_gcp_service_account_json)) + GCP_BUCKET: trelawney-upgrade-cc-packages + - task: empty-buildpacks-bucket + file: runtime-ci/tasks/empty-gcs-bucket/task.yml + params: + GCP_SERVICE_ACCOUNT_JSON: ((trelawney_gcp_service_account_json)) + GCP_BUCKET: trelawney-upgrade-cc-buildpacks + - task: empty-droplets-bucket + file: runtime-ci/tasks/empty-gcs-bucket/task.yml + params: + GCP_SERVICE_ACCOUNT_JSON: ((trelawney_gcp_service_account_json)) + GCP_BUCKET: trelawney-upgrade-cc-droplets + - task: empty-resources-bucket + file: runtime-ci/tasks/empty-gcs-bucket/task.yml + params: + GCP_SERVICE_ACCOUNT_JSON: ((trelawney_gcp_service_account_json)) + GCP_BUCKET: trelawney-upgrade-cc-resources - task: generate-external-db-vars-file file: runtime-ci/tasks/generate-external-db-vars-file/task.yml input_mapping: From 2936d49e60e1385ec4ca5a5134acab8955fdb9cc Mon Sep 17 00:00:00 2001 From: Jochen Ehret Date: Thu, 15 Oct 2026 11:22:35 +0200 Subject: [PATCH 2/2] Clean up "hermione" buckets when deleting --- ci/pipelines/cf-deployment.yml | 50 +++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 4 deletions(-) diff --git a/ci/pipelines/cf-deployment.yml b/ci/pipelines/cf-deployment.yml index 3547992b8..1a8d055b4 100644 --- a/ci/pipelines/cf-deployment.yml +++ b/ci/pipelines/cf-deployment.yml @@ -1071,24 +1071,36 @@ jobs: - in_parallel: - task: empty-packages-bucket file: runtime-ci/tasks/empty-gcs-bucket/task.yml + input_mapping: + vars-file: relint-envs params: GCP_SERVICE_ACCOUNT_JSON: ((trelawney_gcp_service_account_json)) - GCP_BUCKET: trelawney-upgrade-cc-packages + VARS_FILE: environments/test/trelawney/gcs-vars.yml + BUCKET_KEY: app_package_directory_key - task: empty-buildpacks-bucket file: runtime-ci/tasks/empty-gcs-bucket/task.yml + input_mapping: + vars-file: relint-envs params: GCP_SERVICE_ACCOUNT_JSON: ((trelawney_gcp_service_account_json)) - GCP_BUCKET: trelawney-upgrade-cc-buildpacks + VARS_FILE: environments/test/trelawney/gcs-vars.yml + BUCKET_KEY: buildpack_directory_key - task: empty-droplets-bucket file: runtime-ci/tasks/empty-gcs-bucket/task.yml + input_mapping: + vars-file: relint-envs params: GCP_SERVICE_ACCOUNT_JSON: ((trelawney_gcp_service_account_json)) - GCP_BUCKET: trelawney-upgrade-cc-droplets + VARS_FILE: environments/test/trelawney/gcs-vars.yml + BUCKET_KEY: droplet_directory_key - task: empty-resources-bucket file: runtime-ci/tasks/empty-gcs-bucket/task.yml + input_mapping: + vars-file: relint-envs params: GCP_SERVICE_ACCOUNT_JSON: ((trelawney_gcp_service_account_json)) - GCP_BUCKET: trelawney-upgrade-cc-resources + VARS_FILE: environments/test/trelawney/gcs-vars.yml + BUCKET_KEY: resource_directory_key - task: generate-external-db-vars-file file: runtime-ci/tasks/generate-external-db-vars-file/task.yml input_mapping: @@ -1370,6 +1382,7 @@ jobs: - in_parallel: - get: cf-deployment-concourse-tasks - get: relint-envs + - get: runtime-ci - task: delete-deployment-cf file: cf-deployment-concourse-tasks/bosh-delete-deployment/task.yml input_mapping: @@ -1383,6 +1396,35 @@ jobs: bbl-state: relint-envs params: BBL_STATE_DIR: environments/test/hermione/bbl-state + - in_parallel: + - task: empty-packages-bucket + file: runtime-ci/tasks/empty-s3-bucket/task.yml + input_mapping: + vars-file: relint-envs + params: + VARS_FILE: environments/test/hermione/bbl-state/vars/director-vars-file.yml + BUCKET_KEY: app_package_directory_key + - task: empty-buildpacks-bucket + file: runtime-ci/tasks/empty-s3-bucket/task.yml + input_mapping: + vars-file: relint-envs + params: + VARS_FILE: environments/test/hermione/bbl-state/vars/director-vars-file.yml + BUCKET_KEY: buildpack_directory_key + - task: empty-droplets-bucket + file: runtime-ci/tasks/empty-s3-bucket/task.yml + input_mapping: + vars-file: relint-envs + params: + VARS_FILE: environments/test/hermione/bbl-state/vars/director-vars-file.yml + BUCKET_KEY: droplet_directory_key + - task: empty-resources-bucket + file: runtime-ci/tasks/empty-s3-bucket/task.yml + input_mapping: + vars-file: relint-envs + params: + VARS_FILE: environments/test/hermione/bbl-state/vars/director-vars-file.yml + BUCKET_KEY: resource_directory_key - put: experimental-pool params: {release: experimental-pool}