Merge branch 'lm-multiple-cache-per-file' into 'master'

Adds multiple caches per build [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!53410

app/models/ci/build.rb

@@ -812,14 +812,15 @@ module Ci
     end
 
     def cache
-      cache = options[:cache]
+      cache = Array.wrap(options[:cache])
 
-      if cache && project.jobs_cache_index
-        cache = cache.merge(
-          key: "#{cache[:key]}-#{project.jobs_cache_index}")
+      if project.jobs_cache_index
+        cache = cache.map do |single_cache|
+          single_cache.merge(key: "#{single_cache[:key]}-#{project.jobs_cache_index}")
+        end
       end
 
-      [cache]
+      cache
     end
 
     def credentials

changelogs/unreleased/lm-multiple-cache-per-file.yml

+---
+title: Adds ability to have multiple cache per job
+merge_request: 53410
+author:
+type: changed

config/feature_flags/development/multiple_cache_per_job.yml

+---
+name: multiple_cache_per_job
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53410
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321877
+milestone: '13.10'
+type: development
+group: group::pipeline authoring
+default_enabled: false

doc/ci/yaml/README.md

@@ -2754,7 +2754,62 @@ URI-encoded `%2F`. A value made only of dots (`.`, `%2E`) is also forbidden.
 
 You can specify a [fallback cache key](#fallback-cache-key) to use if the specified `cache:key` is not found.
 
-##### Fallback cache key
+##### Multiple caches
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/32814) in GitLab 13.10.
+> - It's [deployed behind a feature flag](../../user/feature_flags.md), disabled by default.
+> - It's disabled on GitLab.com.
+> - It's not recommended for production use.
+> - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-or-disable-multiple-caches). **(FREE SELF)**
+
+WARNING:
+This feature might not be available to you. Check the **version history** note above for details.
+
+You can have a maximum of four caches:
+
+```yaml
+test-job:
+  stage: build
+  cache:
+    - key:
+        files:
+          - Gemfile.lock
+      paths:
+        - vendor/ruby
+    - key:
+        files:
+          - yarn.lock
+      paths:
+        - .yarn-cache/
+  script:
+    - bundle install --path=vendor
+    - yarn install --cache-folder .yarn-cache
+    - echo Run tests...
+```
+
+If multiple caches are combined with a [Fallback cache key](#fallback-cache-key),
+the fallback is fetched multiple times if multiple caches are not found.
+
+##### Enable or disable multiple caches **(FREE SELF)**
+
+The multiple caches feature is under development and not ready for production use.
+It is deployed behind a feature flag that is **disabled by default**.
+[GitLab administrators with access to the GitLab Rails console](../../administration/feature_flags.md)
+can enable it.
+
+To enable it:
+
+```ruby
+Feature.enable(:multiple_cache_per_job)
+```
+
+To disable it:
+
+```ruby
+Feature.disable(:multiple_cache_per_job)
+```
+
+#### Fallback cache key
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/1534) in GitLab Runner 13.4.
 

lib/gitlab/ci/config/entry/cache.rb

@@ -7,52 +7,90 @@ module Gitlab
         ##
         # Entry that represents a cache configuration
         #
-        class Cache < ::Gitlab::Config::Entry::Node
-          include ::Gitlab::Config::Entry::Configurable
-          include ::Gitlab::Config::Entry::Validatable
-          include ::Gitlab::Config::Entry::Attributable
-
-          ALLOWED_KEYS = %i[key untracked paths when policy].freeze
-          ALLOWED_POLICY = %w[pull-push push pull].freeze
-          DEFAULT_POLICY = 'pull-push'
-          ALLOWED_WHEN = %w[on_success on_failure always].freeze
-          DEFAULT_WHEN = 'on_success'
-
-          validations do
-            validates :config, type: Hash, allowed_keys: ALLOWED_KEYS
-            validates :policy,
-              inclusion: { in: ALLOWED_POLICY, message: 'should be pull-push, push, or pull' },
-              allow_blank: true
-
-            with_options allow_nil: true do
-              validates :when,
-                  inclusion: {
-                    in: ALLOWED_WHEN,
-                    message: 'should be on_success, on_failure or always'
-                  }
+        class Cache < ::Gitlab::Config::Entry::Simplifiable
+          strategy :Caches, if: -> (config) { Feature.enabled?(:multiple_cache_per_job) }
+          strategy :Cache, if: -> (config) { Feature.disabled?(:multiple_cache_per_job) }
+
+          class Caches < ::Gitlab::Config::Entry::ComposableArray
+            include ::Gitlab::Config::Entry::Validatable
+
+            MULTIPLE_CACHE_LIMIT = 4
+
+            validations do
+              validates :config, presence: true
+
+              validate do
+                unless config.is_a?(Hash) || config.is_a?(Array)
+                  errors.add(:config, 'can only be a Hash or an Array')
+                end
+
+                if config.is_a?(Array) && config.count > MULTIPLE_CACHE_LIMIT
+                  errors.add(:config, "no more than #{MULTIPLE_CACHE_LIMIT} caches can be created")
+                end
+              end
+            end
+
+            def initialize(*args)
+              super
+
+              @key = nil
+            end
+
+            def composable_class
+              Entry::Cache::Cache
             end
           end
 
