summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-20 09:09:13 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-20 09:09:13 +0000
commit1ac794623a8be5dee111716a44dd04ff708f3541 (patch)
tree6c18f9fbe0bd9978bd3e8d9b083d3a0ca180686e /.gitlab
parent5247fe0bef72fa922841a79d5dbefb47d95112fa (diff)
downloadgitlab-ce-1ac794623a8be5dee111716a44dd04ff708f3541.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/global.gitlab-ci.yml19
-rw-r--r--.gitlab/ci/rails.gitlab-ci.yml34
-rw-r--r--.gitlab/ci/rules.gitlab-ci.yml9
3 files changed, 62 insertions, 0 deletions
diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml
index ffdc115cff7..bd2e49bde31 100644
--- a/.gitlab/ci/global.gitlab-ci.yml
+++ b/.gitlab/ci/global.gitlab-ci.yml
@@ -50,6 +50,15 @@
variables:
POSTGRES_HOST_AUTH_METHOD: trust
+.use-pg11:
+ image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34"
+ services:
+ - name: postgres:11.6
+ command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
+ - name: redis:alpine
+ variables:
+ POSTGRES_HOST_AUTH_METHOD: trust
+
.use-pg9-ee:
services:
- name: postgres:9.6.17
@@ -69,6 +78,16 @@
variables:
POSTGRES_HOST_AUTH_METHOD: trust
+.use-pg11-ee:
+ image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34"
+ services:
+ - name: postgres:11.6
+ command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
+ - name: redis:alpine
+ - name: elasticsearch:6.4.2
+ variables:
+ POSTGRES_HOST_AUTH_METHOD: trust
+
.as-if-foss:
variables:
FOSS_ONLY: '1'
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index 58c4ef0e02a..26f7febb59b 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -238,6 +238,12 @@ rspec quarantine pg9:
- .rails:rules:master-refs-code-backstage
- .use-pg10
+rspec migration pg10:
+ extends:
+ - .rspec-base-pg10
+ - .rspec-base-migration
+ parallel: 2
+
rspec unit pg10:
extends: .rspec-base-pg10
parallel: 20
@@ -252,6 +258,34 @@ rspec system pg10:
# master-only jobs #
####################
+############################
+# nightly master-only jobs #
+.rspec-base-pg11:
+ extends:
+ - .rspec-base
+ - .rails:rules:nightly-master-refs-code-backstage
+ - .use-pg11
+
+rspec migration pg11:
+ extends:
+ - .rspec-base-pg11
+ - .rspec-base-migration
+ parallel: 2
+
+rspec unit pg11:
+ extends: .rspec-base-pg11
+ parallel: 20
+
+rspec integration pg11:
+ extends: .rspec-base-pg11
+ parallel: 8
+
+rspec system pg11:
+ extends: .rspec-base-pg11
+ parallel: 24
+# nightly master-only jobs #
+############################
+
#########################
# ee + master-only jobs #
rspec-ee quarantine pg9:
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index a4285f47b6c..4facbfd2b6a 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -22,6 +22,9 @@
.if-merge-request: &if-merge-request
if: '$CI_MERGE_REQUEST_IID'
+.if-nightly-master-schedule: &if-nightly-master-schedule
+ if: '$NIGHTLY && $CI_COMMIT_REF_NAME == "master" && $CI_PIPELINE_SOURCE == "schedule"'
+
.if-dot-com-gitlab-org-schedule: &if-dot-com-gitlab-org-schedule
if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org" && $CI_PIPELINE_SOURCE == "schedule"'
@@ -343,6 +346,12 @@
changes: *code-backstage-patterns
when: on_success
+.rails:rules:nightly-master-refs-code-backstage:
+ rules:
+ - <<: *if-nightly-master-schedule
+ changes: *code-backstage-patterns
+ when: on_success
+
.rails:rules:ee-only:
rules:
- <<: *if-not-ee