diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-09 18:11:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-09 18:11:25 +0300 |
| commit | 1f753bca2624be1e507424127fe0d48b9765da70 (patch) | |
| tree | 44a27f2d69aaeede9397e5037271dddcc8e3e9a3 /.gitlab | |
| parent | 3e4f0c1745324d6fc7cc4acc38f2438ff79c8a0b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | .gitlab/ci/test-metadata.gitlab-ci.yml | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 784e0c20874..5a2daa3f134 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -295,12 +295,12 @@ rspec fast_spec_helper: # Load fast_spec_helper as well just in case there are no specs available. - bin/rspec --dry-run spec/fast_spec_helper.rb $fast_spec_helper_specs -rspec clickhouse: +rspec unit clickhouse: extends: - .rspec-base-pg14-clickhouse23 - .rails:rules:clickhouse-changes -rspec-ee clickhouse: +rspec-ee unit clickhouse: extends: - .rspec-base-pg14-clickhouse23 - .rails:rules:ee-only-clickhouse-changes @@ -355,7 +355,7 @@ rspec:artifact-collector unit: - .rails:rules:ee-and-foss-unit needs: - rspec unit pg14 # 32 jobs - - job: rspec clickhouse # 1 job + - job: rspec unit clickhouse # 1 job optional: true rspec:artifact-collector system: @@ -459,7 +459,7 @@ rspec:artifact-collector ee remainder: optional: true - job: rspec-ee background_migration pg14 # 2 jobs optional: true - - job: rspec-ee clickhouse # 1 job + - job: rspec-ee unit clickhouse # 1 job optional: true - job: rspec-ee integration pg14 # 7 jobs optional: true diff --git a/.gitlab/ci/test-metadata.gitlab-ci.yml b/.gitlab/ci/test-metadata.gitlab-ci.yml index 7791a046776..5ecacce339c 100644 --- a/.gitlab/ci/test-metadata.gitlab-ci.yml +++ b/.gitlab/ci/test-metadata.gitlab-ci.yml @@ -36,13 +36,13 @@ update-tests-metadata: - rspec migration pg14 - rspec-all frontend_fixture - rspec unit pg14 - - rspec clickhouse + - rspec unit clickhouse - rspec integration pg14 - rspec system pg14 - rspec background_migration pg14 - rspec-ee migration pg14 - rspec-ee unit pg14 - - rspec-ee clickhouse + - rspec-ee unit clickhouse - rspec-ee integration pg14 - rspec-ee system pg14 - rspec-ee background_migration pg14 |