-          entry :key, Entry::Key,
-            description: 'Cache key used to define a cache affinity.'
+          class Cache < ::Gitlab::Config::Entry::Node
+            include ::Gitlab::Config::Entry::Configurable
+            include ::Gitlab::Config::Entry::Validatable
+            include ::Gitlab::Config::Entry::Attributable
+
+            ALLOWED_KEYS = %i[key untracked paths when policy].freeze
+            ALLOWED_POLICY = %w[pull-push push pull].freeze
+            DEFAULT_POLICY = 'pull-push'
+            ALLOWED_WHEN = %w[on_success on_failure always].freeze
+            DEFAULT_WHEN = 'on_success'
+
+            validations do
+              validates :config, type: Hash, allowed_keys: ALLOWED_KEYS
+              validates :policy,
+                inclusion: { in: ALLOWED_POLICY, message: 'should be pull-push, push, or pull' },
+                allow_blank: true
+
+              with_options allow_nil: true do
+                validates :when,
+                    inclusion: {
+                      in: ALLOWED_WHEN,
+                      message: 'should be on_success, on_failure or always'
+                    }
+              end
+            end
 
-          entry :untracked, ::Gitlab::Config::Entry::Boolean,
-            description: 'Cache all untracked files.'
+            entry :key, Entry::Key,
+              description: 'Cache key used to define a cache affinity.'
 
-          entry :paths, Entry::Paths,
-            description: 'Specify which paths should be cached across builds.'
+            entry :untracked, ::Gitlab::Config::Entry::Boolean,
+              description: 'Cache all untracked files.'
 
-          attributes :policy, :when
+            entry :paths, Entry::Paths,
+              description: 'Specify which paths should be cached across builds.'
 
-          def value
-            result = super
+            attributes :policy, :when
 
-            result[:key] = key_value
-            result[:policy] = policy || DEFAULT_POLICY
-            # Use self.when to avoid conflict with reserved word
-            result[:when] = self.when || DEFAULT_WHEN
+            def value
+              result = super
+
+              result[:key] = key_value
+              result[:policy] = policy || DEFAULT_POLICY
+              # Use self.when to avoid conflict with reserved word
+              result[:when] = self.when || DEFAULT_WHEN
+
+              result
+            end
+          end
 
-            result
+          class UnknownStrategy < ::Gitlab::Config::Entry::Node
           end
         end
       end

lib/gitlab/ci/features.rb

@@ -67,6 +67,10 @@ module Gitlab
       def self.display_codequality_backend_comparison?(project)
         ::Feature.enabled?(:codequality_backend_comparison, project, default_enabled: :yaml)
       end
+
+      def self.multiple_cache_per_job?
+        ::Feature.enabled?(:multiple_cache_per_job, default_enabled: :yaml)
+      end
     end
   end
 end

lib/gitlab/ci/pipeline/seed/build.rb

@@ -28,8 +28,16 @@ module Gitlab
               .fabricate(attributes.delete(:except))
             @rules = Gitlab::Ci::Build::Rules
               .new(attributes.delete(:rules), default_when: 'on_success')
