Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,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 \
Expand All @@ -174,8 +174,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
```

Expand Down
9 changes: 5 additions & 4 deletions ci/tasks/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,13 @@ 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
pushd "${REPO_ROOT}/bosh-stemcell"
bundle install
popd

cd "${REPO_ROOT}"
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
Expand Down
2 changes: 1 addition & 1 deletion ci/tasks/os-images/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ fi
sudo chown -R ubuntu .
sudo chown -R ubuntu:ubuntu /mnt
sudo chmod u+s "$(which sudo)"
bundle install --local
bundle install
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]
SUDO
2 changes: 1 addition & 1 deletion scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function build() {
exit 1
fi

bundle install --local
bundle install

# TODO(cdutra): build os image
popd
Expand Down
Loading