diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-09 11:01:29 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-09 11:01:29 +0000 |
| commit | 1c0407e84cc2ccdafd141ed1ad9a853db07d17b3 (patch) | |
| tree | 722dde982de9100f84c1a2d3d2cb8a417bfb5eb5 /.gitlab-ci.yml | |
| parent | 9f55733d734a023732d5551cf38c70c0e26eede9 (diff) | |
| parent | ed7213e0ec718bd8fde211a098dc4d1b75e7c799 (diff) | |
| download | gitlab-ce-1c0407e84cc2ccdafd141ed1ad9a853db07d17b3.tar.gz | |
Merge branch 'rc/do-not-retry-ee_compat_check' into 'master'
Do not retry jobs that are allowed to fail
See merge request gitlab-org/gitlab-ce!14757
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb170515c1d..7eb9e5ab6de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -270,6 +270,7 @@ flaky-examples-check: NEW_FLAKY_SPECS_REPORT: rspec_flaky/report-new.json stage: post-test allow_failure: yes + retry: 0 only: - branches except: @@ -429,6 +430,7 @@ ee_compat_check: - branches@gitlab-org/gitlab-ee - branches@gitlab/gitlab-ee allow_failure: yes + retry: 0 cache: key: "ee_compat_check_repo" paths: |