Merge branch 'ubuntu-jammy' into merge-jammy

aramprice · aramprice · commit f56d3fa27487 · 2026-04-13T19:57:21.000-07:00
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,11 +2,31 @@ PATH
   remote: bosh-stemcell
   specs:
     bosh-stemcell (0.0.0)
+      rake
+      rspec
+      rspec-its
 
 GEM
   remote: https://rubygems.org/
   specs:
+    diff-lcs (1.6.2)
     rake (13.3.1)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-its (2.0.0)
+      rspec-core (>= 3.13.0)
+      rspec-expectations (>= 3.13.0)
+    rspec-mocks (3.13.8)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
 
 PLATFORMS
   ruby
diff --git a/README.md b/README.md
@@ -151,7 +151,7 @@ container, you should be able to run the specific tests:
 
 ```shell
 cd /opt/bosh/bosh-stemcell; \
-bundle install \
+bundle install; \
 STEMCELL_IMAGE=/mnt/stemcells/vsphere/esxi/ubuntu/work/work/vsphere-esxi-ubuntu.raw \
 STEMCELL_WORKDIR=/mnt/stemcells/vsphere/esxi/ubuntu/work/work/chroot \
 OS_NAME=ubuntu \
@@ -175,8 +175,8 @@ an ubuntu chroot environment to run. For this reason, we use the
 locally, run:
 
 ```shell
-bundle install --local
 cd /opt/bosh/bosh-stemcell
+bundle install
 OS_IMAGE=/opt/bosh/tmp/ubuntu_base_image.tgz bundle exec rake spec:shellout_types
 ```
 
diff --git a/bosh-stemcell/bosh-stemcell.gemspec b/bosh-stemcell/bosh-stemcell.gemspec
@@ -18,10 +18,13 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = %w[lib]
 
+  # TODO: separate stemcell specs from gem specs
+  spec.add_dependency "rake"
+  spec.add_dependency "rspec"
+  spec.add_dependency "rspec-its"
+
+  # used only in gem's own specs
   spec.add_development_dependency "fakefs"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "standard"
   spec.add_development_dependency "timecop"
 end
diff --git a/bosh-stemcell/lib/bosh/stemcell/build_environment.rb b/bosh-stemcell/lib/bosh/stemcell/build_environment.rb
@@ -41,7 +41,6 @@ def prepare_build
     def os_image_rspec_command
       [
         "cd #{STEMCELL_SPECS_DIR};",
-        "bundle install;",
         "OS_IMAGE=#{os_image_tarball_path}",
         "bundle exec rspec -fd",
         "spec/os_image/#{operating_system_spec_name}_spec.rb"
@@ -51,7 +50,6 @@ def os_image_rspec_command
     def stemcell_rspec_command
       cmd = [
         "cd #{STEMCELL_SPECS_DIR};",
-        "bundle install;",
         "STEMCELL_IMAGE=#{image_file_path}",
         "STEMCELL_WORKDIR=#{work_path}",
         "STEMCELL_INFRASTRUCTURE=#{infrastructure.name}",
diff --git a/bosh-stemcell/spec/bosh/stemcell/build_environment_spec.rb b/bosh-stemcell/spec/bosh/stemcell/build_environment_spec.rb
@@ -3,6 +3,7 @@
 require "bosh/stemcell/infrastructure"
 require "bosh/stemcell/operating_system"
 require "bosh/stemcell/definition"
+require "fakefs/spec_helpers"
 
 module Bosh::Stemcell
   describe BuildEnvironment do
@@ -185,7 +186,6 @@ module Bosh::Stemcell
         it "returns the correct command" do
           expected_rspec_command = [
             "cd #{stemcell_specs_dir};",
-            "bundle install;",
             "OS_IMAGE=/some/os_image.tgz",
             "bundle exec rspec -fd",
             "spec/os_image/#{operating_system.name}_spec.rb"
@@ -204,7 +204,6 @@ module Bosh::Stemcell
       it "returns the correct command" do
         expected_rspec_command = [
           "cd #{stemcell_specs_dir};",
-          "bundle install;",
           "STEMCELL_IMAGE=#{File.join(work_path, "fake-root-disk-image.raw")}",
           "STEMCELL_WORKDIR=#{work_path}",
           "STEMCELL_INFRASTRUCTURE=#{infrastructure.name}",
diff --git a/bosh-stemcell/spec/bosh/stemcell/stage_runner_spec.rb b/bosh-stemcell/spec/bosh/stemcell/stage_runner_spec.rb
@@ -1,6 +1,7 @@
 require "spec_helper"
-require "timecop"
 require "bosh/stemcell/stage_runner"
+require "timecop"
+require "fakefs/spec_helpers"
 
 module Bosh::Stemcell
   describe StageRunner do
diff --git a/bosh-stemcell/spec/spec_helper.rb b/bosh-stemcell/spec/spec_helper.rb
@@ -1,6 +1,5 @@
 require "rspec"
 require "rspec/its"
-require "fakefs/spec_helpers"
 require "support/shellout_type_assertions"
 require "tmpdir"
 
diff --git a/ci/tasks/build-release-metadata.sh b/ci/tasks/build-release-metadata.sh
@@ -36,7 +36,7 @@ pushd "${REPO_PARENT}/candidate-stemcell"
   kernel_version=$(grep "${KERNEL_PACKAGE}" packages.txt | awk '{print $3}')
 popd
 
-bosh_agent_version=$(cat "${REPO_PARENT}/bosh-linux-stemcell-builder/stemcell_builder/stages/bosh_go_agent/assets/bosh-agent-version")
+bosh_agent_version=$(cat "${REPO_ROOT}/stemcell_builder/stages/bosh_go_agent/assets/bosh-agent-version")
 {
   echo "## Metadata:"
   echo "**BOSH Agent Version**: ${bosh_agent_version}"
@@ -45,9 +45,9 @@ bosh_agent_version=$(cat "${REPO_PARENT}/bosh-linux-stemcell-builder/stemcell_bu
 
 if [[ "${OS_NAME}" == "ubuntu" ]]; then
   # Ensure URL for usn-log from metalink exists before attempting to download.
-  usn_log_json_file="${REPO_PARENT}/bosh-linux-stemcell-builder/usn-log.json"
+  usn_log_json_file="${REPO_ROOT}/usn-log.json"
   touch "${usn_log_json_file}"
-  usn_metalink_path="${REPO_PARENT}/bosh-linux-stemcell-builder/bosh-stemcell/image-metalinks/${BRANCH}/${OS_NAME}-${OS_VERSION}.meta4"
+  usn_metalink_path="${REPO_ROOT}/bosh-stemcell/image-metalinks/${BRANCH}/${OS_NAME}-${OS_VERSION}.meta4"
   if [[ -n "$(meta4 file-urls --metalink "${usn_metalink_path}" --file usn-log.json)" ]]; then
     meta4 file-download \
       --skip-hash-verification \
diff --git a/ci/tasks/build.sh b/ci/tasks/build.sh
@@ -71,7 +71,7 @@ for i in $(seq 0 64); do
   fi
 done
 
-chown -R ubuntu:ubuntu "${REPO_PARENT}/bosh-linux-stemcell-builder"
+chown -R ubuntu:ubuntu "${REPO_ROOT}"
 chown -R ubuntu:ubuntu /mnt
 
 OS_IMAGE=""
@@ -82,45 +82,50 @@ fi
 
 sudo chmod u+s "$(which sudo)"
 sudo --preserve-env --set-home --user ubuntu -- /bin/bash --login -i <<SUDO
-  set -e
+set -e
 
-  cd "${REPO_PARENT}/bosh-linux-stemcell-builder"
-bundle update --bundler
-bundle install --local
+cd "${REPO_ROOT}"
+bundle install
 
 if [[ -z "$OS_IMAGE" ]]; then
-	bundle exec rake stemcell:build[$IAAS,$HYPERVISOR,$OS_NAME,$OS_VERSION,$CANDIDATE_BUILD_NUMBER]
-	rm -f ./tmp/base_os_image.tgz
+  bundle exec rake stemcell:build[$IAAS,$HYPERVISOR,$OS_NAME,$OS_VERSION,$CANDIDATE_BUILD_NUMBER]
+  rm -f ./tmp/base_os_image.tgz
 else
-	bundle exec rake stemcell:build_with_local_os_image[$IAAS,$HYPERVISOR,$OS_NAME,$OS_VERSION,$OS_IMAGE,$CANDIDATE_BUILD_NUMBER]
+  bundle exec rake stemcell:build_with_local_os_image[$IAAS,$HYPERVISOR,$OS_NAME,$OS_VERSION,$OS_IMAGE,$CANDIDATE_BUILD_NUMBER]
 fi
 SUDO
 
 #
 # Output and checksum the stemcell artifacts
 #
 
-stemcell_name="bosh-stemcell-$CANDIDATE_BUILD_NUMBER-$IAAS-$HYPERVISOR-$OS_NAME-$OS_VERSION${AGENT_SUFFIX}"
-meta4_path="${REPO_PARENT}/stemcells-index-output/dev/$OS_NAME-$OS_VERSION/$CANDIDATE_BUILD_NUMBER/$IAAS-$HYPERVISOR${AGENT_SUFFIX}.meta4"
+stemcell_name="bosh-stemcell-${CANDIDATE_BUILD_NUMBER}-$IAAS-$HYPERVISOR-$OS_NAME-$OS_VERSION${AGENT_SUFFIX}"
+meta4_path="${REPO_PARENT}/stemcells-index-output/dev/$OS_NAME-$OS_VERSION/${CANDIDATE_BUILD_NUMBER}/$IAAS-$HYPERVISOR${AGENT_SUFFIX}.meta4"
 
-echo $CANDIDATE_BUILD_NUMBER > "${REPO_PARENT}/candidate-build-number/number"
+echo "${CANDIDATE_BUILD_NUMBER}" > "${REPO_PARENT}/candidate-build-number/number"
 mkdir -p "$( dirname "$meta4_path" )"
 rm -f "$meta4_path"
 meta4 create --metalink="$meta4_path"
 
-if [ -e "${REPO_PARENT}/bosh-linux-stemcell-builder/tmp"/*-raw.tgz ] ; then
+raw_images=( "${REPO_ROOT}/tmp"/*-raw.tgz )
+if [ "${#raw_images[@]}" -ge 2 ]; then
+  echo "Found more than one raw image: '${raw_images[*]}'" >&2
+  exit 1
+fi
+
+if [ -e "${raw_images[0]}" ] ; then
   # openstack currently publishes raw files
   raw_stemcell_filename="${stemcell_name}-raw.tgz"
-  mv "${REPO_PARENT}/bosh-linux-stemcell-builder/tmp"/*-raw.tgz "${REPO_PARENT}/stemcell/${raw_stemcell_filename}"
+  mv "${REPO_ROOT}/tmp"/*-raw.tgz "${REPO_PARENT}/stemcell/${raw_stemcell_filename}"
 
-  meta4 import-file --metalink="$meta4_path" --version="$CANDIDATE_BUILD_NUMBER" "${REPO_PARENT}/stemcell/${raw_stemcell_filename}"
+  meta4 import-file --metalink="$meta4_path" --version="${CANDIDATE_BUILD_NUMBER}" "${REPO_PARENT}/stemcell/${raw_stemcell_filename}"
   meta4 file-set-url --metalink="$meta4_path" --file="${raw_stemcell_filename}" "https://${S3_API_ENDPOINT}/${STEMCELL_BUCKET}/${IAAS}/${raw_stemcell_filename}"
 fi
 
 stemcell_filename="${stemcell_name}.tgz"
-mv "${REPO_PARENT}/bosh-linux-stemcell-builder/tmp/${stemcell_filename}" "${REPO_PARENT}/stemcell/${stemcell_filename}"
+mv "${REPO_ROOT}/tmp/${stemcell_filename}" "${REPO_PARENT}/stemcell/${stemcell_filename}"
 
-meta4 import-file --metalink="$meta4_path" --version="$CANDIDATE_BUILD_NUMBER" "${REPO_PARENT}/stemcell/${stemcell_filename}"
+meta4 import-file --metalink="$meta4_path" --version="${CANDIDATE_BUILD_NUMBER}" "${REPO_PARENT}/stemcell/${stemcell_filename}"
 meta4 file-set-url --metalink="$meta4_path" --file="${stemcell_filename}" "https://${S3_API_ENDPOINT}/${STEMCELL_BUCKET}/${IAAS}/${stemcell_filename}"
 
 # just in case we need to debug/verify the live results
@@ -131,4 +136,4 @@ cd "${REPO_PARENT}/stemcells-index-output"
 git add -A
 git config --global user.email "ci@localhost"
 git config --global user.name "CI Bot"
-git commit -m "dev: $OS_NAME-$OS_VERSION/$CANDIDATE_BUILD_NUMBER ($IAAS-$HYPERVISOR)"
+git commit -m "dev: ${OS_NAME}-${OS_VERSION}/${CANDIDATE_BUILD_NUMBER} ($IAAS-$HYPERVISOR)"
diff --git a/ci/tasks/bump-bosh-agent.sh b/ci/tasks/bump-bosh-agent.sh
@@ -10,7 +10,7 @@ if [[ -n "${DEBUG:-}" ]]; then
   export BOSH_LOG_PATH="${BOSH_LOG_PATH:-${REPO_PARENT}/bosh-debug.log}"
 fi
 
-git clone "${REPO_PARENT}/bosh-linux-stemcell-builder" "${REPO_PARENT}/bosh-linux-stemcell-builder-out"
+git clone "${REPO_ROOT}" "${REPO_PARENT}/bosh-linux-stemcell-builder-out"
 
 version=$( cat "${REPO_PARENT}/bosh-agent/.resource/version" )
 
diff --git a/ci/tasks/bump-bosh-blobstore-cli.sh b/ci/tasks/bump-bosh-blobstore-cli.sh
@@ -10,7 +10,7 @@ if [[ -n "${DEBUG:-}" ]]; then
   export BOSH_LOG_PATH="${BOSH_LOG_PATH:-${REPO_PARENT}/bosh-debug.log}"
 fi
 
-git clone "${REPO_PARENT}/bosh-linux-stemcell-builder" "${REPO_PARENT}/bosh-linux-stemcell-builder-out"
+git clone "${REPO_ROOT}" "${REPO_PARENT}/bosh-linux-stemcell-builder-out"
 
 url=$(cat "${REPO_PARENT}/bosh-blobstore-cli/url")
 version=$(cat "${REPO_PARENT}/bosh-blobstore-cli/version")
diff --git a/ci/tasks/commit-build-time.sh b/ci/tasks/commit-build-time.sh
@@ -13,7 +13,7 @@ fi
 build_time="$(cat "${REPO_PARENT}/build-time/timestamp")"
 formatted_build_time="$(date --date "${build_time%.*}" +%Y%m%dT%H%M%SZ)"
 
-pushd "${REPO_PARENT}/bosh-linux-stemcell-builder"
+pushd "${REPO_ROOT}"
   echo "${formatted_build_time}" > build_time.txt
   git add -A
   git config --global user.email "ci@localhost"
diff --git a/ci/tasks/os-images/build.sh b/ci/tasks/os-images/build.sh
@@ -10,8 +10,6 @@ if [[ -n "${DEBUG:-}" ]]; then
   export BOSH_LOG_PATH="${BOSH_LOG_PATH:-${REPO_PARENT}/bosh-debug.log}"
 fi
 
-cd "${REPO_PARENT}/bosh-linux-stemcell-builder"
-
 function check_param() {
   local name=$1
   local value=$(eval echo '$'$name)
@@ -33,7 +31,12 @@ fi
 sudo chown -R ubuntu .
 sudo chown -R ubuntu:ubuntu /mnt
 sudo chmod u+s "$(which sudo)"
-bundle install --local
+
 sudo --preserve-env --set-home --user ubuntu -- /bin/bash --login -i <<SUDO
-bundle exec rake stemcell:build_os_image[$OPERATING_SYSTEM_NAME,$OPERATING_SYSTEM_VERSION,$OS_IMAGE]
+set -e
+
+pushd "${REPO_ROOT}"
+  bundle install
+  bundle exec rake stemcell:build_os_image[$OPERATING_SYSTEM_NAME,$OPERATING_SYSTEM_VERSION,$OS_IMAGE]
+popd
 SUDO
diff --git a/ci/tasks/test-stemcell.sh b/ci/tasks/test-stemcell.sh
@@ -40,7 +40,7 @@ if bosh int "${REPO_PARENT}/director-state/director-creds.yml" --path /jumpbox_s
   export BOSH_GW_HOST="${BOSH_ENVIRONMENT}"
 fi
 
-pushd "${REPO_PARENT}/bosh-linux-stemcell-builder/acceptance-tests"
+pushd "${REPO_ROOT}/acceptance-tests"
   # shellcheck disable=SC2154
   go run github.com/onsi/ginkgo/v2/ginkgo --skip-package vendor -r "${package}"
 popd
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -16,7 +16,7 @@ function build() {
       exit 1
     fi
 
-    bundle install --local
+    bundle install
 
     # TODO(cdutra): build os image
   popd
diff --git a/vendor/cache/rake-13.3.1.gem b/vendor/cache/rake-13.3.1.gem
diff --git a/vendor/package/multi_json-1.20.0.gem b/vendor/package/multi_json-1.20.0.gem
