Merge branch 'revert-a496b58e' into 'master'

Revert "Merge branch 'use-ref-instead-of-sha-in-pipeline-config-for-variables' into 'master'"

See merge request gitlab-org/gitlab!67361

lib/gitlab/ci/config.rb

@@ -20,7 +20,7 @@ module Gitlab
       attr_reader :root, :context, :ref, :source
 
       def initialize(config, project: nil, sha: nil, user: nil, parent_pipeline: nil, ref: nil, source: nil)
-        @context = build_context(project: project, sha: sha, user: user, parent_pipeline: parent_pipeline, ref: ref)
+        @context = build_context(project: project, sha: sha, user: user, parent_pipeline: parent_pipeline)
         @context.set_deadline(TIMEOUT_SECONDS)
 
         @ref = ref
@@ -108,13 +108,13 @@ module Gitlab
         end
       end
 
-      def build_context(project:, sha:, user:, parent_pipeline:, ref:)
+      def build_context(project:, sha:, user:, parent_pipeline:)
         Config::External::Context.new(
           project: project,
           sha: sha || find_sha(project),
           user: user,
           parent_pipeline: parent_pipeline,
-          variables: build_variables(project: project, ref: ref))
+          variables: build_variables(project: project, ref: sha))
       end
 
       def build_variables(project:, ref:)

spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb

@@ -107,6 +107,7 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::Populate do
     context 'when ref is protected' do
       before do
         allow(project).to receive(:protected_for?).with('master').and_return(true)
+        allow(project).to receive(:protected_for?).with('b83d6e391c22777fca1ed3012fce84f633d7fed0').and_return(true)
         allow(project).to receive(:protected_for?).with('refs/heads/master').and_return(true)
 
         dependencies.map(&:perform!)

spec/services/ci/create_pipeline_service_spec.rb

@@ -1328,7 +1328,7 @@ RSpec.describe Ci::CreatePipelineService do
             end
 
             context 'when ref is tag' do
-              let(:ref_name) { 'refs/tags/v1.0.0' }
+              let(:ref_name) { 'refs/tags/v1.1.0' }
 
               it 'does not create an extrnal pull request pipeline', :aggregate_failures do
                 expect(response).to be_error
@@ -1516,7 +1516,7 @@ RSpec.describe Ci::CreatePipelineService do
             end
 
             context 'when ref is tag' do
-              let(:ref_name) { 'refs/tags/v1.0.0' }
+              let(:ref_name) { 'refs/tags/v1.1.0' }
 
               it 'does not create a merge request pipeline', :aggregate_failures do
                 expect(response).to be_error