diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-31 18:10:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-31 18:10:00 +0000 |
| commit | 22dde36e800253350e5fa1d902f191a7f64bc6e9 (patch) | |
| tree | 3b53aee41daed5efa0674f9ee2da83e17ef4e676 /.gitlab | |
| parent | 6f18a8d0b00eae84d262dff137fddd9639f3c52a (diff) | |
| download | gitlab-ce-22dde36e800253350e5fa1d902f191a7f64bc6e9.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/database.gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab/ci/rails/shared.gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 10 |
3 files changed, 16 insertions, 5 deletions
diff --git a/.gitlab/ci/database.gitlab-ci.yml b/.gitlab/ci/database.gitlab-ci.yml index b21df6e50c6..32de6c68926 100644 --- a/.gitlab/ci/database.gitlab-ci.yml +++ b/.gitlab/ci/database.gitlab-ci.yml @@ -51,7 +51,7 @@ db:check-migrations-single-db: extends: - db:check-migrations - .single-db - - .rails:rules:single-db + - .rails:rules:db:check-migrations-single-db db:post_deployment_migrations_validator: extends: @@ -66,7 +66,7 @@ db:post_deployment_migrations_validator-single-db: extends: - db:post_deployment_migrations_validator - .single-db - - .rails:rules:single-db + - .rails:rules:db:check-migrations-single-db db:migrate-non-superuser: extends: diff --git a/.gitlab/ci/rails/shared.gitlab-ci.yml b/.gitlab/ci/rails/shared.gitlab-ci.yml index b95a4c45f1e..3f9a43c1ced 100644 --- a/.gitlab/ci/rails/shared.gitlab-ci.yml +++ b/.gitlab/ci/rails/shared.gitlab-ci.yml @@ -107,7 +107,12 @@ include: - .rspec-base - .as-if-foss - .use-pg12 - needs: ["setup-test-env", "retrieve-tests-metadata", "compile-test-assets as-if-foss", "detect-tests"] + needs: + - job: "setup-test-env" + - job: "retrieve-tests-metadata" + - job: "compile-test-assets as-if-foss" + - job: "detect-tests" + optional: true .rspec-base-pg13: extends: diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index d16dd28f597..975554f59e3 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -1205,6 +1205,12 @@ changes: *db-patterns - <<: *if-default-branch-schedule-nightly +.rails:rules:db:check-migrations-single-db: + rules: + - <<: *if-merge-request-labels-run-single-db + - <<: *if-merge-request + changes: *db-patterns + .rails:rules:db-backup: rules: - <<: *if-merge-request-labels-run-all-rspec @@ -2191,7 +2197,7 @@ - <<: *if-not-ee when: never - <<: *if-dot-com-ee-schedule-default-branch-maintenance - - <<: *if-default-refs + - <<: *if-default-branch-refs changes: - ".gitlab/ci/setup.gitlab-ci.yml" - ".gitlab/ci/test-metadata.gitlab-ci.yml" @@ -2213,7 +2219,7 @@ - <<: *if-not-ee when: never - <<: *if-dot-com-ee-schedule-default-branch-maintenance - - <<: *if-default-refs + - <<: *if-default-branch-refs changes: - ".gitlab/ci/test-metadata.gitlab-ci.yml" - "scripts/rspec_helpers.sh" |