Skip to content

Commit 8d04080

Browse files
committed
Fixes: cleanup from vendored gem usage
1 parent f0cd334 commit 8d04080

4 files changed

Lines changed: 9 additions & 8 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ container, you should be able to run the specific tests:
150150

151151
```shell
152152
cd /opt/bosh/bosh-stemcell; \
153-
bundle install \
153+
bundle install; \
154154
STEMCELL_IMAGE=/mnt/stemcells/vsphere/esxi/ubuntu/work/work/vsphere-esxi-ubuntu.raw \
155155
STEMCELL_WORKDIR=/mnt/stemcells/vsphere/esxi/ubuntu/work/work/chroot \
156156
OS_NAME=ubuntu \
@@ -174,8 +174,8 @@ an ubuntu chroot environment to run. For this reason, we use the
174174
locally, run:
175175

176176
```shell
177-
bundle install --local
178177
cd /opt/bosh/bosh-stemcell
178+
bundle install
179179
OS_IMAGE=/opt/bosh/tmp/ubuntu_base_image.tgz bundle exec rake spec:shellout_types
180180
```
181181

ci/tasks/build.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,13 @@ fi
8282

8383
sudo chmod u+s "$(which sudo)"
8484
sudo --preserve-env --set-home --user ubuntu -- /bin/bash --login -i <<SUDO
85-
set -e
85+
set -e
8686
87-
cd "${REPO_PARENT}/bosh-linux-stemcell-builder"
88-
bundle update --bundler
89-
bundle install --local
87+
pushd "${REPO_ROOT}/bosh-stemcell"
88+
bundle install
89+
popd
9090
91+
cd "${REPO_ROOT}"
9192
if [[ -z "$OS_IMAGE" ]]; then
9293
bundle exec rake stemcell:build[$IAAS,$HYPERVISOR,$OS_NAME,$OS_VERSION,$CANDIDATE_BUILD_NUMBER]
9394
rm -f ./tmp/base_os_image.tgz

ci/tasks/os-images/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fi
3333
sudo chown -R ubuntu .
3434
sudo chown -R ubuntu:ubuntu /mnt
3535
sudo chmod u+s "$(which sudo)"
36-
bundle install --local
36+
bundle install
3737
sudo --preserve-env --set-home --user ubuntu -- /bin/bash --login -i <<SUDO
3838
bundle exec rake stemcell:build_os_image[$OPERATING_SYSTEM_NAME,$OPERATING_SYSTEM_VERSION,$OS_IMAGE]
3939
SUDO

scripts/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function build() {
1616
exit 1
1717
fi
1818

19-
bundle install --local
19+
bundle install
2020

2121
# TODO(cdutra): build os image
2222
popd

0 commit comments

Comments
 (0)