Skip to content

Optional bbl plan #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
beyhan merged 2 commits into from
Nov 27, 2025
Merged

Optional bbl plan #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
311b3b4
[ci] make plan patch optional for bump concourse
ramonskie Nov 20, 2025
60f7b7f
append vm_extension imsead of replaces
ramonskie Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions ci/ops-files/concourse-gcp-spot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@
#
# Note: Spot VMs can be preempted at any time and are recommended for
# non-production environments only.
#
# This appends 'spot' to vm_extensions without removing existing extensions
# like 'lb' which is required for load balancer configuration.

- type: replace
path: /instance_groups/name=db/vm_extensions?
value:
- spot
path: /instance_groups/name=db/vm_extensions?/-
value: spot

- type: replace
path: /instance_groups/name=web/vm_extensions?
value:
- spot
path: /instance_groups/name=web/vm_extensions?/-
value: spot

- type: replace
path: /instance_groups/name=worker/vm_extensions?
value:
- spot
path: /instance_groups/name=worker/vm_extensions?/-
value: spot
1 change: 1 addition & 0 deletions ci/pipelines/bosh-bootloader.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,6 +975,7 @@ jobs:
BBL_GCP_REGION: europe-north1
BBL_ENV_NAME: bump-deployments-gcp-concourse
BBL_STATE_DIR: bump-deployments/bbl-gcp-concourse
BBL_PLAN_PATCH: spot-gcp
DELETE_TERRAFORM_PLUGINS: false
input_mapping:
bbl-state: relint-envs
Expand Down
11 changes: 10 additions & 1 deletion ci/tasks/bbl-up-concourse/task
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,16 @@ function main() {
${name_flag} \
--lb-type concourse > "${root_dir}/bbl_plan.txt"

cp -r ${root_dir}/bbl-ci/plan-patches/spot-gcp .
# Apply plan patch if specified
if [ -n "${BBL_PLAN_PATCH:-}" ]; then
echo "Applying plan patch: ${BBL_PLAN_PATCH}"
if [ -d "${root_dir}/bbl-ci/plan-patches/${BBL_PLAN_PATCH}" ]; then
cp -r "${root_dir}/bbl-ci/plan-patches/${BBL_PLAN_PATCH}" .
else
echo "Warning: Plan patch '${BBL_PLAN_PATCH}' not found"
exit 1
fi
fi

bbl --debug up \
${name_flag} \
Expand Down
1 change: 1 addition & 0 deletions ci/tasks/bbl-up-concourse/task.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ params:
BBL_IAAS:
BBL_ENV_NAME:
BBL_LB_TYPE: concourse
BBL_PLAN_PATCH: # Optional: Plan patch directory name (e.g., "spot-gcp", "bosh-lite-gcp")

GIT_COMMIT_EMAIL: "cf-infrastructure@pivotal.io"
GIT_COMMIT_USERNAME: "CI Infra Bot"
Expand Down