-            @cache = Seed::Build::Cache
-              .new(pipeline, attributes.delete(:cache))
+
+            if multiple_cache_per_job?
+              cache = Array.wrap(attributes.delete(:cache))
+              @cache = cache.map do |cache|
+                Seed::Build::Cache.new(pipeline, cache)
+              end
+            else
+              @cache = Seed::Build::Cache
+                .new(pipeline, attributes.delete(:cache))
+            end
           end
 
           def name
@@ -197,7 +205,21 @@ module Gitlab
 
           def cache_attributes
             strong_memoize(:cache_attributes) do
-              @cache.build_attributes
+              if multiple_cache_per_job?
+                if @cache.empty?
+                  {}
+                else
+                  { options: { cache: @cache.map(&:attributes) } }
+                end
+              else
+                @cache.build_attributes
+              end
+            end
+          end
+
+          def multiple_cache_per_job?
+            strong_memoize(:multiple_cache_per_job) do
+              ::Gitlab::Ci::Features.multiple_cache_per_job?
             end
           end
 

lib/gitlab/ci/pipeline/seed/build/cache.rb

@@ -18,18 +18,18 @@ module Gitlab
               raise ArgumentError, "unknown cache keys: #{local_cache.keys}" if local_cache.any?
             end
 
-            def build_attributes
+            def attributes
               {
-                options: {
-                  cache: {
-                    key: key_string,
-                    paths: @paths,
-                    policy: @policy,
-                    untracked: @untracked,
-                    when: @when
-                  }.compact.presence
-                }.compact
-              }
+                key: key_string,
+                paths: @paths,
+                policy: @policy,
+                untracked: @untracked,
+                when: @when
+              }.compact
+            end
+
+            def build_attributes
+              { options: { cache: attributes.presence }.compact }
             end
 
             private

spec/lib/gitlab/ci/config/entry/job_spec.rb

@@ -537,7 +537,7 @@ RSpec.describe Gitlab::Ci::Config::Entry::Job do
 
       it 'overrides default config' do
         expect(entry[:image].value).to eq(name: 'some_image')
-        expect(entry[:cache].value).to eq(key: 'test', policy: 'pull-push', when: 'on_success')
+        expect(entry[:cache].value).to eq([key: 'test', policy: 'pull-push', when: 'on_success'])
       end
     end
 
@@ -552,7 +552,43 @@ RSpec.describe Gitlab::Ci::Config::Entry::Job do
 
       it 'uses config from default entry' do
         expect(entry[:image].value).to eq 'specified'
-        expect(entry[:cache].value).to eq(key: 'test', policy: 'pull-push', when: 'on_success')
+        expect(entry[:cache].value).to eq([key: 'test', policy: 'pull-push', when: 'on_success'])
+      end
+    end
+
+    context 'with multiple_cache_per_job FF disabled' do
+      before do
+        stub_feature_flags(multiple_cache_per_job: false)
+      end
+
+      context 'when job config overrides default config' do
+        before do
+          entry.compose!(deps)
+        end
+
+        let(:config) do
+          { script: 'rspec', image: 'some_image', cache: { key: 'test' } }
+        end
+
+        it 'overrides default config' do
+          expect(entry[:image].value).to eq(name: 'some_image')
+          expect(entry[:cache].value).to eq(key: 'test', policy: 'pull-push', when: 'on_success')
+        end
+      end
+
+      context 'when job config does not override default config' do
+        before do
+          allow(default).to receive('[]').with(:image).and_return(specified)
+
+          entry.compose!(deps)
+        end
+
+        let(:config) { { script: 'ls', cache: { key: 'test' } } }
+
+        it 'uses config from default entry' do
+          expect(entry[:image].value).to eq 'specified'
+          expect(entry[:cache].value).to eq(key: 'test', policy: 'pull-push', when: 'on_success')
+        end
       end
     end
 

spec/lib/gitlab/ci/pipeline/seed/build/cache_spec.rb

@@ -9,8 +9,255 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Build::Cache do
 
   let(:processor) { described_class.new(pipeline, config) }
 
