bosh-stemcell 1.3169.0 → 1.3173.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4b979f55fcdb5ee8f7108c2db118cb1a80acfa9
-  data.tar.gz: 626d595598639896b20733110f2443080760c711
+  metadata.gz: 90e73459b390c27e55578b0dd92c4d24e7090ab3
+  data.tar.gz: 9191e922a6c9fe478c67761761abafec1be2d9a0
 SHA512:
-  metadata.gz: 6e0a4dd1bbb074322c5656408c990e1ca04fd9f72b78ed56da5ea79b9542543e7529b7b7bba9dc446e7d4cf825c44acee615bfd975c59fdef54a61bb7ca7ca5e
-  data.tar.gz: 30ad81e8477e81e9e0377a75213a8cf5b077959fe3727cddc9f7070274b2d6ae9dd63a5dc3eff21e2908ad7e8ecb3134d40218755638416964fe9cfa77029bef
+  metadata.gz: d07bbcf03db1545144b1cbfa7c2f326b5eb867bdc708da959aa50a1e17c7c2b23a2589ce0f8089c3ede1642837783946eec34e3baaf393f9f37ebff05f0456c9
+  data.tar.gz: eda694ae214279f93e522689e4f15ee476793edff1ba6f4ae8be03318ec1add7bf5986b4c507653003511f5110076b7da0a9b3c2e2b33272b4e3c67cb568fda1

data/lib/bosh/stemcell/arch.rb

@@ -0,0 +1,17 @@
+module Bosh::Stemcell
+  class Arch
+
+    def self.arch
+      RbConfig::CONFIG['host_cpu']
+    end
+
+    def self.ppc64le?
+      arch == 'powerpc64le'
+    end
+
+    def self.x86_64?
+      arch == 'x86_64'
+    end
+
+  end
+end

data/lib/bosh/stemcell/archive_filename.rb

@@ -1,3 +1,4 @@
+require 'bosh/stemcell/arch'
 require 'forwardable'
 
 module Bosh::Stemcell
@@ -24,7 +25,12 @@ module Bosh::Stemcell
     private
 
     def name
-      definition.light? ? "light-#{base_name}" : base_name
+      mod_name = definition.light? ? "light-#{base_name}" : base_name
+      if Bosh::Stemcell::Arch.ppc64le?
+        "#{mod_name}-ppc64le"
+      else
+        mod_name
+      end
     end
 
     attr_reader(

data/lib/bosh/stemcell/build_environment.rb

@@ -42,7 +42,7 @@ module Bosh::Stemcell
       [
         "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
@@ -156,6 +156,7 @@ module Bosh::Stemcell
     end
 
     def exclude_exclusions
+      [
       case infrastructure.name
       when 'vsphere'
         ' --tag ~exclude_on_vsphere'
@@ -171,6 +172,16 @@ module Bosh::Stemcell
         ' --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
 

data/lib/bosh/stemcell/disk_image.rb

@@ -50,7 +50,12 @@ module Bosh::Stemcell
 
     def map_image
       @device = shell.run("sudo losetup --show --find #{image_file_path}", output_command: verbose)
-      shell.run("sudo kpartx -av #{device}", output_command: verbose)
+      if  Bosh::Stemcell::Arch.ppc64le?
+        # power8 guest images have a p1: PReP partition and p2: file system, we need loopp2 here
+        shell.run("sudo kpartx -av #{device} | grep \"^add\" | grep \"p2 \"", output_command: verbose)
+      else
+        shell.run("sudo kpartx -av #{device}", output_command: verbose)
+      end
     end
 
     def unmap_image

data/lib/bosh/stemcell/stage_collection.rb

@@ -36,7 +36,7 @@ module Bosh::Stemcell
         :bosh_micro_go,
         :aws_cli,
         :logrotate_config,
-      ]
+      ].reject{ |s| Bosh::Stemcell::Arch.ppc64le? and [:bosh_ruby, :bosh_micro_go].include?(s) }
     end
 
     def build_stemcell_image_stages
@@ -220,7 +220,7 @@ module Bosh::Stemcell
         :vim_tiny,
         :cron_config,
         :escape_ctrl_alt_del,
-      ].flatten
+      ].flatten.reject{ |s| Bosh::Stemcell::Arch.ppc64le? and s ==  :system_ixgbevf }
     end
 
     def photonos_os_stages

data/lib/bosh/stemcell/stemcell_packager.rb

@@ -46,6 +46,11 @@ module Bosh
       end
 
       def manifest_cloud_properties(disk_format, infrastructure, stemcell_name)
+        architecture = 'x86_64'
+        if Bosh::Stemcell::Arch.ppc64le?
+          architecture = 'ppc64le'
+        end
+
         {
             'name' => stemcell_name,
             'version' => version.to_s,
@@ -56,7 +61,7 @@ module Bosh
             'container_format' => 'bare',
             'os_type' => 'linux',
             'os_distro' => definition.operating_system.name,
-            'architecture' => 'x86_64',
+            'architecture' => architecture,
         }.merge(infrastructure.additional_cloud_properties)
       end
 

data/lib/bosh/stemcell/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Stemcell
-    VERSION = '1.3169.0'
+    VERSION = '1.3173.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-stemcell
 version: !ruby/object:Gem::Version
-  version: 1.3169.0
+  version: 1.3173.0
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3169.0
+        version: 1.3173.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -173,6 +173,7 @@ files:
 - README.md
 - lib/bosh/stemcell.rb
 - lib/bosh/stemcell/agent.rb
+- lib/bosh/stemcell/arch.rb
 - lib/bosh/stemcell/archive.rb
 - lib/bosh/stemcell/archive_filename.rb
 - lib/bosh/stemcell/archive_handler.rb