1 files changed, 8 insertions, 3 deletions

diff --git a/spec/lib/gitlab/ci/build/image_spec.rb b/spec/lib/gitlab/ci/build/image_spec.rb
index 4895077a731..f8c0d69be2e 100644
--- a/spec/lib/gitlab/ci/build/image_spec.rb
+++ b/spec/lib/gitlab/ci/build/image_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Gitlab::Ci::Build::Image do
 
     context 'when image is defined in job' do
       let(:image_name) { 'image:1.0' }
-      let(:job) { create(:ci_build, options: { image: image_name } ) }
+      let(:job) { create(:ci_build, options: { image: image_name }) }
 
       context 'when image is defined as string' do
         it 'fabricates an object of the proper class' do
@@ -29,12 +29,14 @@ RSpec.describe Gitlab::Ci::Build::Image do
       context 'when image is defined as hash' do
         let(:entrypoint) { '/bin/sh' }
         let(:pull_policy) { %w[always if-not-present] }
+        let(:executor_opts) { { docker: { platform: 'arm64' } } }
 
         let(:job) do
           create(:ci_build, options: { image: { name: image_name,
                                                 entrypoint: entrypoint,
                                                 ports: [80],
-                                                pull_policy: pull_policy } } )
+                                                executor_opts: executor_opts,
+                                                pull_policy: pull_policy } })
         end
 
         it 'fabricates an object of the proper class' do
@@ -44,6 +46,7 @@ RSpec.describe Gitlab::Ci::Build::Image do
         it 'populates fabricated object with the proper attributes' do
           expect(subject.name).to eq(image_name)
           expect(subject.entrypoint).to eq(entrypoint)
+          expect(subject.executor_opts).to eq(executor_opts)
           expect(subject.pull_policy).to eq(pull_policy)
         end
 
@@ -98,11 +101,12 @@ RSpec.describe Gitlab::Ci::Build::Image do
         let(:service_entrypoint) { '/bin/sh' }
         let(:service_alias) { 'db' }
         let(:service_command) { 'sleep 30' }
+        let(:executor_opts) { { docker: { platform: 'amd64' } } }
         let(:pull_policy) { %w[always if-not-present] }
         let(:job) do
           create(:ci_build, options: { services: [{ name: service_image_name, entrypoint: service_entrypoint,
                                                     alias: service_alias, command: service_command, ports: [80],
-                                                    pull_policy: pull_policy }] })
+                                                    executor_opts: executor_opts, pull_policy: pull_policy }] })
         end
 
         it 'fabricates an non-empty array of objects' do
@@ -116,6 +120,7 @@ RSpec.describe Gitlab::Ci::Build::Image do
           expect(subject.first.entrypoint).to eq(service_entrypoint)
           expect(subject.first.alias).to eq(service_alias)
           expect(subject.first.command).to eq(service_command)
+          expect(subject.first.executor_opts).to eq(executor_opts)
           expect(subject.first.pull_policy).to eq(pull_policy)
 
           port = subject.first.ports.first