Commit 8edfaf0b authored by Tiffany Rea's avatar Tiffany Rea

Merge branch 'unquarantine-test-after-fix' into 'master'

Unquarantine test upon feature fixed

See merge request gitlab-org/gitlab!84788
parents 395c6b95 54167f64
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
RSpec.describe 'Verify', :runner, quarantine: { RSpec.describe 'Verify', :runner do
type: :flaky,
issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/351994'
} do
describe 'Run pipeline with manual jobs' do describe 'Run pipeline with manual jobs' do
let(:executor) { "qa-runner-#{SecureRandom.hex(4)}" }
let(:project) do let(:project) do
Resource::Project.fabricate_via_api! do |project| Resource::Project.fabricate_via_api! do |project|
project.name = 'pipeline-with-manual-job' project.name = 'pipeline-with-manual-job'
...@@ -16,7 +15,8 @@ module QA ...@@ -16,7 +15,8 @@ module QA
let!(:runner) do let!(:runner) do
Resource::Runner.fabricate! do |runner| Resource::Runner.fabricate! do |runner|
runner.project = project runner.project = project
runner.name = "qa-runner-#{SecureRandom.hex(3)}" runner.name = executor
runner.tags = [executor]
end end
end end
...@@ -36,22 +36,26 @@ module QA ...@@ -36,22 +36,26 @@ module QA
Prep: Prep:
stage: Stage1 stage: Stage1
tags: ["#{executor}"]
script: exit 0 script: exit 0
when: manual when: manual
Build: Build:
stage: Stage2 stage: Stage2
tags: ["#{executor}"]
needs: ['Prep'] needs: ['Prep']
script: exit 0 script: exit 0
parallel: 6 parallel: 6
Test: Test:
stage: Stage3 stage: Stage3
tags: ["#{executor}"]
needs: ['Build'] needs: ['Build']
script: exit 0 script: exit 0
Deploy: Deploy:
stage: Stage3 stage: Stage3
tags: ["#{executor}"]
needs: ['Test'] needs: ['Test']
script: exit 0 script: exit 0
parallel: 6 parallel: 6
...@@ -70,10 +74,12 @@ module QA ...@@ -70,10 +74,12 @@ module QA
after do after do
runner&.remove_via_api! runner&.remove_via_api!
project&.remove_via_api!
end end
it 'does not leave any job in skipped state', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/349158' do it(
'does not leave any job in skipped state',
testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/349158'
) do
Page::Project::Pipeline::Show.perform do |show| Page::Project::Pipeline::Show.perform do |show|
show.click_job_action('Prep') # Trigger pipeline manually show.click_job_action('Prep') # Trigger pipeline manually
......
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