Commit 7f936a16 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch 'qa-shl-fix-multiple-after-blocks' into 'master'

Fix `RSpec/ScatteredSetup` rubocop failure

See merge request gitlab-org/gitlab!19207
parents b021f889 c209bf1b
...@@ -5,10 +5,6 @@ require 'digest/sha1' ...@@ -5,10 +5,6 @@ require 'digest/sha1'
module QA module QA
context 'Release', :docker do context 'Release', :docker do
describe 'Git clone using a deploy key' do describe 'Git clone using a deploy key' do
after do
Runtime::Feature.enable('job_log_json') if @job_log_json_flag_enabled
end
before do before do
# Handle WIP Job Logs flag - https://gitlab.com/gitlab-org/gitlab/issues/31162 # Handle WIP Job Logs flag - https://gitlab.com/gitlab-org/gitlab/issues/31162
@job_log_json_flag_enabled = Runtime::Feature.enabled?('job_log_json') @job_log_json_flag_enabled = Runtime::Feature.enabled?('job_log_json')
...@@ -34,6 +30,7 @@ module QA ...@@ -34,6 +30,7 @@ module QA
end end
after do after do
Runtime::Feature.enable('job_log_json') if @job_log_json_flag_enabled
Service::DockerRun::GitlabRunner.new(@runner_name).remove! Service::DockerRun::GitlabRunner.new(@runner_name).remove!
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment