Commit a60545aa authored by Dan Davison's avatar Dan Davison

Merge branch 'dj-update-confiner-0.3.0' into 'master'

Update Confiner 0.3.0

See merge request gitlab-org/gitlab!83455
parents 455b7cf2 d84424a5
- name: Quarantine E2E tests that fail consistently - name: Quarantine E2E tests in Master that fail consistently
plugin: plugin:
name: gitlab # https://gitlab.com/gitlab-org/quality/confiner/-/blob/main/doc/plugins/gitlab.md name: gitlab # https://gitlab.com/gitlab-org/quality/confiner/-/blob/main/doc/plugins/gitlab.md
args: args:
...@@ -13,3 +13,22 @@ ...@@ -13,3 +13,22 @@
ref: master ref: master
actions: actions:
- quarantine - quarantine
- name: Dequarantine E2E tests in Master that pass consistently
plugin:
name: gitlab # https://gitlab.com/gitlab-org/quality/confiner/-/blob/main/doc/plugins/gitlab.md
args:
threshold: 10 # at least 10 passes consecutively with no failures to be a candidate for dequarantine
private_token: $QA_GITLAB_CI_TOKEN
# we do not run quarantined jobs automatically on master, but we still commit to master
project_id: gitlab-org/quality/nightly # https://gitlab.com/gitlab-org/quality/nightly/
target_project: gitlab-org/gitlab # https://gitlab.com/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
job_pattern: '.+-quarantine'
actions:
- dequarantine
...@@ -30,7 +30,7 @@ gem 'terminal-table', '~> 3.0.0', require: false ...@@ -30,7 +30,7 @@ gem 'terminal-table', '~> 3.0.0', require: false
gem 'slack-notifier', '~> 2.4', require: false gem 'slack-notifier', '~> 2.4', require: false
gem 'fog-google', '~> 1.17', require: false gem 'fog-google', '~> 1.17', require: false
gem 'confiner', '~> 0.2' gem 'confiner', '~> 0.3'
gem 'chemlab', '~> 0.9' gem 'chemlab', '~> 0.9'
gem 'chemlab-library-www-gitlab-com', '~> 0.1' gem 'chemlab-library-www-gitlab-com', '~> 0.1'
......
...@@ -58,7 +58,7 @@ GEM ...@@ -58,7 +58,7 @@ GEM
adamantium (~> 0.2.0) adamantium (~> 0.2.0)
equalizer (~> 0.0.9) equalizer (~> 0.0.9)
concurrent-ruby (1.1.9) concurrent-ruby (1.1.9)
confiner (0.2.3) confiner (0.3.0)
gitlab (>= 4.17) gitlab (>= 4.17)
zeitwerk (~> 2.5.1) zeitwerk (~> 2.5.1)
declarative (0.0.20) declarative (0.0.20)
...@@ -364,7 +364,7 @@ DEPENDENCIES ...@@ -364,7 +364,7 @@ DEPENDENCIES
capybara-screenshot (~> 1.0.23) capybara-screenshot (~> 1.0.23)
chemlab (~> 0.9) chemlab (~> 0.9)
chemlab-library-www-gitlab-com (~> 0.1) chemlab-library-www-gitlab-com (~> 0.1)
confiner (~> 0.2) confiner (~> 0.3)
deprecation_toolkit (~> 1.5.1) deprecation_toolkit (~> 1.5.1)
faker (~> 2.19, >= 2.19.0) faker (~> 2.19, >= 2.19.0)
fog-google (~> 1.17) fog-google (~> 1.17)
......
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