Skip to content

Commit 680eff0

Browse files
committed
StemcellBuilder needs to bundle install now
1 parent 229001f commit 680eff0

4 files changed

Lines changed: 6 additions & 1 deletion

File tree

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ container):
136136
```shell
137137
export short_name="jammy"
138138
cd /opt/bosh/bosh-stemcell
139+
bundle install
139140
OS_IMAGE=/opt/bosh/tmp/ubuntu_base_image.tgz bundle exec rspec -fd spec/os_image/ubuntu_${short_name}_spec.rb
140141
```
141142

@@ -149,6 +150,7 @@ container, you should be able to run the specific tests:
149150

150151
```shell
151152
cd /opt/bosh/bosh-stemcell; \
153+
bundle install \
152154
STEMCELL_IMAGE=/mnt/stemcells/vsphere/esxi/ubuntu/work/work/vsphere-esxi-ubuntu.raw \
153155
STEMCELL_WORKDIR=/mnt/stemcells/vsphere/esxi/ubuntu/work/work/chroot \
154156
OS_NAME=ubuntu \

bosh-stemcell/bosh-stemcell.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
2121
spec.add_development_dependency "fakefs"
2222
spec.add_development_dependency "rake"
2323
spec.add_development_dependency "rspec"
24-
spec.add_development_dependency "rspec-instafail"
2524
spec.add_development_dependency "rspec-its"
2625
spec.add_development_dependency "standard"
2726
spec.add_development_dependency "timecop"

bosh-stemcell/lib/bosh/stemcell/build_environment.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ def prepare_build
4141
def os_image_rspec_command
4242
[
4343
"cd #{STEMCELL_SPECS_DIR};",
44+
"bundle install;",
4445
"OS_IMAGE=#{os_image_tarball_path}",
4546
"bundle exec rspec -fd",
4647
"spec/os_image/#{operating_system_spec_name}_spec.rb"
@@ -50,6 +51,7 @@ def os_image_rspec_command
5051
def stemcell_rspec_command
5152
cmd = [
5253
"cd #{STEMCELL_SPECS_DIR};",
54+
"bundle install;",
5355
"STEMCELL_IMAGE=#{image_file_path}",
5456
"STEMCELL_WORKDIR=#{work_path}",
5557
"STEMCELL_INFRASTRUCTURE=#{infrastructure.name}",

bosh-stemcell/spec/bosh/stemcell/build_environment_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ module Bosh::Stemcell
185185
it "returns the correct command" do
186186
expected_rspec_command = [
187187
"cd #{stemcell_specs_dir};",
188+
"bundle install;",
188189
"OS_IMAGE=/some/os_image.tgz",
189190
"bundle exec rspec -fd",
190191
"spec/os_image/#{operating_system.name}_spec.rb"
@@ -203,6 +204,7 @@ module Bosh::Stemcell
203204
it "returns the correct command" do
204205
expected_rspec_command = [
205206
"cd #{stemcell_specs_dir};",
207+
"bundle install;",
206208
"STEMCELL_IMAGE=#{File.join(work_path, "fake-root-disk-image.raw")}",
207209
"STEMCELL_WORKDIR=#{work_path}",
208210
"STEMCELL_INFRASTRUCTURE=#{infrastructure.name}",

0 commit comments

Comments
 (0)