diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-29 12:10:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-29 12:10:35 +0300 |
| commit | 55dea17c8d10d1b25cd25f1cdaeaed64332995a7 (patch) | |
| tree | d8deec499e9aacae38b95cb509f9dc7873b0652a /.gitlab | |
| parent | f0224e32ca39fe7b261a8d6bcec64bb449c65856 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | .gitlab/ci/setup.gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | .gitlab/ci/vendored-gems.gitlab-ci.yml | 8 |
3 files changed, 15 insertions, 0 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 6eab6472ed1..cdb455c8c31 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -1964,6 +1964,12 @@ changes: ["vendor/gems/cloud_profiler_agent/**/*"] - <<: *if-merge-request-labels-run-all-rspec +.vendor:rules:sidekiq-reliable-fetch: + rules: + - <<: *if-merge-request + changes: ["vendor/gems/sidekiq-reliable-fetch/**/*"] + - <<: *if-merge-request-labels-run-all-rspec + ################## # Releases rules # ################## diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml index 3ebbe1e0fed..6e24bf946bd 100644 --- a/.gitlab/ci/setup.gitlab-ci.yml +++ b/.gitlab/ci/setup.gitlab-ci.yml @@ -124,6 +124,7 @@ detect-tests: tooling/bin/find_tests ${RSPEC_VIEWS_INCLUDING_PARTIALS_PATH} ${RSPEC_MATCHING_TESTS_PATH}; tooling/bin/js_to_system_specs_mappings ${RSPEC_CHANGED_FILES_PATH} ${RSPEC_MATCHING_TESTS_PATH}; tooling/bin/graphql_base_type_mappings ${RSPEC_CHANGED_FILES_PATH} ${RSPEC_MATCHING_TESTS_PATH}; + tooling/bin/view_to_system_specs_mappings ${RSPEC_CHANGED_FILES_PATH} ${RSPEC_MATCHING_TESTS_PATH}; tooling/bin/find_changes ${RSPEC_CHANGED_FILES_PATH} ${RSPEC_MATCHING_TESTS_PATH} ${FRONTEND_FIXTURES_MAPPING_PATH}; filter_rspec_matched_foss_tests ${RSPEC_MATCHING_TESTS_PATH} ${RSPEC_MATCHING_TESTS_FOSS_PATH}; filter_rspec_matched_ee_tests ${RSPEC_MATCHING_TESTS_PATH} ${RSPEC_MATCHING_TESTS_EE_PATH}; diff --git a/.gitlab/ci/vendored-gems.gitlab-ci.yml b/.gitlab/ci/vendored-gems.gitlab-ci.yml index e1b4960b262..a2af802c659 100644 --- a/.gitlab/ci/vendored-gems.gitlab-ci.yml +++ b/.gitlab/ci/vendored-gems.gitlab-ci.yml @@ -101,3 +101,11 @@ vendor cloud_profiler_agent: trigger: include: vendor/gems/cloud_profiler_agent/.gitlab-ci.yml strategy: depend + +vendor sidekiq-reliable-fetch: + extends: + - .vendor:rules:sidekiq-reliable-fetch + needs: [] + trigger: + include: vendor/gems/sidekiq-reliable-fetch/.gitlab-ci.yml + strategy: depend |