bosh-stemcell 1.2427.0 → 1.2446.0

data/README.md

@@ -31,7 +31,7 @@ The final two arguments are the S3 bucket and key for the OS image to use, which
 
     vagrant ssh -c '
       cd /bosh
-      CANDIDATE_BUILD_NUMBER=<current_build> http_proxy=http://localhost:3142/ bundle exec rake stemcell:build[vsphere,centos,ruby,ci4-bosh-os-images-centos,aa1590ae6eb031840b59485ad292d4ae313c0327338867263c07a73878fb4a49]
+      CANDIDATE_BUILD_NUMBER=<current_build> http_proxy=http://localhost:3142/ bundle exec rake stemcell:build[vsphere,centos,nil,ruby,bosh-os-images,bosh-centos-6_5-os-image.tgz]
     ' remote
 
 # Run the stemcell locally with Fusion
@@ -112,7 +112,7 @@ A stemcell with a custom OS image can be built using the stemcell-building VM cr
 
     vagrant ssh -c '
       cd /bosh
-      bundle exec rake stemcell:build_os_image[centos,/tmp/centos_base_image.tgz]
-      bundle exec rake stemcell:build_with_local_os_image[aws,centos,ruby,/tmp/centos_base_image.tgz]
+      bundle exec rake stemcell:build_os_image[ubuntu,lucid,/tmp/ubuntu_base_image.tgz]
+      bundle exec rake stemcell:build_with_local_os_image[aws,ubuntu,lucid,ruby,/tmp/ubuntu_base_image.tgz]
     ' remote
 

data/lib/bosh/stemcell/archive_filename.rb

@@ -15,11 +15,8 @@ module Bosh::Stemcell
       stemcell_filename_parts = [
         name,
         version,
-        infrastructure.name,
-        infrastructure.hypervisor,
-        operating_system.name,
+        @definition.stemcell_name
       ]
-      stemcell_filename_parts << "#{agent.name}_agent" unless agent.name == 'ruby'
       "#{stemcell_filename_parts.join('-')}.tgz"
     end
 
@@ -29,13 +26,6 @@ module Bosh::Stemcell
       light ? "light-#{base_name}" : base_name
     end
 
-    def_delegators(
-      :@definition,
-      :infrastructure,
-      :operating_system,
-      :agent,
-    )
-
     attr_reader(
       :base_name,
       :version,

data/lib/bosh/stemcell/build_environment.rb

@@ -36,7 +36,7 @@ module Bosh::Stemcell
         "cd #{STEMCELL_SPECS_DIR};",
         "OS_IMAGE=#{os_image_tarball_path}",
         'bundle exec rspec -fd',
-        "spec/os_image/#{operating_system.name}_spec.rb",
+        "spec/os_image/#{operating_system_spec_name}_spec.rb",
       ].join(' ')
     end
 
@@ -45,7 +45,7 @@ module Bosh::Stemcell
         "cd #{STEMCELL_SPECS_DIR};",
         "STEMCELL_IMAGE=#{image_file_path}",
         "bundle exec rspec -fd#{exclude_exclusions}",
-        "spec/stemcells/#{operating_system.name}_spec.rb",
+        "spec/stemcells/#{operating_system_spec_name}_spec.rb",
         "spec/stemcells/#{agent.name}_agent_spec.rb",
         "spec/stemcells/#{infrastructure.name}_spec.rb",
       ].join(' ')
@@ -103,6 +103,14 @@ module Bosh::Stemcell
       shell.run("sudo rm -rf #{base_directory}", { ignore_failures: true })
     end
 
+    def operating_system_spec_name
+      spec_name = operating_system.name
+      if operating_system.version
+        spec_name = "#{spec_name}_#{operating_system.version}"
+      end
+      spec_name
+    end
+
     def prepare_build_path
       FileUtils.rm_rf(build_path, verbose: true) if File.exist?(build_path)
       FileUtils.mkdir_p(build_path, verbose: true)

data/lib/bosh/stemcell/builder_options.rb