-  describe '#build_attributes' do
-    subject { processor.build_attributes }
+  context 'with multiple_cache_per_job ff disabled' do
+    before do
+      stub_feature_flags(multiple_cache_per_job: false)
+    end
+
+    describe '#build_attributes' do
+      subject { processor.build_attributes }
+
+      context 'with cache:key' do
+        let(:config) do
+          {
+            key: 'a-key',
+            paths: ['vendor/ruby']
+          }
+        end
+
+        it { is_expected.to include(options: { cache: config }) }
+      end
+
+      context 'with cache:key as a symbol' do
+        let(:config) do
+          {
+            key: :a_key,
+            paths: ['vendor/ruby']
+          }
+        end
+
+        it { is_expected.to include(options: { cache: config.merge(key: "a_key") }) }
+      end
+
+      context 'with cache:key:files' do
+        shared_examples 'default key' do
+          let(:config) do
+            { key: { files: files } }
+          end
+
+          it 'uses default key' do
+            expected = { options: { cache: { key: 'default' } } }
+
+            is_expected.to include(expected)
+          end
+        end
+
+        shared_examples 'version and gemfile files' do
+          let(:config) do
+            {
+              key: {
+                files: files
+              },
+              paths: ['vendor/ruby']
+            }
+          end
+
+          it 'builds a string key' do
+            expected = {
+              options: {
+                cache: {
+                  key: '703ecc8fef1635427a1f86a8a1a308831c122392',
+                  paths: ['vendor/ruby']
+                }
+              }
+            }
+
+            is_expected.to include(expected)
+          end
+        end
+
+        context 'with existing files' do
+          let(:files) { ['VERSION', 'Gemfile.zip'] }
+
+          it_behaves_like 'version and gemfile files'
+        end
+
+        context 'with files starting with ./' do
+          let(:files) { ['Gemfile.zip', './VERSION'] }
+
+          it_behaves_like 'version and gemfile files'
+        end
+
+        context 'with files ending with /' do
+          let(:files) { ['Gemfile.zip/'] }
+
+          it_behaves_like 'default key'
+        end
+
+        context 'with new line in filenames' do
+          let(:files) { ["Gemfile.zip\nVERSION"] }
+
+          it_behaves_like 'default key'
+        end
+
+        context 'with missing files' do
+          let(:files) { ['project-gemfile.lock', ''] }
+
+          it_behaves_like 'default key'
+        end
+
+        context 'with directories' do
+          shared_examples 'foo/bar directory key' do
+            let(:config) do
+              {
+                key: {
+                  files: files
+                }
+              }
+            end
+
+            it 'builds a string key' do
+              expected = {
+                options: {
+                  cache: { key: '74bf43fb1090f161bdd4e265802775dbda2f03d1' }
+                }
+              }
+
+              is_expected.to include(expected)
+            end
+          end
+
+          context 'with directory' do
+            let(:files) { ['foo/bar'] }
+
+            it_behaves_like 'foo/bar directory key'
+          end
+
+          context 'with directory ending in slash' do
+            let(:files) { ['foo/bar/'] }
+
+            it_behaves_like 'foo/bar directory key'
+          end
+
+          context 'with directories ending in slash star' do
+            let(:files) { ['foo/bar/*'] }
+
+            it_behaves_like 'foo/bar directory key'
+          end
+        end
+      end
+
+      context 'with cache:key:prefix' do
+        context 'without files' do
+          let(:config) do
+            {
+              key: {
+                prefix: 'a-prefix'
+              },
+              paths: ['vendor/ruby']
+            }
+          end
+
+          it 'adds prefix to default key' do
+            expected = {
+              options: {
+                cache: {
+                  key: 'a-prefix-default',
+                  paths: ['vendor/ruby']
+                }
+              }
+            }
+
+            is_expected.to include(expected)
+          end
+        end
+
+        context 'with existing files' do
+          let(:config) do
+            {
+              key: {
+                files: ['VERSION', 'Gemfile.zip'],
+                prefix: 'a-prefix'
+              },
+              paths: ['vendor/ruby']
+            }
+          end
+
+          it 'adds prefix key' do
+            expected = {
+              options: {
+                cache: {
+                  key: 'a-prefix-703ecc8fef1635427a1f86a8a1a308831c122392',
+                  paths: ['vendor/ruby']
+                }
+              }
+            }
+
+            is_expected.to include(expected)
+          end
+        end
+
+        context 'with missing files' do
+          let(:config) do
+            {
+              key: {
+                files: ['project-gemfile.lock', ''],
+                prefix: 'a-prefix'
+              },
+              paths: ['vendor/ruby']
+            }
+          end
+
+          it 'adds prefix to default key' do
+            expected = {
+              options: {
+                cache: {
+                  key: 'a-prefix-default',
+                  paths: ['vendor/ruby']
+                }
+              }
+            }
+
+            is_expected.to include(expected)
+          end
+        end
+      end
+
+      context 'with all cache option keys' do
+        let(:config) do
+          {
+            key: 'a-key',
+            paths: ['vendor/ruby'],
+            untracked: true,
+            policy: 'push',
+            when: 'on_success'
+          }
+        end
+
+        it { is_expected.to include(options: { cache: config }) }
+      end
+
+      context 'with unknown cache option keys' do
+        let(:config) do
+          {
+            key: 'a-key',
+            unknown_key: true
+          }
+        end
+
+        it { expect { subject }.to raise_error(ArgumentError, /unknown_key/) }
+      end
+
+      context 'with empty config' do
+        let(:config) { {} }
+
+        it { is_expected.to include(options: {}) }
+      end
+    end
+  end
+
+  describe '#attributes' do
+    subject { processor.attributes }
 
     context 'with cache:key' do
       let(:config) do
