bosh-director 1.3022.0 → 1.3025.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59a2d6077683ae1eaac10b9926fd87139cbf2193
-  data.tar.gz: e417875f5b9b4311ca2ffc19cbea42a4b4e673ed
+  metadata.gz: 2866e5d5feee61d1a283c8d9d1a0a06a9cb6f731
+  data.tar.gz: 2c6bb5137cb1fb66507b92cd009f5a34a963d1d7
 SHA512:
-  metadata.gz: fc4627b56956d3e9ce4795286416798815f1475b5542aee9b7de375f1b8c6b64f083b02b93db041e3530ab799f63732bc67bd3e87662e131ffd81c9dcd8216c5
-  data.tar.gz: c0d98a660d38ed280d769427e1ba7adb37e66426a2ccd7d46156c582194d0950eb6628a68999e257db3a92dd79871eeb8b29a954d8a29b01d303a82e744f6cec
+  metadata.gz: 601d852bd27463f21c5552a841b21d894636f85a9be57a9ca92db09aa36c93565fe8dac7742400bcb181c8921d7702b5ccf58ad1aa209e66b943f156fc95bfbe
+  data.tar.gz: ee763723e9f537a5f1cde210c8425dffe420d98052247ebfb864ca33576bc62fed2e9274a96097c43b44044b76a6bb8aa696c563f7d8a18c8019dd0ee9641f7c

data/lib/bosh/director/api/controllers/releases_controller.rb

@@ -16,7 +16,6 @@ module Bosh::Director
       post '/', :consumes => :multipart do
         options = {
           rebase: params['rebase'] == 'true',
-          compiled: params['compiled'] == 'true',
         }
 
         task = @release_manager.create_release_from_file_path(current_user, params[:nginx_upload_path], options)

data/lib/bosh/director/jobs/export_release.rb

@@ -10,10 +10,6 @@ module Bosh::Director
 
       @queue = :normal
 
-      @stemcell
-      @targeted_deployment
-      @release_version
-
       def self.job_type
         :export_release
       end

data/lib/bosh/director/jobs/update_release.rb

@@ -33,13 +33,6 @@ module Bosh::Director
 
         @rebase = !!options['rebase']
         @skip_if_exists = !!options['skip_if_exists']
-        @compiled_release = !!options['compiled']
-
-        if @compiled_release
-          @packages_folder = "compiled_packages"
-        else
-          @packages_folder = "packages"
-        end
 
         @manifest = nil
         @name = nil
@@ -110,6 +103,15 @@ module Bosh::Director
         end
 
         @manifest = Psych.load_file(manifest_file)
+
+        #handle compiled_release case
+        @compiled_release = !!@manifest["compiled_packages"]
+        if @compiled_release
+          @packages_folder = "compiled_packages"
+        else
+          @packages_folder = "packages"
+        end
+
         normalize_manifest
 
         @name = @manifest["name"]
@@ -253,69 +255,134 @@ module Bosh::Director
           end
         end
 
-        create_packages(new_packages, release_dir)
-        use_existing_packages(existing_packages)
+        package_stemcell_hashes1 = create_packages(new_packages, release_dir)
+        package_stemcell_hashes2 = use_existing_packages(existing_packages)
+        consolidated_package_stemcell_hashes = Array(package_stemcell_hashes1) | Array(package_stemcell_hashes2)
+
+        create_compiled_packages(consolidated_package_stemcell_hashes, release_dir)
+      end
+
+      # Points release DB model to existing packages described by given metadata
+      # @param [Array<Array>] packages Existing packages metadata
+      def use_existing_packages(packages)
+        return if packages.empty?
+
+        package_stemcell_hashes = []
+
+        single_step_stage("Processing #{packages.size} existing package#{"s" if packages.size > 1}") do
+          packages.each do |package, package_meta|
+            package_desc = "#{package.name}/#{package.version}"
+            logger.info("Using existing package `#{package_desc}'")
+            register_package(package)
+
+            if @compiled_release
+              stemcells = stemcells_used_by_package(package_meta)
+              stemcells.each do |stemcell|
+                hash = { "package" => package, "stemcell" => stemcell}
+                package_stemcell_hashes << hash
+              end
+            end
+          end
+        end
+
+        package_stemcell_hashes
       end
 
       # Creates packages using provided metadata
       # @param [Array<Hash>] packages Packages metadata
       # @param [String] release_dir local path to the unpacked release
