diff options
Diffstat (limited to '.gitlab/ci/rails.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 179c00b479c..f4b001ed1ba 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -29,7 +29,6 @@ variables: RUBY_GC_MALLOC_LIMIT: 67108864 RUBY_GC_MALLOC_LIMIT_MAX: 134217728 - CRYSTALBALL: "true" RECORD_DEPRECATIONS: "true" needs: ["setup-test-env", "retrieve-tests-metadata", "compile-test-assets", "detect-tests"] script: @@ -394,8 +393,7 @@ db:migrate-from-previous-major-version: - sed -i -e "s/gem 'google-protobuf', '~> 3.8.0'/gem 'google-protobuf', '~> 3.12'/" Gemfile - sed -i -e "s/gem 'nokogiri', '~> 1.10.5'/gem 'nokogiri', '~> 1.11.0'/" Gemfile - sed -i -e "s/gem 'mimemagic', '~> 0.3.2'/gem 'ruby-magic', '~> 0.4.0'/" Gemfile - - run_timed_command "gem install bundler:1.17.3" - - run_timed_command "bundle update google-protobuf nokogiri grpc mimemagic bootsnap" + - run_timed_command "bundle update --bundler google-protobuf nokogiri grpc mimemagic bootsnap" - SETUP_DB=false USE_BUNDLE_INSTALL=true bash scripts/prepare_build.sh - run_timed_command "bundle exec rake db:drop db:create db:structure:load db:migrate db:seed_fu" - git checkout -f $CI_COMMIT_SHA @@ -449,7 +447,9 @@ db:backup_and_restore: - date - bundle exec rake gitlab:backup:restore rules: - - changes: ["lib/backup/**/*"] + - changes: + - "lib/backup/**/*" + - "lib/tasks/gitlab/backup.rake" rspec:deprecations: extends: @@ -645,36 +645,33 @@ rspec-ee unit pg12 geo: - .rails:rules:ee-only-unit - .rspec-ee-unit-geo-parallel -# FIXME: Temporarily disable geo minimal rspec jobs https://gitlab.com/gitlab-org/gitlab/-/issues/294212 -#rspec-ee unit pg12 geo minimal: -# extends: -# - rspec-ee unit pg12 geo -# - .minimal-rspec-tests -# - .rails:rules:ee-only-unit:minimal +rspec-ee unit pg12 geo minimal: + extends: + - rspec-ee unit pg12 geo + - .minimal-rspec-tests + - .rails:rules:ee-only-unit:minimal rspec-ee integration pg12 geo: extends: - .rspec-ee-base-geo-pg12 - .rails:rules:ee-only-integration -# FIXME: Temporarily disable geo minimal rspec jobs https://gitlab.com/gitlab-org/gitlab/-/issues/294212 -#rspec-ee integration pg12 geo minimal: -# extends: -# - rspec-ee integration pg12 geo -# - .minimal-rspec-tests -# - .rails:rules:ee-only-integration:minimal +rspec-ee integration pg12 geo minimal: + extends: + - rspec-ee integration pg12 geo + - .minimal-rspec-tests + - .rails:rules:ee-only-integration:minimal rspec-ee system pg12 geo: extends: - .rspec-ee-base-geo-pg12 - .rails:rules:ee-only-system -# FIXME: Temporarily disable geo minimal rspec jobs https://gitlab.com/gitlab-org/gitlab/-/issues/294212 -#rspec-ee system pg12 geo minimal: -# extends: -# - rspec-ee system pg12 geo -# - .minimal-rspec-tests -# - .rails:rules:ee-only-system:minimal +rspec-ee system pg12 geo minimal: + extends: + - rspec-ee system pg12 geo + - .minimal-rspec-tests + - .rails:rules:ee-only-system:minimal db:rollback geo: extends: |