@@ -19,17 +19,15 @@ module Bosh::Stemcell
     end
 
     def default
-      stemcell_name = "bosh-#{infrastructure.name}-#{infrastructure.hypervisor}-#{operating_system.name}"
-      stemcell_name += "-#{agent.name}_agent" unless agent.name == 'ruby'
-
       {
-        'stemcell_name' => stemcell_name,
+        'stemcell_name' => "bosh-#{@definition.stemcell_name}",
         'stemcell_tgz' => archive_filename.to_s,
         'stemcell_image_name' => stemcell_image_name,
         'stemcell_version' => stemcell_version,
         'stemcell_hypervisor' => infrastructure.hypervisor,
         'stemcell_infrastructure' => infrastructure.name,
         'stemcell_operating_system' => operating_system.name,
+        'stemcell_operating_system_version' => operating_system.version,
         'bosh_protocol_version' => Bosh::Agent::BOSH_PROTOCOL,
         'ruby_bin' => ruby_bin,
         'bosh_release_src_dir' => File.join(source_root, 'release/src/bosh'),

data/lib/bosh/stemcell/definition.rb

@@ -6,10 +6,10 @@ module Bosh::Stemcell
   class Definition
     attr_reader :infrastructure, :operating_system, :agent
 
-    def self.for(infrastructure_name, operating_system_name, agent_name)
+    def self.for(infrastructure_name, operating_system_name, operating_system_version, agent_name)
       new(
         Bosh::Stemcell::Infrastructure.for(infrastructure_name),
-        Bosh::Stemcell::OperatingSystem.for(operating_system_name),
+        Bosh::Stemcell::OperatingSystem.for(operating_system_name, operating_system_version),
         Bosh::Stemcell::Agent.for(agent_name),
       )
     end
@@ -20,6 +20,17 @@ module Bosh::Stemcell
       @agent = agent
     end
 
+    def stemcell_name
+      stemcell_name_parts = [
+        infrastructure.name,
+        infrastructure.hypervisor,
+        operating_system.name,
+      ]
+      stemcell_name_parts << operating_system.version if operating_system.version
+      stemcell_name_parts << "#{agent.name}_agent" unless agent.name == 'ruby'
+      stemcell_name_parts.join('-')
+    end
+
     def ==(other)
       infrastructure == other.infrastructure &&
         operating_system == other.operating_system &&

data/lib/bosh/stemcell/operating_system.rb

@@ -1,18 +1,19 @@
 module Bosh::Stemcell
   module OperatingSystem
-    def self.for(operating_system_name)
+    def self.for(operating_system_name, operating_system_version = nil)
       case operating_system_name
         when 'centos' then Centos.new
-        when 'ubuntu' then Ubuntu.new
+        when 'ubuntu' then Ubuntu.new(operating_system_version)
         else raise ArgumentError.new("invalid operating system: #{operating_system_name}")
       end
     end
 
     class Base
-      attr_reader :name
+      attr_reader :name, :version
 
       def initialize(options = {})
         @name = options.fetch(:name)
+        @version = options.fetch(:version, nil)
       end
 
       def ==(other)
@@ -27,8 +28,8 @@ module Bosh::Stemcell
     end
 
     class Ubuntu < Base
-      def initialize
-        super(name: 'ubuntu')
+      def initialize(version)
+        super(name: 'ubuntu', version: version)
       end
     end
   end

data/lib/bosh/stemcell/stage_collection.rb

@@ -95,6 +95,7 @@ module Bosh::Stemcell
         :bosh_sysstat,
         :bosh_sysctl,
         :system_kernel,
+        :system_rescan_scsi_bus,
       ]
     end
 

data/lib/bosh/stemcell/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Stemcell
-    VERSION = '1.2427.0'
+    VERSION = '1.2446.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-stemcell
 version: !ruby/object:Gem::Version
-  version: 1.2427.0
+  version: 1.2446.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-04-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.2427.0
+        version: 1.2446.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2427.0
+        version: 1.2446.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1429997111096567650
+      hash: -3079839408081351394
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23