Cherry pick jammy#568
Conversation
This task doesn't have a cess to bosh-linux-stemcell-builder so it needs to read `.ruby-version` from it's own resource. Also add `.ruby-version` to the `bosh-stemcells-ci` resources's paths.
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
There was a problem hiding this comment.
Pull request overview
Updates the Concourse pipeline/task configuration to align Ubuntu Noble (24.04) stemcell builder CI with the intended GCP subnet naming and to ensure Ruby version detection works when the git resource is path-filtered.
Changes:
- Read Ruby version from the repo root
.ruby-versionin the docker args generation task. - Set
stemcell_details.subnet_intto"24"(and remove the previous"0"default) for Noble pipeline vars. - Rename GCP subnet references from
bosh-integration-*tostemcell-builder-integration-*and include.ruby-versionin the path-filtered CI git resource.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
ci/tasks/build-docker-args.sh |
Switches Ruby version source to ${REPO_ROOT}/.ruby-version to match how the task’s repo is checked out. |
ci/pipelines/vars.yml |
Updates subnet_int for Noble to "24" and removes the old "0" entry. |
ci/pipelines/builder.yml |
Updates subnet name prefixes and ensures .ruby-version is included in the paths:-filtered git resource. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
ci/pipelines/builder.yml (1)
361-366: 🧹 Nitpick | 🔵 TrivialVerify the renamed GCP subnet exists before merging.
The
GCP_SUBNET_NAME/VARS_SUBNETWORK_DEFAULTvalues consistently render tostemcell-builder-integration-24acrosstest-stemcells-ipv4,bats(cleanup/deploy/prepare), and the commented IPv6 block. The deploy/bats jobs will fail hard if that subnet has not been created (or renamed) in the target GCP project undergcp_project_idwith a CIDR matching10.100.24.0/24(and matching the reserved/static partitioning used in thebatstask).Please confirm that the corresponding GCP subnet rename (from
bosh-integration-*tostemcell-builder-integration-24) has been applied operationally prior to this pipeline being re-set, otherwise the firsttest-stemcells-ipv4/batsrun onubuntu-noblewill break.Also applies to: 428-428, 564-564, 574-574, 591-591
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@ci/pipelines/builder.yml` around lines 361 - 366, The pipeline hardcodes GCP_SUBNET_NAME (rendering to stemcell-builder-integration-24) and related network vars (INTERNAL_IP, INTERNAL_CIDR, INTERNAL_GW, RESERVED_RANGE) which will cause jobs like test-stemcells-ipv4 and bats to fail if the subnet was not actually renamed in the target project; add a pre-flight validation step in the pipeline that uses the same computed subnet name (GCP_SUBNET_NAME) and project (gcp_project_id) to call GCP (e.g., gcloud compute networks subnets describe or equivalent) and fail fast with a clear error if the subnet/CIDR/reserved ranges do not exist or do not match INTERNAL_CIDR/RESERVED_RANGE, or alternatively update the vars to the correct existing subnet name if an operational rename occurred (ensure you update every occurrence including VARS_SUBNETWORK_DEFAULT usage referenced in the comment).
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Outside diff comments:
In `@ci/pipelines/builder.yml`:
- Around line 361-366: The pipeline hardcodes GCP_SUBNET_NAME (rendering to
stemcell-builder-integration-24) and related network vars (INTERNAL_IP,
INTERNAL_CIDR, INTERNAL_GW, RESERVED_RANGE) which will cause jobs like
test-stemcells-ipv4 and bats to fail if the subnet was not actually renamed in
the target project; add a pre-flight validation step in the pipeline that uses
the same computed subnet name (GCP_SUBNET_NAME) and project (gcp_project_id) to
call GCP (e.g., gcloud compute networks subnets describe or equivalent) and fail
fast with a clear error if the subnet/CIDR/reserved ranges do not exist or do
not match INTERNAL_CIDR/RESERVED_RANGE, or alternatively update the vars to the
correct existing subnet name if an operational rename occurred (ensure you
update every occurrence including VARS_SUBNETWORK_DEFAULT usage referenced in
the comment).
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: ASSERTIVE
Plan: Pro
Run ID: 931d850e-a999-478a-96bd-941367efcb21
📒 Files selected for processing (3)
ci/pipelines/builder.ymlci/pipelines/vars.ymlci/tasks/build-docker-args.sh
Attempting to work around the invisible "merge conflict" in #565