diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-11 00:09:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-11 00:09:04 +0300 |
| commit | 8cd9a013792172f8d64eba8f327e2dadd71efffb (patch) | |
| tree | c9510d854278cb1846ed1e3b2f4019c4f1a4f3ad /.gitlab | |
| parent | 56b3925584320c4406b7cb961fbe19ff9f9c41d4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/review-apps/main.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/.gitlab/ci/review-apps/main.gitlab-ci.yml b/.gitlab/ci/review-apps/main.gitlab-ci.yml index 39359d7b827..dde08b15bc3 100644 --- a/.gitlab/ci/review-apps/main.gitlab-ci.yml +++ b/.gitlab/ci/review-apps/main.gitlab-ci.yml @@ -77,7 +77,7 @@ review-build-cng: variables: HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}" DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}" - GITLAB_HELM_CHART_REF: "v5.10.0" + GITLAB_HELM_CHART_REF: "41d7632d9eba84f5816d808b98ccf3f5623e9fb5" environment: name: review/${CI_COMMIT_REF_SLUG}${FREQUENCY} url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN} diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 1423cb7383f..ccc33aa1d18 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -76,7 +76,7 @@ .if-merge-request-labels-jh-contribution: &if-merge-request-labels-jh-contribution if: '$CI_MERGE_REQUEST_LABELS =~ /JiHu contribution/' -.if-merge-request-labels-run-search-tests: &if-merge-request-labels-run-search-tests +.if-merge-request-labels-group-global-search: &if-merge-request-labels-group-global-search if: '$CI_MERGE_REQUEST_LABELS =~ /group::global search/' .if-security-merge-request: &if-security-merge-request @@ -263,7 +263,7 @@ - "config.ru" # List explicitly all the app/ dirs that are backend (i.e. all except app/assets). - "{,ee/,jh/}{app/channels,app/controllers,app/finders,app/graphql,app/helpers,app/mailers,app/models,app/policies,app/presenters,app/serializers,app/services,app/uploaders,app/validators,app/views,app/workers}/**/*" - - "{,ee/,jh/}{bin,cable,config,db,generator_templates,lib}/**/*" + - "{,ee/,jh/}{bin,config,db,generator_templates,lib}/**/*" - "{,ee/,jh/}spec/**/*" # CI changes - ".gitlab-ci.yml" @@ -273,6 +273,14 @@ # Mapped patterns (see tests.yml) - "data/whats_new/*.yml" +.search-backend-patterns: &search-backend-patterns + - "{,jh/}Gemfile.lock" + - "GITLAB_ELASTICSEARCH_INDEXER_VERSION" + # List explicitly all the app/ dirs that are backend (i.e. all except app/assets). + - "{,ee/,jh/}{app/channels,app/controllers,app/finders,app/graphql,app/helpers,app/mailers,app/models,app/policies,app/presenters,app/serializers,app/services,app/uploaders,app/validators,app/views,app/workers}/**/*" + - "{,ee/,jh/}{bin,config,db,generator_templates,lib}/**/*" + - "{,ee/,jh/}spec/**/*" + # DB patterns + .ci-patterns .db-patterns: &db-patterns - "{,ee/,jh/}{,spec/}{db,migrations}/**/*" @@ -521,7 +529,8 @@ .rails:rules:run-search-tests: rules: - - <<: *if-merge-request-labels-run-search-tests + - <<: *if-merge-request-labels-group-global-search + changes: *search-backend-patterns .rails:rules:ee-and-foss-default-rules: rules: |