diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-15 00:13:39 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-15 00:13:39 +0300 |
| commit | 5594a6badf033359b84c2e9822f145c66b0dce8f (patch) | |
| tree | ea1234b49029c95fc85c51d44925ad80e38a3292 /.gitlab | |
| parent | 35f525b5e4c2246f2411f627d4c119c5b2c5ae81 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/package-and-test/main.gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | .gitlab/ci/review-apps/main.gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | .gitlab/ci/static-analysis.gitlab-ci.yml | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/.gitlab/ci/package-and-test/main.gitlab-ci.yml b/.gitlab/ci/package-and-test/main.gitlab-ci.yml index 76b16145129..9fe9a8c307c 100644 --- a/.gitlab/ci/package-and-test/main.gitlab-ci.yml +++ b/.gitlab/ci/package-and-test/main.gitlab-ci.yml @@ -1,5 +1,8 @@ # E2E tests pipeline loaded dynamically by script: scripts/generate-e2e-pipeline +default: + interruptible: true + include: - local: .gitlab/ci/global.gitlab-ci.yml - local: .gitlab/ci/package-and-test/rules.gitlab-ci.yml diff --git a/.gitlab/ci/review-apps/main.gitlab-ci.yml b/.gitlab/ci/review-apps/main.gitlab-ci.yml index fa4839fc094..16bc8d39d15 100644 --- a/.gitlab/ci/review-apps/main.gitlab-ci.yml +++ b/.gitlab/ci/review-apps/main.gitlab-ci.yml @@ -1,3 +1,6 @@ +default: + interruptible: true + stages: - prepare - deploy diff --git a/.gitlab/ci/static-analysis.gitlab-ci.yml b/.gitlab/ci/static-analysis.gitlab-ci.yml index cf25a33ed62..a815ddc95f1 100644 --- a/.gitlab/ci/static-analysis.gitlab-ci.yml +++ b/.gitlab/ci/static-analysis.gitlab-ci.yml @@ -119,7 +119,9 @@ rubocop: - .static-analysis-base - .rubocop-job-cache - .static-analysis:rules:rubocop - needs: ["detect-tests"] + needs: + - job: detect-tests + optional: true script: - | # For non-merge request, or when RUN_ALL_RUBOCOP is 'true', run all RuboCop rules |