diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-15 15:10:16 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-15 15:10:16 +0300 |
commit | c70fec25f88e1f1866c6b3d91de8587bdad59391 (patch) | |
tree | 0e869771cd4702cfe9711fca921e7b3a124c91dc /.gitlab-ci.yml | |
parent | 340f85512a4b4fa1ffd558ecaf64fef2eec8cc87 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cd1a331b63f..c0aec99263f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,6 +37,9 @@ default: CREATE_RAILS_TEST_FAILURE_ISSUES: "true" CREATE_RAILS_SLOW_TEST_ISSUES: "true" +.default-merge-request-slow-tests-variables: &default-merge-request-slow-tests-variables + ADD_SLOW_TEST_NOTE_TO_MERGE_REQUEST: "true" + .if-merge-request-security-canonical-sync: &if-merge-request-security-canonical-sync if: '$CI_MERGE_REQUEST_SOURCE_PROJECT_PATH == "gitlab-org/security/gitlab" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_DEFAULT_BRANCH && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH' @@ -81,6 +84,7 @@ workflow: - if: '$CI_MERGE_REQUEST_IID' variables: <<: *default-ruby-variables + <<: *default-merge-request-slow-tests-variables PIPELINE_NAME: 'Ruby $RUBY_VERSION $CI_MERGE_REQUEST_EVENT_TYPE MR pipeline' NO_SOURCEMAPS: 'true' # For the scheduled pipelines, we set specific variables. |