-      # @return [void]
-      def create_packages(packages, release_dir)
-        if packages.empty?
+      # @return [Array<Hash>] package & stemcell
+      def create_packages(package_metas, release_dir)
+        if package_metas.empty?
           @packages_unchanged = true
           return
         end
 
-        event_log.begin_stage("Creating new packages", packages.size)
-        packages.each do |package_meta|
+        package_stemcell_hashes = []
+        event_log.begin_stage("Creating new packages", package_metas.size)
+
+        package = package_metas.each do |package_meta|
           package_desc = "#{package_meta["name"]}/#{package_meta["version"]}"
           event_log.track(package_desc) do
             logger.info("Creating new package `#{package_desc}'")
+            package = create_package(package_meta, release_dir)
+            register_package(package)
+            package
+          end
 
-            if @compiled_release
-              package = create_package_for_compiled_release(package_meta, release_dir)
-            else
-              package = create_package(package_meta, release_dir)
+          if @compiled_release
+            stemcells = stemcells_used_by_package(package_meta)
+            stemcells.each do |stemcell|
+              hash = { "package" => package, "stemcell" => stemcell}
+              package_stemcell_hashes << hash
             end
-
-            register_package(package)
           end
         end
+
+        package_stemcell_hashes
       end
 
-      # Points release DB model to existing packages described by given metadata
-      # @param [Array<Array>] packages Existing packages metadata
-      def use_existing_packages(packages)
-        return if packages.empty?
+      def create_compiled_packages(all_compiled_packages, release_dir)
+        if all_compiled_packages.nil?
+          return
+        end
 
-        single_step_stage("Processing #{packages.size} existing package#{"s" if packages.size > 1}") do
-          packages.each do |package, _|
-            package_desc = "#{package.name}/#{package.version}"
-            logger.info("Using existing package `#{package_desc}'")
-            register_package(package)
+        event_log.begin_stage('Creating new compiled packages', all_compiled_packages.size)
+
+        all_compiled_packages.each do |compiled_package_spec|
+          package = compiled_package_spec['package']
+          stemcell = compiled_package_spec['stemcell']
+
+          existing_compiled_package = Models::CompiledPackage.where(
+              :package_id => package.id,
+              :stemcell_id => stemcell.id)
+
+          if existing_compiled_package.empty?
+            package_desc = "#{package.name}/#{package.version} for #{stemcell.name}/#{stemcell.version}"
+            event_log.track(package_desc) do
+              create_compiled_package(package, stemcell, release_dir)
+            end
           end
         end
       end
 
-      def create_package_for_compiled_release(package_meta, release_dir)
-        name, version = package_meta["name"], package_meta["version"]
-        desc = "package `#{name}/#{version}'"
+      def stemcells_used_by_package(package_meta)
+        if package_meta['stemcell'].nil?
+          raise 'stemcell informatiom(operating system/version) should be listed for each package of a compiled tarball'
+        end
 
-        package_attrs = {
-            :release => @release_model,
-            :name => name,
-            :sha1 => nil,
-            :blobstore_id => nil,
-            :fingerprint => package_meta["fingerprint"],
-            :version => version
-        }
+        values = package_meta['stemcell'].split('/', 2)
+        operating_system = values[0]
+        stemcell_version = values[1]
+        unless operating_system && stemcell_version
+          raise 'stemcell informatiom(operating system/version) should be listed for each package of a compiled tarball'
+        end
 
-        package = Models::Package.new(package_attrs)
-        package.dependency_set = package_meta["dependencies"]
+        stemcells = Models::Stemcell.where(:operating_system => operating_system, :version => stemcell_version)
+        if stemcells.empty?
+          raise "No stemcells matching OS #{operating_system} version #{stemcell_version}"
+        end
 
-        logger.info("Creating #{desc} from provided bits")
-        package.save
+        stemcells
+      end
+
+      def create_compiled_package(package, stemcell, release_dir)
+        tgz = File.join(release_dir, 'compiled_packages', "#{package.name}.tgz")
+        validate_tgz(tgz, "#{package.name}.tgz")
+
+        compiled_package = Models::CompiledPackage.new
+
+        compiled_package.blobstore_id = BlobUtil.create_blob(tgz)
+        compiled_package.sha1 = Digest::SHA1.hexdigest(tgz)
+
+        transitive_dependencies = @release_version_model.transitive_dependencies(package)
+        compiled_package.dependency_key = Models::CompiledPackage.create_dependency_key(transitive_dependencies)
+
+        compiled_package.build = Models::CompiledPackage.generate_build_number(package, stemcell)
+        compiled_package.package_id = package.id
+        compiled_package.stemcell_id = stemcell.id
+
+        compiled_package.save
       end
 
       # Creates package in DB according to given metadata
@@ -323,43 +390,48 @@ module Bosh::Director
       # @param [String] release_dir local path to the unpacked release
       # @return [void]
       def create_package(package_meta, release_dir)
-        name, version = package_meta["name"], package_meta["version"]
+        name, version = package_meta['name'], package_meta['version']
 
         package_attrs = {
-          :release => @release_model,
-          :name => name,
-          :sha1 => package_meta["sha1"],
-          :fingerprint => package_meta["fingerprint"],
-          :version => version
+            :release => @release_model,
+            :name => name,
+            :sha1 => @compiled_release ? nil : package_meta['sha1'],
+            :blobstore_id => nil,
+            :fingerprint => package_meta['fingerprint'],
+            :version => version
         }
 
         package = Models::Package.new(package_attrs)
-        package.dependency_set = package_meta["dependencies"]
+        package.dependency_set = package_meta['dependencies']
 
-        existing_blob = package_meta["blobstore_id"]
-        desc = "package `#{name}/#{version}'"
+        unless @compiled_release
+          existing_blob = package_meta['blobstore_id']
+          desc = "package '#{name}/#{version}'"
 
-        if existing_blob
-          logger.info("Creating #{desc} from existing blob #{existing_blob}")
-          package.blobstore_id = BlobUtil.copy_blob(existing_blob)
-        else
-          logger.info("Creating #{desc} from provided bits")
-
-          package_tgz = File.join(release_dir, "packages", "#{name}.tgz")
-          result = Bosh::Exec.sh("tar -tzf #{package_tgz} 2>&1", :on_error => :return)
-          if result.failed?
-            logger.error("Extracting #{desc} archive failed, " +
-                         "tar returned #{result.exit_status}, " +
-                         "output: #{result.output}")
-            raise PackageInvalidArchive, "Extracting #{desc} archive failed. Check task debug log for details."
-          end
+          if existing_blob
+            logger.info("Creating #{desc} from existing blob #{existing_blob}")
+            package.blobstore_id = BlobUtil.copy_blob(existing_blob)
+
+          else
+            logger.info("Creating #{desc} from provided bits")
 
-          package.blobstore_id = BlobUtil.create_blob(package_tgz)
+            package_tgz = File.join(release_dir, 'packages', "#{name}.tgz")
+            validate_tgz(package_tgz, desc)
+            package.blobstore_id = BlobUtil.create_blob(package_tgz)
+          end
         end
 
         package.save
       end
 
+      def validate_tgz(tgz, desc)
+        result = Bosh::Exec.sh("tar -tzf #{tgz} 2>&1", :on_error => :return)
+        if result.failed?
+          logger.error("Extracting #{desc} archive failed, tar returned #{result.exit_status}, output: #{result.output}")
+          raise PackageInvalidArchive, "Extracting #{desc} archive failed. Check task debug log for details."
+        end
+      end
+
       # Marks package model as used by release version model
       # @param [Models::Package] package Package model
       # @return [void]

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3022.0'
+    VERSION = '1.3025.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3022.0
+  version: 1.3025.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -30,126 +30,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3022.0
+        version: 1.3025.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -572,7 +572,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH Director
-  6073a7
+  37d29e
 email: support@cloudfoundry.com
 executables:
 - bosh-director