Fix buildpack install and tests

Co-authored-by: Johannes Dillmann <[email protected]>

Author: 2 people

app/jobs/runtime/buildpack_installer_factory.rb

@@ -37,8 +37,7 @@ def plan(buildpack_name, manifest_fields)
 
           planned_jobs = []
 
-          found_buildpacks = Buildpack.where(name: buildpack_name).all
-
+          found_buildpacks = Buildpack.where(name: buildpack_name, lifecycle: manifest_fields[0][:lifecycle]).all
           ensure_no_attempt_to_upgrade_a_stackless_locked_buildpack(buildpack_name, found_buildpacks, manifest_fields)
 
           manifest_fields.each do |buildpack_fields|

app/jobs/runtime/create_buildpack_installer.rb

@@ -10,7 +10,7 @@ def perform
           buildpacks_lock = Locking[name: 'buildpacks']
           buildpacks_lock.db.transaction do
             buildpacks_lock.lock!
-            buildpack = Buildpack.create(name: name, stack: stack_name)
+            buildpack = Buildpack.create(name: name, stack: stack_name, lifecycle: options[:lifecycle])
           end
           begin
             buildpack_uploader.upload_buildpack(buildpack, file, File.basename(file))

lib/cloud_controller/install_buildpacks.rb

@@ -18,6 +18,8 @@ def install(buildpacks)
       buildpacks.each do |bpack|
         buildpack_opts = bpack.deep_symbolize_keys
 
+        buildpack_opts[:lifecycle] = Lifecycles::BUILDPACK if buildpack_opts[:lifecycle].nil?
+
         buildpack_name = buildpack_opts.delete(:name)
         if buildpack_name.nil?
           logger.error "A name must be specified for the buildpack_opts: #{buildpack_opts}"
@@ -40,13 +42,17 @@ def install(buildpacks)
           next
         end
 
-        detected_stack = VCAP::CloudController::Buildpacks::StackNameExtractor.extract_from_file(buildpack_file)
+        detected_stack = VCAP::CloudController::Buildpacks::StackNameExtractor.extract_from_file(buildpack_file) if buildpack_opts[:lifecycle] == Lifecycles::BUILDPACK
+        detected_stack = buildpack_opts[:stack] if buildpack_opts[:lifecycle] == Lifecycles::CNB
+
         factory_options << { name: buildpack_name, file: buildpack_file, options: buildpack_opts, stack: detected_stack }
       end
 
-      buildpacks_by_name = factory_options.group_by { |options| options[:name] }
-      buildpacks_by_name.each do |name, buildpack_options|
-        buildpack_install_jobs << job_factory.plan(name, buildpack_options)
+      buildpacks_by_lifecycle = factory_options.group_by { |options| options[:options][:lifecycle] }
+      buildpacks_by_lifecycle.each_value do |options|
+        options.group_by { |opts| opts[:name] }.each do |name, buildpack_options|
+          buildpack_install_jobs << job_factory.plan(name, buildpack_options)
+        end
       end
 
       buildpack_install_jobs.flatten!

spec/request/buildpacks_spec.rb

@@ -118,6 +118,7 @@
             'resources' => [
               {
                 'guid' => buildpack1.guid,
+                'lifecycle' => 'buildpack',
                 'created_at' => iso8601,
                 'updated_at' => iso8601,
                 'name' => buildpack1.name,
@@ -140,6 +141,7 @@
               },
               {
                 'guid' => buildpack3.guid,
+                'lifecycle' => 'buildpack',
                 'created_at' => iso8601,
                 'updated_at' => iso8601,
                 'name' => buildpack3.name,
@@ -185,6 +187,7 @@
             'resources' => [
               {
                 'guid' => buildpack1.guid,
+                'lifecycle' => 'buildpack',
                 'created_at' => iso8601,
                 'updated_at' => iso8601,
                 'name' => buildpack1.name,
@@ -230,6 +233,7 @@
             'resources' => [
               {
                 'guid' => buildpack3.guid,
+                'lifecycle' => 'buildpack',
                 'created_at' => iso8601,
                 'updated_at' => iso8601,
                 'name' => buildpack3.name,
@@ -252,6 +256,7 @@
               },
               {
                 'guid' => buildpack1.guid,
+                'lifecycle' => 'buildpack',
                 'created_at' => iso8601,
                 'updated_at' => iso8601,
                 'name' => buildpack1.name,
@@ -360,6 +365,7 @@
               'enabled' => params[:enabled],
               'locked' => params[:locked],
               'guid' => buildpack.guid,
+              'lifecycle' => 'buildpack',
               'created_at' => iso8601,
               'updated_at' => iso8601,
               'metadata' => {
@@ -477,6 +483,7 @@
             'enabled' => buildpack.enabled,
             'locked' => buildpack.locked,
             'guid' => buildpack.guid,
+            'lifecycle' => 'buildpack',
             'created_at' => iso8601,
             'updated_at' => iso8601,
             'metadata' => { 'labels' => {}, 'annotations' => {} },