Skip to content

Commit 096fcec

Browse files
author
Glenn Oppegard and Jeffrey Peckham
committed
Fix gem rake, clean up stemcell building, bat fast
1 parent aa73426 commit 096fcec

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

rake/gem.rake

+3-4
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,12 @@ def component_needs_update(component, root, version)
144144
Dir.chdir File.join(root, component) do
145145
gemspec = Gem::Specification.load File.join(root, component, "#{component}.gemspec")
146146
last_code_change_time = gemspec.files.map { |file| File::Stat.new(file).mtime }.max
147+
gem_file_name = last_released_component(component, root, version)
147148

148-
last_code_change_time > File::Stat.new(last_released_component(component, root, version)).mtime
149+
!File.exists?(gem_file_name) || last_code_change_time > File::Stat.new(gem_file_name).mtime
149150
end
150151
end
151152

152153
def last_released_component(component, root, version)
153-
Dir.chdir File.join(root, component) do
154-
File.join(root, "release", "src", "bosh", component, "#{component}-#{version}.gem")
155-
end
154+
File.join(root, "release", "src", "bosh", component, "#{component}-#{version}.gem")
156155
end

spec/ci_build_stemcell.sh

-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ else
1616
fi
1717

1818
sudo rm -rf /mnt/$directory
19-
if [ -f $WORKSPACE/*.tgz ]
20-
then
21-
rm $WORKSPACE/*.tgz
22-
fi
2319

2420
WORK_PATH=/mnt/$directory/work \
2521
BUILD_PATH=/mnt/$directory/build \

spec/system/aws/micro_bosh_spec.rb

+4-2
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@
4141
end
4242
bat_env = {
4343
'BAT_DIRECTOR' => "micro.#{ENV["BOSH_VPC_SUBDOMAIN"]}.cf-app.com",
44-
'BAT_STEMCELL' => stemcell_path,
44+
'BAT_STEMCELL' => latest_stemcell_path,
4545
'BAT_DEPLOYMENT_SPEC' => "#{bat_deployment_path}/bat.yml",
46-
'BAT_VCAP_PASSWORD' => 'c1oudc0w'
46+
'BAT_VCAP_PASSWORD' => 'c1oudc0w',
47+
'BAT_FAST' => 'true',
48+
'BAT_SKIP_SSH' => 'true'
4749
}
4850
system(bat_env, "rake bat").should be_true
4951
end

0 commit comments

Comments
 (0)