Skip to content
代码片段 群组 项目
提交 700acda3 编辑于 作者: Leonardo da Rosa's avatar Leonardo da Rosa 提交者: David Dieulivol
浏览文件

Swap PG 14 to be default, and 13 to be nightly

Since we're going to postgres 14 on gitlab.com, we should make that
the primary version we test against, and we should add nightly tests
for postgres 15

Changelog: changed
上级 b8361efa
No related branches found
No related tags found
无相关合并请求
显示
433 个添加236 个删除
...@@ -121,7 +121,7 @@ workflow: ...@@ -121,7 +121,7 @@ workflow:
PIPELINE_NAME: 'Ruby $RUBY_VERSION $CI_COMMIT_BRANCH branch pipeline' PIPELINE_NAME: 'Ruby $RUBY_VERSION $CI_COMMIT_BRANCH branch pipeline'
variables: variables:
PG_VERSION: "13" PG_VERSION: "14"
DEFAULT_CI_IMAGE: "${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}.patched-golang-${GO_VERSION}-rust-${RUST_VERSION}-node-18.16-postgresql-${PG_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-2.36-lfs-2.9-chrome-${CHROME_VERSION}-yarn-1.22-graphicsmagick-1.3.36" DEFAULT_CI_IMAGE: "${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}.patched-golang-${GO_VERSION}-rust-${RUST_VERSION}-node-18.16-postgresql-${PG_VERSION}:rubygems-${RUBYGEMS_VERSION}-git-2.36-lfs-2.9-chrome-${CHROME_VERSION}-yarn-1.22-graphicsmagick-1.3.36"
# We set $GITLAB_DEPENDENCY_PROXY to another variable (since it's set at the group level and has higher precedence than .gitlab-ci.yml) # We set $GITLAB_DEPENDENCY_PROXY to another variable (since it's set at the group level and has higher precedence than .gitlab-ci.yml)
# so that we can override $GITLAB_DEPENDENCY_PROXY_ADDRESS in workflow rules. # so that we can override $GITLAB_DEPENDENCY_PROXY_ADDRESS in workflow rules.
......
...@@ -4,7 +4,7 @@ templates-shellcheck: ...@@ -4,7 +4,7 @@ templates-shellcheck:
- .default-before_script - .default-before_script
- .default-retry - .default-retry
- .ruby-cache - .ruby-cache
- .use-pg14 - .use-pg15
stage: test stage: test
needs: needs:
- setup-test-env - setup-test-env
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
- .default-retry - .default-retry
- .ruby-cache - .ruby-cache
- .default-before_script - .default-before_script
- .use-pg13 - .use-pg14
stage: test stage: test
needs: ["setup-test-env"] needs: ["setup-test-env"]
variables: variables:
...@@ -29,7 +29,7 @@ run-dev-fixtures-ee: ...@@ -29,7 +29,7 @@ run-dev-fixtures-ee:
extends: extends:
- .run-dev-fixtures - .run-dev-fixtures
- .dev-fixtures:rules:ee-only - .dev-fixtures:rules:ee-only
- .use-pg13-es7-ee - .use-pg14-es7-ee
script: script:
- cp ee/db/fixtures/development/* $FIXTURE_PATH - cp ee/db/fixtures/development/* $FIXTURE_PATH
- *run-dev-fixtures-script - *run-dev-fixtures-script
...@@ -129,7 +129,7 @@ retrieve-frontend-fixtures: ...@@ -129,7 +129,7 @@ retrieve-frontend-fixtures:
- .default-retry - .default-retry
- .default-before_script - .default-before_script
- .ruby-cache - .ruby-cache
- .use-pg13 - .use-pg14
stage: fixtures stage: fixtures
needs: ["setup-test-env", "retrieve-tests-metadata", "retrieve-frontend-fixtures"] needs: ["setup-test-env", "retrieve-tests-metadata", "retrieve-frontend-fixtures"]
variables: variables:
......
...@@ -2,7 +2,7 @@ glfm-verify: ...@@ -2,7 +2,7 @@ glfm-verify:
extends: extends:
- .rails-job-base - .rails-job-base
- .glfm:rules:glfm-verify - .glfm:rules:glfm-verify
- .use-pg13 - .use-pg14
stage: test stage: test
needs: ["setup-test-env"] needs: ["setup-test-env"]
script: script:
......
...@@ -249,6 +249,18 @@ ...@@ -249,6 +249,18 @@
POSTGRES_HOST_AUTH_METHOD: trust POSTGRES_HOST_AUTH_METHOD: trust
PG_VERSION: "14" PG_VERSION: "14"
.use-pg15:
services:
- name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-15-pgvector-0.4.1
command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
alias: postgres
- name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
alias: rediscluster # configure connections in config/redis.yml
- name: redis:6.2-alpine
variables:
POSTGRES_HOST_AUTH_METHOD: trust
PG_VERSION: "15"
.use-pg12-es7-ee: .use-pg12-es7-ee:
services: services:
- name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-12-pgvector-0.4.1 - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-12-pgvector-0.4.1
...@@ -303,6 +315,24 @@ ...@@ -303,6 +315,24 @@
ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060 ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070 ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
.use-pg15-es7-ee:
services:
- name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-15-pgvector-0.4.1
command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
alias: postgres
- name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
alias: rediscluster # configure connections in config/redis.yml
- name: redis:6.2-alpine
- name: elasticsearch:7.17.6
command: ["elasticsearch", "-E", "discovery.type=single-node", "-E", "xpack.security.enabled=false"]
- name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:zoekt-ci-image-1.0
alias: zoekt-ci-image
variables:
POSTGRES_HOST_AUTH_METHOD: trust
PG_VERSION: "15"
ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
.use-pg13-es8-ee: .use-pg13-es8-ee:
services: services:
- name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-13-pgvector-0.4.1 - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-13-pgvector-0.4.1
...@@ -341,6 +371,25 @@ ...@@ -341,6 +371,25 @@
ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060 ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070 ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
.use-pg15-es8-ee:
services:
- name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-15-pgvector-0.4.1
command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
alias: postgres
- name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
alias: rediscluster # configure connections in config/redis.yml
- name: redis:6.0-alpine
- name: elasticsearch:8.6.2
- name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:zoekt-ci-image-1.0
alias: zoekt-ci-image
variables:
POSTGRES_HOST_AUTH_METHOD: trust
PG_VERSION: "15"
ES_SETTING_DISCOVERY_TYPE: "single-node"
ES_SETTING_XPACK_SECURITY_ENABLED: "false"
ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
.use-pg13-opensearch1-ee: .use-pg13-opensearch1-ee:
services: services:
- name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-13-pgvector-0.4.1 - name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-13-pgvector-0.4.1
...@@ -417,6 +466,44 @@ ...@@ -417,6 +466,44 @@
ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060 ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070 ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
.use-pg15-opensearch1-ee:
services:
- name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-15-pgvector-0.4.1
command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
alias: postgres
- name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
alias: rediscluster # configure connections in config/redis.yml
- name: redis:6.0-alpine
- name: opensearchproject/opensearch:1.3.5
alias: elasticsearch
command: ["bin/opensearch", "-E", "discovery.type=single-node", "-E", "plugins.security.disabled=true"]
- name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:zoekt-ci-image-1.0
alias: zoekt-ci-image
variables:
POSTGRES_HOST_AUTH_METHOD: trust
PG_VERSION: "15"
ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
.use-pg15-opensearch2-ee:
services:
- name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:postgres-15-pgvector-0.4.1
command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
alias: postgres
- name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:redis-cluster-6.2.12
alias: rediscluster # configure connections in config/redis.yml
- name: redis:6.0-alpine
- name: opensearchproject/opensearch:2.2.1
alias: elasticsearch
command: ["bin/opensearch", "-E", "discovery.type=single-node", "-E", "plugins.security.disabled=true"]
- name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:zoekt-ci-image-1.0
alias: zoekt-ci-image
variables:
POSTGRES_HOST_AUTH_METHOD: trust
PG_VERSION: "15"
ZOEKT_INDEX_BASE_URL: http://zoekt-ci-image:6060
ZOEKT_SEARCH_BASE_URL: http://zoekt-ci-image:6070
.use-kaniko: .use-kaniko:
image: image:
name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:kaniko name: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images:kaniko
......
...@@ -20,7 +20,7 @@ memory-on-boot: ...@@ -20,7 +20,7 @@ memory-on-boot:
extends: extends:
- .only-code-memory-job-base - .only-code-memory-job-base
- .production - .production
- .use-pg13 - .use-pg14
stage: test stage: test
needs: ["setup-test-env", "compile-test-assets"] needs: ["setup-test-env", "compile-test-assets"]
variables: variables:
......
此差异已折叠。
...@@ -22,7 +22,7 @@ dont-interrupt-me: ...@@ -22,7 +22,7 @@ dont-interrupt-me:
- echo "This jobs makes sure this pipeline won't be interrupted! See https://docs.gitlab.com/ee/ci/yaml/#interruptible." - echo "This jobs makes sure this pipeline won't be interrupted! See https://docs.gitlab.com/ee/ci/yaml/#interruptible."
.base-rspec-foss-impact: .base-rspec-foss-impact:
extends: .rspec-base-pg13-as-if-foss extends: .rspec-base-pg14-as-if-foss
needs: needs:
- pipeline: $PARENT_PIPELINE_ID - pipeline: $PARENT_PIPELINE_ID
job: detect-tests job: detect-tests
......
...@@ -109,11 +109,16 @@ include: ...@@ -109,11 +109,16 @@ include:
- .rspec-base - .rspec-base
- .use-pg13 - .use-pg13
.rspec-base-pg13-as-if-foss: .rspec-base-pg14:
extends:
- .rspec-base
- .use-pg14
.rspec-base-pg14-as-if-foss:
extends: extends:
- .rspec-base - .rspec-base
- .as-if-foss - .as-if-foss
- .use-pg13 - .use-pg14
needs: needs:
- job: "setup-test-env" - job: "setup-test-env"
- job: "retrieve-tests-metadata" - job: "retrieve-tests-metadata"
...@@ -121,10 +126,10 @@ include: ...@@ -121,10 +126,10 @@ include:
- job: "detect-tests" - job: "detect-tests"
optional: true optional: true
.rspec-base-pg14: .rspec-base-pg15:
extends: extends:
- .rspec-base - .rspec-base
- .use-pg14 - .use-pg15
.rspec-ee-base-pg12: .rspec-ee-base-pg12:
extends: extends:
...@@ -177,11 +182,34 @@ include: ...@@ -177,11 +182,34 @@ include:
- .use-pg14-opensearch2-ee - .use-pg14-opensearch2-ee
- .rails:rules:run-search-tests - .rails:rules:run-search-tests
.rspec-ee-base-pg15:
extends:
- .rspec-base
- .use-pg15-es7-ee
.rspec-ee-base-pg15-es8:
extends:
- .rspec-base
- .use-pg15-es8-ee
- .rails:rules:run-search-tests
.rspec-ee-base-pg15-opensearch1:
extends:
- .rspec-base
- .use-pg15-opensearch1-ee
- .rails:rules:run-search-tests
.rspec-ee-base-pg15-opensearch2:
extends:
- .rspec-base
- .use-pg15-opensearch2-ee
- .rails:rules:run-search-tests
.db-job-base: .db-job-base:
extends: extends:
- .rails-job-base - .rails-job-base
- .rails:rules:ee-and-foss-migration - .rails:rules:ee-and-foss-migration
- .use-pg13 - .use-pg14
stage: test stage: test
needs: ["setup-test-env"] needs: ["setup-test-env"]
# rspec job base specs # rspec job base specs
......
...@@ -83,7 +83,7 @@ verify-approvals: ...@@ -83,7 +83,7 @@ verify-approvals:
generate-frontend-fixtures-mapping: generate-frontend-fixtures-mapping:
extends: extends:
- .setup:rules:generate-frontend-fixtures-mapping - .setup:rules:generate-frontend-fixtures-mapping
- .use-pg13 - .use-pg14
- .ruby-cache - .ruby-cache
needs: ["setup-test-env"] needs: ["setup-test-env"]
stage: prepare stage: prepare
......
...@@ -45,7 +45,7 @@ static-verification-with-database: ...@@ -45,7 +45,7 @@ static-verification-with-database:
- .static-analysis-base - .static-analysis-base
- .rubocop-job-cache - .rubocop-job-cache
- .static-analysis:rules:static-verification-with-database - .static-analysis:rules:static-verification-with-database
- .use-pg13 - .use-pg14
script: script:
- bundle exec rake lint:static_verification_with_database - bundle exec rake lint:static_verification_with_database
variables: variables:
......
...@@ -32,17 +32,17 @@ update-tests-metadata: ...@@ -32,17 +32,17 @@ update-tests-metadata:
- retrieve-tests-metadata - retrieve-tests-metadata
- generate-frontend-fixtures-mapping - generate-frontend-fixtures-mapping
- setup-test-env - setup-test-env
- rspec migration pg13 - rspec migration pg14
- rspec-all frontend_fixture - rspec-all frontend_fixture
- rspec unit pg13 - rspec unit pg14
- rspec integration pg13 - rspec integration pg14
- rspec system pg13 - rspec system pg14
- rspec background_migration pg13 - rspec background_migration pg14
- rspec-ee migration pg13 - rspec-ee migration pg14
- rspec-ee unit pg13 - rspec-ee unit pg14
- rspec-ee integration pg13 - rspec-ee integration pg14
- rspec-ee system pg13 - rspec-ee system pg14
- rspec-ee background_migration pg13 - rspec-ee background_migration pg14
script: script:
- run_timed_command "retry gem install fog-aws mime-types activesupport rspec_profiling postgres-copy --no-document" - run_timed_command "retry gem install fog-aws mime-types activesupport rspec_profiling postgres-copy --no-document"
- source ./scripts/rspec_helpers.sh - source ./scripts/rspec_helpers.sh
......
...@@ -186,8 +186,8 @@ This number can be overridden by setting a CI/CD variable named `RSPEC_FAIL_FAST ...@@ -186,8 +186,8 @@ This number can be overridden by setting a CI/CD variable named `RSPEC_FAIL_FAST
## Re-run previously failed tests in merge request pipelines ## Re-run previously failed tests in merge request pipelines
In order to reduce the feedback time after resolving failed tests for a merge request, the `rspec rspec-pg13-rerun-previous-failed-tests` In order to reduce the feedback time after resolving failed tests for a merge request, the `rspec rspec-pg14-rerun-previous-failed-tests`
and `rspec rspec-ee-pg13-rerun-previous-failed-tests` jobs run the failed tests from the previous MR pipeline. and `rspec rspec-ee-pg14-rerun-previous-failed-tests` jobs run the failed tests from the previous MR pipeline.
This was introduced on August 25th 2021, with <https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69053>. This was introduced on August 25th 2021, with <https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69053>.
...@@ -195,7 +195,7 @@ This was introduced on August 25th 2021, with <https://gitlab.com/gitlab-org/git ...@@ -195,7 +195,7 @@ This was introduced on August 25th 2021, with <https://gitlab.com/gitlab-org/git
1. The `detect-previous-failed-tests` job (`prepare` stage) detects the test files associated with failed RSpec 1. The `detect-previous-failed-tests` job (`prepare` stage) detects the test files associated with failed RSpec
jobs from the previous MR pipeline. jobs from the previous MR pipeline.
1. The `rspec rspec-pg13-rerun-previous-failed-tests` and `rspec rspec-ee-pg13-rerun-previous-failed-tests` jobs 1. The `rspec rspec-pg14-rerun-previous-failed-tests` and `rspec rspec-ee-pg14-rerun-previous-failed-tests` jobs
will run the test files gathered by the `detect-previous-failed-tests` job. will run the test files gathered by the `detect-previous-failed-tests` job.
```mermaid ```mermaid
...@@ -205,8 +205,8 @@ graph LR ...@@ -205,8 +205,8 @@ graph LR
end end
subgraph "test stage"; subgraph "test stage";
B["rspec rspec-pg13-rerun-previous-failed-tests"]; B["rspec rspec-pg14-rerun-previous-failed-tests"];
C["rspec rspec-ee-pg13-rerun-previous-failed-tests"]; C["rspec rspec-ee-pg14-rerun-previous-failed-tests"];
end end
A --"artifact: list of test files"--> B & C A --"artifact: list of test files"--> B & C
...@@ -625,22 +625,22 @@ This should let us: ...@@ -625,22 +625,22 @@ This should let us:
### PostgreSQL versions testing ### PostgreSQL versions testing
Our test suite runs against PG13 as GitLab.com runs on PG13 and Our test suite runs against PostgreSQL 14 as GitLab.com runs on PostgreSQL 14 and
[Omnibus defaults to PG13 for new installs and upgrades](../../administration/package_information/postgresql_versions.md). [Omnibus defaults to PG14 for new installs and upgrades](../../administration/package_information/postgresql_versions.md).
We do run our test suite against PG13 on nightly scheduled pipelines. We do run our test suite against PostgreSQL 14 on nightly scheduled pipelines.
We also run our test suite against PG13 upon specific database library changes in MRs and `main` pipelines (with the `rspec db-library-code pg13` job). We also run our test suite against PostgreSQL 12 and PostgreSQL 13 upon specific database library changes in merge requests and `main` pipelines (with the `rspec db-library-code pg12` and `rspec db-library-code pg13` jobs).
#### Current versions testing #### Current versions testing
| Where? | PostgreSQL version | Ruby version | | Where? | PostgreSQL version | Ruby version |
|------------------------------------------------------------------------------------------------|-------------------------------------------------|-----------------------| |------------------------------------------------------------------------------------------------|-------------------------------------------------|-----------------------|
| Merge requests | 13 (default version), 12 for DB library changes | 3.0 (default version) | | Merge requests | 14 (default version), 13 for DB library changes | 3.0 (default version) |
| `master` branch commits | 13 (default version), 12 for DB library changes | 3.0 (default version) | | `master` branch commits | 14 (default version), 13 for DB library changes | 3.0 (default version) |
| `maintenance` scheduled pipelines for the `master` branch (every even-numbered hour) | 13 (default version), 12 for DB library changes | 3.0 (default version) | | `maintenance` scheduled pipelines for the `master` branch (every even-numbered hour) | 14 (default version), 13 for DB library changes | 3.0 (default version) |
| `maintenance` scheduled pipelines for the `ruby2` branch (every odd-numbered hour), see below. | 13 (default version), 12 for DB library changes | 2.7 | | `maintenance` scheduled pipelines for the `ruby2` branch (every odd-numbered hour), see below. | 14 (default version), 13 for DB library changes | 2.7 |
| `nightly` scheduled pipelines for the `master` branch | 13 (default version), 12, 14 | 3.0 (default version) | | `nightly` scheduled pipelines for the `master` branch | 14 (default version), 12, 13, 15 | 3.0 (default version) |
There are 2 pipeline schedules used for testing Ruby 2.7. One is triggering a There are 2 pipeline schedules used for testing Ruby 2.7. One is triggering a
pipeline in `ruby2-sync` branch, which updates the `ruby2` branch with latest pipeline in `ruby2-sync` branch, which updates the `ruby2` branch with latest
......
...@@ -140,6 +140,8 @@ that are scoped to a single [configuration keyword](../../ci/yaml/index.md#job-k ...@@ -140,6 +140,8 @@ that are scoped to a single [configuration keyword](../../ci/yaml/index.md#job-k
| `.use-pg13-ee` | Same as `.use-pg13` but also use an `elasticsearch` service (see [`.gitlab/ci/global.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/global.gitlab-ci.yml) for the specific version of the service). | | `.use-pg13-ee` | Same as `.use-pg13` but also use an `elasticsearch` service (see [`.gitlab/ci/global.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/global.gitlab-ci.yml) for the specific version of the service). |
| `.use-pg14` | Allows a job to use the `postgres` 14, `redis`, and `rediscluster` services (see [`.gitlab/ci/global.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/global.gitlab-ci.yml) for the specific versions of the services). | | `.use-pg14` | Allows a job to use the `postgres` 14, `redis`, and `rediscluster` services (see [`.gitlab/ci/global.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/global.gitlab-ci.yml) for the specific versions of the services). |
| `.use-pg14-ee` | Same as `.use-pg14` but also use an `elasticsearch` service (see [`.gitlab/ci/global.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/global.gitlab-ci.yml) for the specific version of the service). | | `.use-pg14-ee` | Same as `.use-pg14` but also use an `elasticsearch` service (see [`.gitlab/ci/global.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/global.gitlab-ci.yml) for the specific version of the service). |
| `.use-pg15` | Allows a job to use the `postgres` 15, `redis`, and `rediscluster` services (see [`.gitlab/ci/global.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/global.gitlab-ci.yml) for the specific versions of the services). |
| `.use-pg15-ee` | Same as `.use-pg15` but also use an `elasticsearch` service (see [`.gitlab/ci/global.gitlab-ci.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/global.gitlab-ci.yml) for the specific version of the service). |
| `.use-kaniko` | Allows a job to use the `kaniko` tool to build Docker images. | | `.use-kaniko` | Allows a job to use the `kaniko` tool to build Docker images. |
| `.as-if-foss` | Simulate the FOSS project by setting the `FOSS_ONLY='1'` CI/CD variable. | | `.as-if-foss` | Simulate the FOSS project by setting the `FOSS_ONLY='1'` CI/CD variable. |
| `.use-docker-in-docker` | Allows a job to use Docker in Docker. | | `.use-docker-in-docker` | Allows a job to use Docker in Docker. |
......
...@@ -12,8 +12,8 @@ class FailedTests ...@@ -12,8 +12,8 @@ class FailedTests
previous_tests_report_path: 'test_results/previous/test_reports.json', previous_tests_report_path: 'test_results/previous/test_reports.json',
output_directory: 'tmp/previous_failed_tests/', output_directory: 'tmp/previous_failed_tests/',
format: :oneline, format: :oneline,
rspec_pg_regex: /rspec .+ pg13( .+)?/, rspec_pg_regex: /rspec .+ pg14( .+)?/,
rspec_ee_pg_regex: /rspec-ee .+ pg13( .+)?/ rspec_ee_pg_regex: /rspec-ee .+ pg14( .+)?/
}.freeze }.freeze
def initialize(options) def initialize(options)
......
{ {
"suites": [ "suites": [
{ {
"name": "rspec unit pg13", "name": "rspec unit pg14",
"total_time": 975.6635620000018, "total_time": 975.6635620000018,
"total_count": 3811, "total_count": 3811,
"success_count": 3800, "success_count": 3800,
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
'suites' => [ 'suites' => [
{ {
'failed_count' => 1, 'failed_count' => 1,
'name' => 'rspec unit pg13 10/12', 'name' => 'rspec unit pg14 10/12',
'test_cases' => [ 'test_cases' => [
{ {
'status' => 'failed', 'status' => 'failed',
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
}, },
{ {
'failed_count' => 1, 'failed_count' => 1,
'name' => 'rspec-ee unit pg13', 'name' => 'rspec-ee unit pg14',
'test_cases' => [ 'test_cases' => [
{ {
'status' => 'failed', 'status' => 'failed',
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
}, },
{ {
'failed_count' => 1, 'failed_count' => 1,
'name' => 'rspec unit pg14 10/12', 'name' => 'rspec unit pg15 10/12',
'test_cases' => [ 'test_cases' => [
{ {
'status' => 'failed', 'status' => 'failed',
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册