bosh-stemcell 1.5.0.pre.1381 → 1.5.0.pre.1390

data/lib/bosh/stemcell/builder_command.rb

@@ -76,13 +76,17 @@ module Bosh::Stemcell
       [
         "cd #{File.expand_path('../../..', File.dirname(__FILE__))};",
         "STEMCELL_IMAGE=#{image_file_path}",
-        'bundle exec rspec -fd',
+        "bundle exec rspec -fd#{exclude_exclusions}",
         "spec/stemcells/#{operating_system.name}_spec.rb",
         "spec/stemcells/#{agent_name}_agent_spec.rb",
         "spec/stemcells/#{infrastructure.name}_spec.rb",
       ].join(' ')
     end
 
+    def exclude_exclusions
+      infrastructure.name == 'vsphere' ? ' --tag ~exclude_on_vsphere' : ''
+    end
+
     def image_file_path
       File.join(work_path, settings['stemcell_image_name'])
     end

data/lib/bosh/stemcell/stage_collection.rb

@@ -39,7 +39,7 @@ module Bosh::Stemcell
         when OperatingSystem::Centos then
           [:base_centos, :base_yum] + hacked_centos_common
         when OperatingSystem::Ubuntu then
-          [:base_debootstrap, :base_apt] + common_stages
+          [:base_debootstrap, :base_apt, :bosh_dpkg_list] + common_stages
       end
     end
 
@@ -75,7 +75,6 @@ module Bosh::Stemcell
         :system_parameters,
         :bosh_clean,
         :bosh_harden,
-        #:bosh_dpkg_list,
         :image_create,
         :image_install_grub,
         :image_vsphere_vmx,
@@ -104,14 +103,12 @@ module Bosh::Stemcell
       [
         # Misc
         :system_aws_network,
-        :system_aws_clock,
         :system_aws_modules,
         :system_parameters,
         # Finalisation
         :bosh_clean,
         :bosh_harden,
         :bosh_harden_ssh,
-        :bosh_dpkg_list,
         # Image/bootloader
         :image_create,
         :image_install_grub,
@@ -133,7 +130,6 @@ module Bosh::Stemcell
         :bosh_clean,
         :bosh_harden,
         :bosh_harden_ssh,
-        :bosh_dpkg_list,
         # Image/bootloader
         :image_create,
         :image_install_grub,
@@ -152,7 +148,6 @@ module Bosh::Stemcell
         # Finalisation
         :bosh_clean,
         :bosh_harden,
-        :bosh_dpkg_list,
         # Image/bootloader
         :image_create,
         :image_install_grub,

data/lib/bosh/stemcell/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Stemcell
-    VERSION = '1.5.0.pre.1381'
+    VERSION = '1.5.0.pre.1390'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-stemcell
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1381
+  version: 1.5.0.pre.1390
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1381
+        version: 1.5.0.pre.1390
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1381
+        version: 1.5.0.pre.1390
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement