Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a213e062
Commit
a213e062
authored
Jan 05, 2021
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ci: Test low-level DB code against PG12
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
4d67e117
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
9 deletions
+35
-9
.gitlab/ci/rails.gitlab-ci.yml
.gitlab/ci/rails.gitlab-ci.yml
+10
-0
.gitlab/ci/rules.gitlab-ci.yml
.gitlab/ci/rules.gitlab-ci.yml
+11
-0
doc/development/pipelines.md
doc/development/pipelines.md
+14
-9
No files found.
.gitlab/ci/rails.gitlab-ci.yml
View file @
a213e062
...
...
@@ -300,6 +300,16 @@ rspec system pg11 minimal:
-
.minimal-rspec-tests
-
.rails:rules:ee-and-foss-system:minimal
# Dedicated job to test DB library code against PG12.
# Note that these are already tested against PG11 in the `rspec unit pg11` / `rspec-ee unit pg11` jobs.
rspec db-library-code pg12
:
extends
:
-
.rspec-base-pg12
-
.rails:rules:ee-and-foss-db-library-code
script
:
-
*base-script
-
rspec_simple_job "-- spec/lib/gitlab/database/ spec/support/helpers/database/ ee/spec/lib/gitlab/database/ ee/spec/lib/ee/gitlab/database_spec.rb"
rspec fast_spec_helper
:
extends
:
-
.rspec-base-pg11
...
...
.gitlab/ci/rules.gitlab-ci.yml
View file @
a213e062
...
...
@@ -155,9 +155,15 @@
-
"
{,ee/}{,spec/}lib/{,ee/}gitlab/database{,_spec}.rb"
-
"
{,ee/}{,spec/}lib/{,ee/}gitlab/background_migration/**/*"
-
"
{,ee/}{,spec/}lib/{,ee/}gitlab/background_migration{,_spec}.rb"
-
"
{,ee/}spec/support/helpers/database/**/*"
-
"
config/prometheus/common_metrics.yml"
# Used by Gitlab::DatabaseImporters::CommonMetrics::Importer
-
"
{,ee/}app/models/project_statistics.rb"
# Used to calculate sizes in migration specs
.db-library-patterns
:
&db-library-patterns
-
"
{,ee/}{,spec/}lib/{,ee/}gitlab/database/**/*"
-
"
{,ee/}{,spec/}lib/{,ee/}gitlab/database{,_spec}.rb"
-
"
{,ee/}spec/support/helpers/database/**/*"
.backstage-patterns
:
&backstage-patterns
-
"
Dangerfile"
-
"
danger/**/*"
...
...
@@ -775,6 +781,11 @@
-
<<
:
*if-merge-request-title-as-if-foss
changes
:
*code-backstage-patterns
.rails:rules:ee-and-foss-db-library-code:
rules
:
-
changes
:
*db-library-patterns
-
<<
:
*if-merge-request-title-run-all-rspec
.rails:rules:ee-mr-and-master-only:
rules
:
-
<<
:
*if-not-ee
...
...
doc/development/pipelines.md
View file @
a213e062
...
...
@@ -422,24 +422,29 @@ We are using a custom mapping between source file to test files, maintained in t
### PostgreSQL versions testing
Even though
[
Omnibus defaults to PG12 for new installs and upgrades
](
https://docs.gitlab.com/omnibus/package-information/postgresql_versions.md
)
,
our test suite is currently running against PG11, since GitLab.com still runs on PG11.
We do run our test suite against PG12 on nightly scheduled pipelines as well as upon specific
database library changes in MRs and
`master`
pipelines (with the
`rspec db-library-code pg12`
job).
#### Current versions testing
| Where? | PostgreSQL version |
| ------ | ------ |
| MRs
| 11
|
|
`master`
(non-scheduled pipelines) | 11 |
| 2-hourly scheduled pipelines | 11 |
| ------ | ------
------------
|
| MRs
| 11, 12 for DB library changes
|
|
`master`
(non-scheduled pipelines) | 11
, 12 for DB library changes
|
| 2-hourly scheduled pipelines | 11
, 12 for DB library changes
|
|
`nightly`
scheduled pipelines | 11, 12 |
#### Long-term plan
We follow the
[
PostgreSQL versions shipped with Omnibus GitLab
](
https://docs.gitlab.com/omnibus/package-information/postgresql_versions.html
)
:
| PostgreSQL version | 13.0 (May 2020) | 13.1 (June 2020) | 13.2 (July 2020) | 13.3 (August 2020) | 13.4, 13.5 |
[
13.7 (December 2020)
](
https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/5722
)
| 14.0 (May 2021?) |
| ------ | --------------- | ---------------- | ---------------- | ------------------ | ------------ | -------------------- | ---------------- |
| PG11 | MRs/
`master`
/
`2-hour`
/
`nightly`
| MRs/
`master`
/
`2-hour`
/
`nightly`
| MRs/
`master`
/
`2-hour`
/
`nightly`
| MRs/
`master`
/
`2-hour`
/
`nightly`
| MRs/
`master`
/
`2-hour`
/
`nightly`
|
`nightly`
| - |
| PG12 | - | - |
`nightly`
|
`2-hour`
/
`nightly`
|
`2-hour`
/
`nightly`
| MRs/
`2-hour`
/
`nightly`
|
`2-hour`
/
`nightly`
|
| PG13 | - | - | - | - | - | - | MRs/
`2-hour`
/
`nightly`
|
| PostgreSQL version | 13.7 (December 2020) | 13.8 (January 2021) | 13.9 (February 2021) | 13.10 (March 2021) | 13.11 (April 2021) | 14.0 (May 2021?) |
| -------------------| -------------------- | ------------------- | -------------------- | ------------------ | ------------------ | ---------------- |
| PG11 | MRs/
`2-hour`
/
`nightly`
| MRs/
`2-hour`
/
`nightly`
| MRs/
`2-hour`
/
`nightly`
| MRs/
`2-hour`
/
`nightly`
| MRs/
`2-hour`
/
`nightly`
| MRs/
`2-hour`
/
`nightly`
|
| PG12 |
`nightly`
|
`nightly`
|
`nightly`
|
`nightly`
|
`nightly`
|
`nightly`
|
### Test jobs
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment