Rename task stemcell:build_with_local_os_image -> :build

Author: aramprice

README.md

@@ -35,7 +35,7 @@ popd
 bundle exec rake stemcell:build_os_image[ubuntu,${short_name},${PWD}/tmp/ubuntu_base_image.tgz]
 
  # build vSphere stemcell
-bundle exec rake stemcell:build_with_local_os_image[vsphere,esxi,ubuntu,${short_name},${PWD}/tmp/ubuntu_base_image.tgz]
+bundle exec rake stemcell:build[vsphere,esxi,ubuntu,${short_name},${PWD}/tmp/ubuntu_base_image.tgz]
 ```
 
 When building a vSphere stemcell, you must download `VMware-ovftool-*.bundle`
@@ -81,10 +81,10 @@ Rebuild the stemcell when you are making and testing BOSH-specific changes such
 export short_name="jammy"
 export build_number="0.0.8"
 
-bundle exec rake stemcell:build_with_local_os_image[vsphere,esxi,ubuntu,${short_name},${PWD}/tmp/ubuntu_base_image.tgz,${build_number}]
+bundle exec rake stemcell:build[vsphere,esxi,ubuntu,${short_name},${PWD}/tmp/ubuntu_base_image.tgz,${build_number}]
 ```
 
-The arguments to `stemcell:build_with_local_os_image` are:
+The arguments to `stemcell:build` are:
 
 1. `infrastructure_name`: Which IaaS you are producing the stemcell for.
    Determines which virtualization tools to package on top of the stemcell.
@@ -143,11 +143,11 @@ container):
 
 ### How to Run Tests for Stemcell
 
-When you run the `stemcell:build_with_local_os_image` rake task, it will create
-a stemcell that it runs the stemcell specific tests against. You will need to
-run the **rake task the first time you create your docker container**, but
-everytime after, as long as you do not destroy the container, you should be
-able to run the specific tests:
+When you run the `stemcell:build` rake task, it will create a stemcell that it
+runs the stemcell-specific tests against. You will need to run the **rake task
+the first time you create your docker container**, but every time after, as
+long as you do not destroy the container, you should be able to run the
+specific tests:
 
 ```shell
 cd /opt/bosh/bosh-stemcell; \

Rakefile

@@ -42,8 +42,8 @@ namespace :stemcell do
     end
   end
 
-  desc 'Build a stemcell using a local pre-built base OS image'
-  task :build_with_local_os_image, [:infrastructure_name, :hypervisor_name, :operating_system_name, :operating_system_version, :os_image_path, :build_number] do |_, args|
+  desc 'Build a stemcell, requires `os_image_path` pointing at an image created via `stemcell:build_os_image`'
+  task :build, [:infrastructure_name, :hypervisor_name, :operating_system_name, :operating_system_version, :os_image_path, :build_number] do |_, args|
     begin
       require 'bosh/stemcell/build_environment'
       require 'bosh/stemcell/definition'

ci/tasks/build.sh

@@ -75,15 +75,15 @@ done
 chown -R ubuntu:ubuntu "${REPO_ROOT}" # ci resource
 chown -R ubuntu:ubuntu "${REPO_PARENT}/bosh-linux-stemcell-builder"
 chown -R ubuntu:ubuntu /mnt
-
 sudo chmod u+s "$(which sudo)"
+
 sudo --preserve-env --set-home --user ubuntu -- /bin/bash --login -i <<SUDO
 set -e
 
 cd "${REPO_PARENT}/bosh-linux-stemcell-builder"
 bundle install
 
-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[${IAAS},${HYPERVISOR},${OS_NAME},${OS_VERSION},${OS_IMAGE},${CANDIDATE_BUILD_NUMBER}]
 SUDO
 
 #

ci/tasks/os-images/build.sh

@@ -18,25 +18,28 @@ function check_param() {
     exit 1
   fi
 }
+
 check_param OPERATING_SYSTEM_NAME
 check_param OPERATING_SYSTEM_VERSION
 
 OS_IMAGE_NAME=${OPERATING_SYSTEM_NAME}-${OPERATING_SYSTEM_VERSION}
 OS_IMAGE=${REPO_PARENT}/os-image/${OS_IMAGE_NAME}.tgz
+
 if [ -f "${REPO_PARENT}/build-time/timestamp" ]; then
   build_time="$(cat "${REPO_PARENT}/build-time/timestamp")"
   export BUILD_TIME="$(date --date "${build_time%.*}" +%Y%m%dT%H%M%SZ)"
 fi
 
-sudo chown -R ubuntu .
-sudo chown -R ubuntu:ubuntu /mnt
+chown -R ubuntu:ubuntu "${REPO_ROOT}" # ci resource
+chown -R ubuntu:ubuntu "${REPO_PARENT}/bosh-linux-stemcell-builder"
+chown -R ubuntu:ubuntu /mnt
 sudo chmod u+s "$(which sudo)"
 
 sudo --preserve-env --set-home --user ubuntu -- /bin/bash --login -i <<SUDO
 set -e
 
-pushd "${REPO_PARENT}/bosh-linux-stemcell-builder"
-  bundle install
-  bundle exec rake stemcell:build_os_image[$OPERATING_SYSTEM_NAME,$OPERATING_SYSTEM_VERSION,$OS_IMAGE]
-popd
+cd "${REPO_PARENT}/bosh-linux-stemcell-builder"
+bundle install
+
+bundle exec rake stemcell:build_os_image[$OPERATING_SYSTEM_NAME,$OPERATING_SYSTEM_VERSION,$OS_IMAGE]
 SUDO