diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-13 18:08:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-13 18:08:31 +0300 |
| commit | 57ed4c594d37326f1d27752df575b581c522ab05 (patch) | |
| tree | 455227f40aaf31c6977fb51839770753df824e72 /.gitlab | |
| parent | 8ebd99a81f8fe458153de9815f73f9067d010293 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 937bfc7e93d..c9d85d2a3f8 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -305,7 +305,7 @@ rspec-ee unit clickhouse: - .rspec-base-pg14-clickhouse23 - .rails:rules:clickhouse-changes -gitlab:clickhouse:rollback: +gitlab:clickhouse:rollback:main: extends: - .rspec-base - .production # Disable webmock from test environment @@ -317,7 +317,7 @@ gitlab:clickhouse:rollback: - 'sed -i "s|test:$|production:|g" config/click_house.yml' - !reference [.base-script, script] - bundle exec rake gitlab:clickhouse:migrate && - bundle exec rake gitlab:clickhouse:rollback VERSION=0 + bundle exec rake gitlab:clickhouse:rollback:main VERSION=0 gitlab:setup: extends: .db-job-base |