Skip to content

Cherry pick jammy #568

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
aramprice merged 3 commits into from
Apr 20, 2026
Merged

Cherry pick jammy #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e40ea4b
CI: rename GCP subnets used for integration specs
aramprice Apr 20, 2026
08cdc50
CI: fix build-docker-args task
aramprice Apr 20, 2026
1fc8f8d
Nit: relocate key in YAML, update comment
aramprice Apr 20, 2026
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
11 changes: 6 additions & 5 deletions ci/pipelines/builder.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ jobs:
GCP_ZONE: europe-north2-a
GCP_PREEMPTIBLE: true
GCP_NETWORK_NAME: bosh-concourse
GCP_SUBNET_NAME: bosh-integration-(@= data.values.stemcell_details.subnet_int @)
GCP_SUBNET_NAME: stemcell-builder-integration-(@= data.values.stemcell_details.subnet_int @)
GCP_JSON_KEY: ((gcp_json_key))
INTERNAL_IP: 10.100.(@= data.values.stemcell_details.subnet_int @).10
INTERNAL_CIDR: 10.100.(@= data.values.stemcell_details.subnet_int @).0/24
Expand Down Expand Up @@ -425,7 +425,7 @@ jobs:
#! GCP_PROJECT_ID: ((gcp_project_id))
#! GCP_ZONE: europe-north2-a
#! GCP_NETWORK_NAME: ipv6-test
#! GCP_SUBNET_NAME: bosh-integration-ipv6-(@= data.values.stemcell_details.subnet_int @)
#! GCP_SUBNET_NAME: stemcell-builder-integration-ipv6-(@= data.values.stemcell_details.subnet_int @)
#! GCP_JSON_KEY: ((gcp_json_key))
#! INTERNAL_IP: 10.100.(@= data.values.stemcell_details.subnet_int @).10
#! INTERNAL_CIDR: 10.100.(@= data.values.stemcell_details.subnet_int @).0/24
Expand Down Expand Up @@ -561,7 +561,7 @@ jobs:
GCP_JSON_KEY: ((gcp_json_key))
GCP_PROJECT_ID: ((gcp_project_id))
GCP_ZONE: europe-north2-a
GCP_SUBNET_NAME: bosh-integration-(@= data.values.stemcell_details.subnet_int @)
GCP_SUBNET_NAME: stemcell-builder-integration-(@= data.values.stemcell_details.subnet_int @)
TAG: test-stemcells-bats
- task: deploy-director
file: bosh-stemcells-ci/ci/tasks/gcp/deploy-director.yml
Expand All @@ -571,7 +571,7 @@ jobs:
GCP_ZONE: europe-north2-a
GCP_PREEMPTIBLE: true
GCP_NETWORK_NAME: bosh-concourse
GCP_SUBNET_NAME: bosh-integration-(@= data.values.stemcell_details.subnet_int @)
GCP_SUBNET_NAME: stemcell-builder-integration-(@= data.values.stemcell_details.subnet_int @)
GCP_JSON_KEY: ((gcp_json_key))
INTERNAL_IP: 10.100.(@= data.values.stemcell_details.subnet_int @).66
INTERNAL_CIDR: 10.100.(@= data.values.stemcell_details.subnet_int @).0/24
Expand All @@ -588,7 +588,7 @@ jobs:
VARS_MACHINE_TYPE: e2-standard-2
VARS_ZONE: europe-north2-a
VARS_PREEMPTIBLE: true
VARS_SUBNETWORK_DEFAULT: bosh-integration-(@= data.values.stemcell_details.subnet_int @)
VARS_SUBNETWORK_DEFAULT: stemcell-builder-integration-(@= data.values.stemcell_details.subnet_int @)
VARS_CIDR_DEFAULT: "10.100.(@= data.values.stemcell_details.subnet_int @).0/24"
VARS_RESERVED_DEFAULT: '10.100.(@= data.values.stemcell_details.subnet_int @).2 - 10.100.(@= data.values.stemcell_details.subnet_int @).129, 10.100.(@= data.values.stemcell_details.subnet_int @).190 - 10.100.(@= data.values.stemcell_details.subnet_int @).254'
VARS_STATIC_DEFAULT: '10.100.(@= data.values.stemcell_details.subnet_int @).130 - 10.100.(@= data.values.stemcell_details.subnet_int @).155'
Expand Down Expand Up @@ -1060,6 +1060,7 @@ resources:
branch: (@= data.values.stemcell_details.branch @)
paths:
- ci
- .ruby-version
uri: https://github.com/cloudfoundry/bosh-linux-stemcell-builder.git

- name: bats
Expand Down
2 changes: 1 addition & 1 deletion ci/pipelines/vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ stemcell_details:
os_version: "24.04"
os_name: ubuntu-noble
os_short_name: noble
subnet_int: "24" #! use last two digits of release year: ex 2010 -> 10
use_efi: true
include_iaas: [
{iaas: alicloud, hypervisor: kvm},
Expand All @@ -17,7 +18,6 @@ stemcell_details:
{iaas: warden, hypervisor: boshlite}
]
include_fips_iaas: []
subnet_int: "0"

blobstore_types:
- dav
Expand Down
2 changes: 1 addition & 1 deletion ci/tasks/build-docker-args.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ yq_cli_url="$(curl -s https://api.github.com/repos/mikefarah/yq/releases/latest
ruby_install_url="$(curl -s https://api.github.com/repos/postmodern/ruby-install/releases/latest \
| jq -r '.assets[] | select(.name | endswith ("tar.gz")) | .browser_download_url')"

ruby_version="$(cat "${REPO_PARENT}/bosh-linux-stemcell-builder/.ruby-version")"
ruby_version="$(cat "${REPO_ROOT}/.ruby-version")"
gem_home="/usr/local/bundle"

cat << EOF > "${REPO_PARENT}/docker-build-args/docker-build-args.json"
Expand Down
Loading