@@ -20,7 +267,7 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Build::Cache do
         }
       end
 
-      it { is_expected.to include(options: { cache: config }) }
+      it { is_expected.to include(config) }
     end
 
     context 'with cache:key as a symbol' do
@@ -31,7 +278,7 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Build::Cache do
         }
       end
 
-      it { is_expected.to include(options: { cache: config.merge(key: "a_key") }) }
+      it { is_expected.to include(config.merge(key: "a_key")) }
     end
 
     context 'with cache:key:files' do
@@ -41,7 +288,7 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Build::Cache do
         end
 
         it 'uses default key' do
-          expected = { options: { cache: { key: 'default' } } }
+          expected = { key: 'default' }
 
           is_expected.to include(expected)
         end
@@ -59,13 +306,9 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Build::Cache do
 
         it 'builds a string key' do
           expected = {
-            options: {
-              cache: {
                 key: '703ecc8fef1635427a1f86a8a1a308831c122392',
                 paths: ['vendor/ruby']
-              }
             }
-          }
 
           is_expected.to include(expected)
         end
@@ -112,11 +355,7 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Build::Cache do
           end
 
           it 'builds a string key' do
-            expected = {
-              options: {
-                cache: { key: '74bf43fb1090f161bdd4e265802775dbda2f03d1' }
-              }
-            }
+            expected = { key: '74bf43fb1090f161bdd4e265802775dbda2f03d1' }
 
             is_expected.to include(expected)
           end
@@ -155,13 +394,9 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Build::Cache do
 
         it 'adds prefix to default key' do
           expected = {
-            options: {
-              cache: {
                 key: 'a-prefix-default',
                 paths: ['vendor/ruby']
               }
-            }
-          }
 
           is_expected.to include(expected)
         end
@@ -180,13 +415,9 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Build::Cache do
 
         it 'adds prefix key' do
           expected = {
-            options: {
-              cache: {
                 key: 'a-prefix-703ecc8fef1635427a1f86a8a1a308831c122392',
                 paths: ['vendor/ruby']
               }
-            }
-          }
 
           is_expected.to include(expected)
         end
@@ -205,13 +436,9 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Build::Cache do
 
         it 'adds prefix to default key' do
           expected = {
-            options: {
-              cache: {
                 key: 'a-prefix-default',
                 paths: ['vendor/ruby']
               }
-            }
-          }
 
           is_expected.to include(expected)
         end
@@ -229,7 +456,7 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Build::Cache do
         }
       end
 
-      it { is_expected.to include(options: { cache: config }) }
+      it { is_expected.to include(config) }
     end
 
     context 'with unknown cache option keys' do
@@ -242,11 +469,5 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Build::Cache do
 
       it { expect { subject }.to raise_error(ArgumentError, /unknown_key/) }
     end
-
-    context 'with empty config' do
-      let(:config) { {} }
-
-      it { is_expected.to include(options: {}) }
-    end
   end
 end

spec/lib/gitlab/ci/pipeline/seed/build_spec.rb

@@ -87,86 +87,167 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Build do
       end
     end
 
-    context 'with cache:key' do
-      let(:attributes) do
-        {
-          name: 'rspec',
-          ref: 'master',
-          cache: {
-            key: 'a-value'
+    context 'with multiple_cache_per_job FF disabled' do
+      before do
+        stub_feature_flags(multiple_cache_per_job: false)
+      end
+
+      context 'with cache:key' do
+        let(:attributes) do
+          {
+            name: 'rspec',
+            ref: 'master',
+            cache: {
+              key: 'a-value'
+            }
           }
-        }
+        end
+
+        it { is_expected.to include(options: { cache: { key: 'a-value' } }) }
       end
 
-      it { is_expected.to include(options: { cache: { key: 'a-value' } }) }
-    end
+      context 'with cache:key:files' do
+        let(:attributes) do
+          {
+            name: 'rspec',
+            ref: 'master',
+            cache: {
+              key: {
+                files: ['VERSION']
+              }
+            }
+          }
+        end
 
-    context 'with cache:key:files' do
-      let(:attributes) do
-        {
-          name: 'rspec',
-          ref: 'master',
-          cache: {
-            key: {
-              files: ['VERSION']
+        it 'includes cache options' do
+          cache_options = {
+            options: {
+              cache: { key: 'f155568ad0933d8358f66b846133614f76dd0ca4' }
             }
           }
-        }
+
+          is_expected.to include(cache_options)
+        end
       end
 
-      it 'includes cache options' do
-        cache_options = {
-          options: {
+      context 'with cache:key:prefix' do
+        let(:attributes) do
+          {
+            name: 'rspec',
+            ref: 'master',
             cache: {
-              key: 'f155568ad0933d8358f66b846133614f76dd0ca4'
+              key: {
+                prefix: 'something'
+              }
             }
           }
-        }
+        end
 
-        is_expected.to include(cache_options)
+        it { is_expected.to include(options: { cache: { key: 'something-default' } }) }
       end
-    end
 
-    context 'with cache:key:prefix' do
-      let(:attributes) do
-        {
-          name: 'rspec',
-          ref: 'master',
-          cache: {
-            key: {
-              prefix: 'something'
+      context 'with cache:key:files and prefix' do
+        let(:attributes) do
+          {
+            name: 'rspec',
+            ref: 'master',
+            cache: {
+              key: {
+                files: ['VERSION'],
+                prefix: 'something'
+              }
+            }
+          }
+        end
+
+        it 'includes cache options' do
+          cache_options = {
+            options: {
+              cache: { key: 'something-f155568ad0933d8358f66b846133614f76dd0ca4' }
             }
           }
-        }
-      end
 
-      it { is_expected.to include(options: { cache: { key: 'something-default' } }) }
+          is_expected.to include(cache_options)
+        end
+      end
     end
 
-    context 'with cache:key:files and prefix' do
+    context 'with cache:key' do
       let(:attributes) do
         {
           name: 'rspec',
           ref: 'master',
-          cache: {
-            key: {
-              files: ['VERSION'],
-              prefix: 'something'
+          cache: [{
+            key: 'a-value'
+          }]
+        }
+      end
+
+      it { is_expected.to include(options: { cache: [a_hash_including(key: 'a-value')] }) }
+
+      context 'with cache:key:files' do
+        let(:attributes) do
+          {
+            name: 'rspec',
+            ref: 'master',
+            cache: [{
+              key: {
+                files: ['VERSION']
+              }
+            }]
+          }
+        end
+
+        it 'includes cache options' do
+          cache_options = {
+            options: {
+              cache: [a_hash_including(key: 'f155568ad0933d8358f66b846133614f76dd0ca4')]
             }
           }
-        }
+
+          is_expected.to include(cache_options)
+        end
       end
 
-      it 'includes cache options' do
-        cache_options = {
-          options: {
-            cache: {
-              key: 'something-f155568ad0933d8358f66b846133614f76dd0ca4'
+      context 'with cache:key:prefix' do
+        let(:attributes) do
+          {
+            name: 'rspec',
+            ref: 'master',
+            cache: [{
+              key: {
+                prefix: 'something'
+              }
+            }]
+          }
+        end
+
+        it { is_expected.to include(options: { cache: [a_hash_including( key: 'something-default' )] }) }
+      end
+
+      context 'with cache:key:files and prefix' do
+        let(:attributes) do
+          {
+            name: 'rspec',
+            ref: 'master',
+            cache: [{
+              key: {
+                files: ['VERSION'],
+                prefix: 'something'
+              }
+            }]
+          }
+        end
+
+        it 'includes cache options' do
+          cache_options = {
+            options: {
+              cache: [a_hash_including(key: 'something-f155568ad0933d8358f66b846133614f76dd0ca4')]
             }
           }
-        }
 
-        is_expected.to include(cache_options)
+          is_expected.to include(cache_options)
+        end
       end
     end
 
@@ -179,7 +260,7 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Build do
         }
       end
 
-      it { is_expected.to include(options: {}) }
+      it { is_expected.to include({}) }
     end
 
     context 'with allow_failure' do
@@ -296,7 +377,7 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Build do
         it 'does not have environment' do
           expect(subject).not_to be_has_environment
           expect(subject.environment).to be_nil
-          expect(subject.metadata.expanded_environment_name).to be_nil
+          expect(subject.metadata).to be_nil
           expect(Environment.exists?(name: expected_environment_name)).to eq(false)
         end
       end

spec/models/ci/build_spec.rb

@@ -817,7 +817,48 @@ RSpec.describe Ci::Build do
   end
 
   describe '#cache' do
-    let(:options) { { cache: { key: "key", paths: ["public"], policy: "pull-push" } } }
+    let(:options) do
+      { cache: [{ key: "key", paths: ["public"], policy: "pull-push" }] }
+    end
+
+    context 'with multiple_cache_per_job FF disabled' do
+      before do
+        stub_feature_flags(multiple_cache_per_job: false)
+      end
+      let(:options) { { cache: { key: "key", paths: ["public"], policy: "pull-push" } } }
+
+      subject { build.cache }
+
+      context 'when build has cache' do
+        before do
+          allow(build).to receive(:options).and_return(options)
+        end
+
+        context 'when project has jobs_cache_index' do
+          before do
+            allow_any_instance_of(Project).to receive(:jobs_cache_index).and_return(1)
+          end
+
+          it { is_expected.to be_an(Array).and all(include(key: "key-1")) }
+        end
+
+        context 'when project does not have jobs_cache_index' do
+          before do
+            allow_any_instance_of(Project).to receive(:jobs_cache_index).and_return(nil)
+          end
+
+          it { is_expected.to eq([options[:cache]]) }
+        end
+      end
+
+      context 'when build does not have cache' do
+        before do
+          allow(build).to receive(:options).and_return({})
+        end
+
+        it { is_expected.to eq([]) }
+      end
+    end
 
     subject { build.cache }
 
@@ -826,6 +867,21 @@ RSpec.describe Ci::Build do
         allow(build).to receive(:options).and_return(options)
       end
 
+      context 'when build has multiple caches' do
+        let(:options) do
+          { cache: [
+            { key: "key", paths: ["public"], policy: "pull-push" },
+            { key: "key2", paths: ["public"], policy: "pull-push" }
+          ] }
+        end
+
+        before do
+          allow_any_instance_of(Project).to receive(:jobs_cache_index).and_return(1)
+        end
+
+        it { is_expected.to match([a_hash_including(key: "key-1"), a_hash_including(key: "key2-1")]) }
+      end
+
       context 'when project has jobs_cache_index' do
         before do
           allow_any_instance_of(Project).to receive(:jobs_cache_index).and_return(1)
@@ -839,7 +895,7 @@ RSpec.describe Ci::Build do
           allow_any_instance_of(Project).to receive(:jobs_cache_index).and_return(nil)
         end
 
-        it { is_expected.to eq([options[:cache]]) }
+        it { is_expected.to eq(options[:cache]) }
       end
     end
 
@@ -848,7 +904,7 @@ RSpec.describe Ci::Build do
         allow(build).to receive(:options).and_return({})
       end
 
-      it { is_expected.to eq([nil]) }
+      it { is_expected.to be_empty }
     end
   end