lib/bosh/stemcell/build_environment.rb in bosh-stemcell-1.3169.0 vs lib/bosh/stemcell/build_environment.rb in bosh-stemcell-1.3173.0
- old
+ new
@@ -40,11 +40,11 @@
def os_image_rspec_command
[
"cd #{STEMCELL_SPECS_DIR};",
"OS_IMAGE=#{os_image_tarball_path}",
- 'bundle exec rspec -fd',
+ "bundle exec rspec -fd#{exclude_arch_exclusions}",
"spec/os_image/#{operating_system_spec_name}_spec.rb",
].join(' ')
end
def stemcell_rspec_command
@@ -154,10 +154,11 @@
end
end
end
def exclude_exclusions
+ [
case infrastructure.name
when 'vsphere'
' --tag ~exclude_on_vsphere'
when 'vcloud'
' --tag ~exclude_on_vcloud'
@@ -167,9 +168,19 @@
' --tag ~exclude_on_aws'
when 'openstack'
' --tag ~exclude_on_openstack'
when 'azure'
' --tag ~exclude_on_azure'
+ else
+ ''
+ end,
+ exclude_arch_exclusions.strip
+ ].join(' ').rstrip
+ end
+
+ def exclude_arch_exclusions
+ if Bosh::Stemcell::Arch.ppc64le?
+ ' --tag ~exclude_on_ppc64le'
else
''
end
end