diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index cbb68985bb47f19e27593ac649ec97c812fba0de..d26df15412f17fc0b8962896efc68ab2805917ad 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -53,15 +53,6 @@ qa:internal-as-if-foss: - .qa:rules:internal-as-if-foss - .as-if-foss -qa:master-auto-quarantine-dequarantine: - extends: - - .qa-job-base - rules: - - if: '$QA_TRIGGER_AUTO_QUARANTINE =~ /true|yes|1/i' - script: - - bundle exec confiner -r .confiner/master.yml - allow_failure: true - cache-qa-gems: extends: - .qa-job-base diff --git a/qa/.confiner/master.yml b/qa/.confiner/master.yml deleted file mode 100644 index f58ea5de0172b23e8ebb19bf0c44c402ea8f1d00..0000000000000000000000000000000000000000 --- a/qa/.confiner/master.yml +++ /dev/null @@ -1,15 +0,0 @@ -- name: Quarantine E2E tests in Master that fail consistently - plugin: - name: gitlab # https://gitlab.com/gitlab-org/quality/confiner/-/blob/main/doc/plugins/gitlab.md - args: - threshold: 3 # 3 failures - private_token: $QA_GITLAB_CI_TOKEN - project_id: gitlab-org/gitlab - target_project: gitlab-org/gitlab - failure_issue_labels: QA,Quality - failure_issue_prefix: "Failure in " - pwd: qa # E2E specs reside in the qa subdirectory - timeout: 30 - ref: master - actions: - - quarantine diff --git a/qa/Gemfile b/qa/Gemfile index 5c44fa5068aececc1b6b0a8a8e1be0008bdcbc62..19800677673780ab5485ca878f45046e585be51e 100644 --- a/qa/Gemfile +++ b/qa/Gemfile @@ -33,8 +33,6 @@ gem 'fog-google', '~> 1.19', require: false gem 'fog-core', '2.1.0', require: false # fog-google generates a ton of warnings with latest core gem "warning", "~> 1.3" -gem 'confiner', '~> 0.4' - gem 'chemlab', '~> 0.11', '>= 0.11.1' gem 'chemlab-library-www-gitlab-com', '~> 0.1', '>= 0.1.1' diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock index c222de2e013652aea5f445b3c35c4301d442472a..d8d1fb4066a0097e172fc6ce9478690eeb9fe754 100644 --- a/qa/Gemfile.lock +++ b/qa/Gemfile.lock @@ -69,9 +69,6 @@ GEM coderay (1.1.2) colorize (0.8.1) concurrent-ruby (1.2.2) - confiner (0.4.0) - gitlab (>= 4.17) - zeitwerk (>= 2.5, < 3) crass (1.0.6) debug_inspector (1.1.0) declarative (0.0.20) @@ -356,7 +353,6 @@ DEPENDENCIES capybara-screenshot (~> 1.0.26) chemlab (~> 0.11, >= 0.11.1) chemlab-library-www-gitlab-com (~> 0.1, >= 0.1.1) - confiner (~> 0.4) deprecation_toolkit (~> 2.0.4) factory_bot (~> 6.3.0) faker (~> 3.2, >= 3.2.2)