Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

1 files changed, 0 insertions, 15 deletions

diff --git a/spec/lib/gitlab/ci/config/entry/job_spec.rb b/spec/lib/gitlab/ci/config/entry/job_spec.rb
index 1d23ab0c2c7..5b47d3a3922 100644
--- a/spec/lib/gitlab/ci/config/entry/job_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/job_spec.rb
@@ -434,20 +434,6 @@ RSpec.describe Gitlab::Ci::Config::Entry::Job do
             expect(entry.errors).to include 'job dependencies the another-job should be part of needs'
           end
         end
-
-        context 'when stage: is missing' do
-          let(:config) do
-            {
-              script: 'echo',
-              needs: ['build-job']
-            }
-          end
-
-          it 'returns error about invalid data' do
-            expect(entry).not_to be_valid
-            expect(entry.errors).to include 'job config missing required keys: stage'
-          end
-        end
       end
 
       context 'when timeout value is not correct' do
@@ -626,7 +612,6 @@ RSpec.describe Gitlab::Ci::Config::Entry::Job do
                    ignore: false,
                    after_script: %w[cleanup],
                    only: { refs: %w[branches tags] },
-                   variables: {},
                    job_variables: {},
                    root_variables_inheritance: true,
                    scheduling_type: :stage)