Commit a0b16517 authored by Dan Davison's avatar Dan Davison

Merge branch '249600-qa-remove-the-docker-tag-from-the-end-to-end-specs' into 'master'

Resolve "[QA] Remove the :docker tag from the end-to-end specs"

Closes #249600

See merge request gitlab-org/gitlab!42387
parents d67081e3 13652ac2
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
RSpec.describe 'Verify', :docker, :runner do RSpec.describe 'Verify', :runner do
describe 'Pipeline creation and processing' do describe 'Pipeline creation and processing' do
let(:executor) { "qa-runner-#{Time.now.to_i}" } let(:executor) { "qa-runner-#{Time.now.to_i}" }
let(:max_wait) { 30 } let(:max_wait) { 30 }
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
RSpec.describe 'Verify', :docker, :runner do RSpec.describe 'Verify', :runner do
describe 'Runner registration' do describe 'Runner registration' do
let(:executor) { "qa-runner-#{Time.now.to_i}" } let(:executor) { "qa-runner-#{Time.now.to_i}" }
let!(:runner) do let!(:runner) do
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
RSpec.describe 'Verify', :docker, :runner do RSpec.describe 'Verify', :runner do
describe 'Code coverage statistics' do describe 'Code coverage statistics' do
let(:simplecov) { '\(\d+.\d+\%\) covered' } let(:simplecov) { '\(\d+.\d+\%\) covered' }
let(:executor) { "qa-runner-#{Time.now.to_i}" } let(:executor) { "qa-runner-#{Time.now.to_i}" }
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
RSpec.describe 'Package', :docker, :orchestrated, :packages do RSpec.describe 'Package', :orchestrated, :packages do
describe 'Maven Repository' do describe 'Maven Repository' do
include Runtime::Fixtures include Runtime::Fixtures
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
RSpec.describe 'Package', :docker, :orchestrated, :packages do RSpec.describe 'Package', :orchestrated, :packages do
describe 'NPM registry' do describe 'NPM registry' do
include Runtime::Fixtures include Runtime::Fixtures
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
require 'digest/sha1' require 'digest/sha1'
module QA module QA
RSpec.describe 'Release', :docker, :runner do RSpec.describe 'Release', :runner do
describe 'Git clone using a deploy key' do describe 'Git clone using a deploy key' do
before do before do
Flow::Login.sign_in Flow::Login.sign_in
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
RSpec.describe 'Release', :docker, :runner, :reliable do RSpec.describe 'Release', :runner, :reliable do
describe 'Parent-child pipelines dependent relationship' do describe 'Parent-child pipelines dependent relationship' do
let!(:project) do let!(:project) do
Resource::Project.fabricate_via_api! do |project| Resource::Project.fabricate_via_api! do |project|
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
RSpec.describe 'Release', :docker, :runner, :reliable do RSpec.describe 'Release', :runner, :reliable do
describe 'Parent-child pipelines independent relationship' do describe 'Parent-child pipelines independent relationship' do
let!(:project) do let!(:project) do
Resource::Project.fabricate_via_api! do |project| Resource::Project.fabricate_via_api! do |project|
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
require 'securerandom' require 'securerandom'
module QA module QA
context 'Create', :docker, :requires_admin, :skip_live_env, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/195179', type: :flaky } do context 'Create', :requires_admin, :skip_live_env, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/195179', type: :flaky } do
describe 'Jenkins integration' do describe 'Jenkins integration' do
let(:project_name) { "project_with_jenkins_#{SecureRandom.hex(4)}" } let(:project_name) { "project_with_jenkins_#{SecureRandom.hex(4)}" }
......
...@@ -4,7 +4,7 @@ module QA ...@@ -4,7 +4,7 @@ module QA
# This test was quarantined because relative URL isn't supported # This test was quarantined because relative URL isn't supported
# See https://gitlab.com/gitlab-org/gitlab/issues/13833 # See https://gitlab.com/gitlab-org/gitlab/issues/13833
context 'Create', :runner, :quarantine do context 'Create', :runner, :quarantine do
describe 'Web IDE web terminal', :docker do describe 'Web IDE web terminal' do
before do before do
project = Resource::Project.fabricate_via_api! do |project| project = Resource::Project.fabricate_via_api! do |project|
project.name = 'web-terminal-project' project.name = 'web-terminal-project'
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
RSpec.describe 'Verify', :docker, :runner, :requires_admin do RSpec.describe 'Verify', :runner, :requires_admin do
describe 'Artifacts' do describe 'Artifacts' do
context 'when locked' do context 'when locked' do
let(:file_name) { 'artifact.txt' } let(:file_name) { 'artifact.txt' }
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
RSpec.describe 'Verify', :docker do RSpec.describe 'Verify' do
describe 'Operations Dashboard' do describe 'Operations Dashboard' do
let(:group) { Resource::Group.fabricate_via_api! } let(:group) { Resource::Group.fabricate_via_api! }
let!(:runner) do let!(:runner) do
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
require 'securerandom' require 'securerandom'
module QA module QA
RSpec.describe 'Release', :docker do RSpec.describe 'Release' do
describe 'Multi-project pipelines' do describe 'Multi-project pipelines' do
let(:upstream_project_name) { "upstream-project-#{SecureRandom.hex(8)}" } let(:upstream_project_name) { "upstream-project-#{SecureRandom.hex(8)}" }
let(:downstream_project_name) { "downstream-project-#{SecureRandom.hex(8)}" } let(:downstream_project_name) { "downstream-project-#{SecureRandom.hex(8)}" }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
require 'securerandom' require 'securerandom'
module QA module QA
RSpec.describe 'Release', :docker, :runner do RSpec.describe 'Release', :runner do
describe 'Pipelines for merged results and merge trains' do describe 'Pipelines for merged results and merge trains' do
let(:group) { Resource::Group.fabricate_via_api! } let(:group) { Resource::Group.fabricate_via_api! }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
require 'pathname' require 'pathname'
module QA module QA
RSpec.describe 'Secure', :docker, :runner do RSpec.describe 'Secure', :runner do
describe 'Security Reports in a Merge Request' do describe 'Security Reports in a Merge Request' do
let(:sast_vuln_count) { 5 } let(:sast_vuln_count) { 5 }
let(:dependency_scan_vuln_count) { 4 } let(:dependency_scan_vuln_count) { 4 }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
require 'pathname' require 'pathname'
module QA module QA
RSpec.describe 'Secure', :docker, :runner do RSpec.describe 'Secure', :runner do
let(:approved_license_name) { "MIT License" } let(:approved_license_name) { "MIT License" }
let(:denied_license_name) { "WTFPL" } let(:denied_license_name) { "WTFPL" }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
require 'pathname' require 'pathname'
module QA module QA
RSpec.describe 'Secure', :docker, :runner do RSpec.describe 'Secure', :runner do
describe 'License merge request widget' do describe 'License merge request widget' do
let(:approved_license_name) { "MIT" } let(:approved_license_name) { "MIT" }
let(:denied_license_name) { "Zlib" } let(:denied_license_name) { "Zlib" }
......
# frozen_string_literal: true # frozen_string_literal: true
module QA module QA
RSpec.describe 'Secure', :docker, :runner do RSpec.describe 'Secure', :runner do
describe 'Security Dashboard in a Project' do describe 'Security Dashboard in a Project' do
let(:vulnerability_name) { "CVE-2017-18269 in glibc" } let(:vulnerability_name) { "CVE-2017-18269 in glibc" }
let(:vulnerability_description) { "Short description to match in specs" } let(:vulnerability_description) { "Short description to match in specs" }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
require 'pathname' require 'pathname'
module QA module QA
RSpec.describe 'Secure', :docker, :runner do RSpec.describe 'Secure', :runner do
let(:number_of_dependencies_in_fixture) { 9 } let(:number_of_dependencies_in_fixture) { 9 }
let(:dependency_scan_example_vuln) { 'Prototype pollution attack in mixin-deep' } let(:dependency_scan_example_vuln) { 'Prototype pollution attack in mixin-deep' }
let(:container_scan_example_vuln) { 'CVE-2017-18269 in glibc' } let(:container_scan_example_vuln) { 'CVE-2017-18269 in glibc' }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
require 'pathname' require 'pathname'
module QA module QA
RSpec.describe 'Secure', :docker, :runner do RSpec.describe 'Secure', :runner do
describe 'Security Reports in a Merge Request' do describe 'Security Reports in a Merge Request' do
let(:sast_vuln_count) { 5 } let(:sast_vuln_count) { 5 }
let(:dependency_scan_vuln_count) { 4 } let(:dependency_scan_vuln_count) { 4 }
......
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