Merge branch 'ubuntu-noble' into merge-jammy

Author: aramprice

ci/pipelines/builder.yml

@@ -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

ci/pipelines/vars.yml

@@ -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},
@@ -17,7 +18,6 @@ stemcell_details:
     {iaas: warden, hypervisor: boshlite}
   ]
   include_fips_iaas: []
-  subnet_int: "24" #! use last two digits of release year: ex 2000 -> 20
 
 blobstore_types:
 - dav

ci/tasks/build-docker-args.sh

@@ -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"