summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-20 12:08:51 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-20 12:08:51 +0000
commit8c4198cbe631278e87fee04157d23494fbb80cdb (patch)
treed35cf498af480389796fd9e5cb4bcc903aea60f3 /.gitlab
parent1ac794623a8be5dee111716a44dd04ff708f3541 (diff)
downloadgitlab-ce-8c4198cbe631278e87fee04157d23494fbb80cdb.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/CODEOWNERS3
-rw-r--r--.gitlab/ci/dev-fixtures.gitlab-ci.yml1
-rw-r--r--.gitlab/ci/docs.gitlab-ci.yml4
-rw-r--r--.gitlab/ci/frontend.gitlab-ci.yml54
-rw-r--r--.gitlab/ci/qa.gitlab-ci.yml4
-rw-r--r--.gitlab/ci/reports.gitlab-ci.yml12
-rw-r--r--.gitlab/ci/review.gitlab-ci.yml4
-rw-r--r--.gitlab/ci/rules.gitlab-ci.yml4
8 files changed, 69 insertions, 17 deletions
diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS
index 7e29e112bb0..0b817fe14b5 100644
--- a/.gitlab/CODEOWNERS
+++ b/.gitlab/CODEOWNERS
@@ -43,3 +43,6 @@ Dangerfile @gl-quality/eng-prod
/danger/ @gl-quality/eng-prod
/lib/gitlab/danger/ @gl-quality/eng-prod
/scripts/ @gl-quality/eng-prod
+
+# Delivery owner files
+/.gitlab/ci/releases.gitlab-ci.yml @gitlab-org/delivery
diff --git a/.gitlab/ci/dev-fixtures.gitlab-ci.yml b/.gitlab/ci/dev-fixtures.gitlab-ci.yml
index e08f7e969cb..32f8ff45b14 100644
--- a/.gitlab/ci/dev-fixtures.gitlab-ci.yml
+++ b/.gitlab/ci/dev-fixtures.gitlab-ci.yml
@@ -7,7 +7,6 @@
- .use-pg9
stage: test
needs: ["setup-test-env"]
- dependencies: ["setup-test-env"]
variables:
FIXTURE_PATH: "db/fixtures/development"
SEED_CYCLE_ANALYTICS: "true"
diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml
index 59f1773da2e..3e5ffcf796a 100644
--- a/.gitlab/ci/docs.gitlab-ci.yml
+++ b/.gitlab/ci/docs.gitlab-ci.yml
@@ -46,7 +46,9 @@ docs lint:
- .docs:rules:docs-lint
image: "registry.gitlab.com/gitlab-org/gitlab-docs:docs-lint"
stage: test
- dependencies: []
+ needs:
+ - job: "retrieve-tests-metadata"
+ artifacts: false
script:
- scripts/lint-doc.sh
# Lint Markdown
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml
index f9db35592aa..d966d88a320 100644
--- a/.gitlab/ci/frontend.gitlab-ci.yml
+++ b/.gitlab/ci/frontend.gitlab-ci.yml
@@ -120,15 +120,54 @@ compile-assets pull-cache as-if-foss:
policy: pull
key: "assets-compile:v9:foss"
-.frontend-job-base:
+.frontend-fixtures-base:
extends:
- .default-tags
- .default-retry
- .default-cache
- .default-before_script
- .use-pg9
+ stage: fixtures
+ needs:
+ - job: "setup-test-env"
+ artifacts: true
+ - job: "compile-assets pull-cache"
+ artifacts: true
+ script:
+ - date
+ - scripts/gitaly-test-spawn
+ - date
+ - bundle exec rake frontend:fixtures
+ artifacts:
+ name: frontend-fixtures
+ expire_in: 31d
+ when: always
+ paths:
+ - node_modules
+ - public/assets
+ - tmp/tests/frontend/
+
+frontend-fixtures:
+ extends:
+ - .frontend-fixtures-base
+ - .frontend:rules:default-frontend-jobs
+
+frontend-fixtures-as-if-foss:
+ extends:
+ - .frontend-fixtures-base
+ - .frontend:rules:default-frontend-jobs-as-if-foss
+ - .as-if-foss
+
+.frontend-job-base:
+ extends:
+ - .default-tags
+ - .default-retry
+ - .default-cache
+ - .default-before_script
+ variables:
+ USE_BUNDLE_INSTALL: "false"
+ SETUP_DB: "false"
stage: test
- needs: ["setup-test-env", "compile-assets pull-cache"]
.karma-base:
extends: .frontend-job-base
@@ -138,14 +177,13 @@ compile-assets pull-cache as-if-foss:
script:
- export BABEL_ENV=coverage CHROME_LOG_FILE=chrome_debug.log
- date
- - scripts/gitaly-test-spawn
- - date
- - bundle exec rake karma
+ - yarn karma
karma:
extends:
- .karma-base
- .frontend:rules:default-frontend-jobs
+ needs: ["frontend-fixtures"]
coverage: '/^Statements *: (\d+\.\d+%)/'
artifacts:
name: coverage-javascript
@@ -163,13 +201,11 @@ karma-as-if-foss:
- .karma-base
- .frontend:rules:default-frontend-jobs-as-if-foss
- .as-if-foss
+ needs: ["frontend-fixtures-as-if-foss"]
.jest-base:
extends: .frontend-job-base
script:
- - scripts/gitaly-test-spawn
- - date
- - bundle exec rake frontend:fixtures
- date
- yarn jest --ci --coverage
cache:
@@ -182,6 +218,7 @@ jest:
extends:
- .jest-base
- .frontend:rules:default-frontend-jobs
+ needs: ["frontend-fixtures"]
artifacts:
name: coverage-frontend
expire_in: 31d
@@ -198,6 +235,7 @@ jest-as-if-foss:
- .jest-base
- .frontend:rules:default-frontend-jobs-as-if-foss
- .as-if-foss
+ needs: ["frontend-fixtures-as-if-foss"]
cache:
policy: pull
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index 0e9d7abb3ac..180c62445df 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -3,7 +3,9 @@
- .default-tags
- .default-retry
stage: test
- dependencies: []
+ needs:
+ - job: "retrieve-tests-metadata"
+ artifacts: false
cache:
key: "qa-framework-jobs:v1"
paths:
diff --git a/.gitlab/ci/reports.gitlab-ci.yml b/.gitlab/ci/reports.gitlab-ci.yml
index e7ee47fbe0a..9bd8109edc5 100644
--- a/.gitlab/ci/reports.gitlab-ci.yml
+++ b/.gitlab/ci/reports.gitlab-ci.yml
@@ -12,6 +12,9 @@ code_quality:
- .default-retry
- .reports:rules:code_quality
stage: test
+ needs:
+ - job: "retrieve-tests-metadata"
+ artifacts: false
image: docker:stable
allow_failure: true
services:
@@ -39,7 +42,6 @@ code_quality:
paths:
- gl-code-quality-report.json # GitLab-specific
expire_in: 1 week # GitLab-specific
- dependencies: []
# We need to duplicate this job's definition because it seems it's impossible to
# override an included `only.refs`.
@@ -52,7 +54,9 @@ sast:
- .reports:rules:sast
stage: test
allow_failure: true
- dependencies: [] # GitLab-specific
+ needs:
+ - job: "retrieve-tests-metadata"
+ artifacts: false
artifacts:
paths:
- gl-sast-report.json # GitLab-specific
@@ -90,6 +94,9 @@ dependency_scanning:
- .default-retry
- .reports:rules:dependency_scanning
stage: test
+ needs:
+ - job: "retrieve-tests-metadata"
+ artifacts: false
image: docker:stable
variables:
DOCKER_DRIVER: overlay2
@@ -148,7 +155,6 @@ dependency_scanning:
reports:
dependency_scanning: gl-dependency-scanning-report.json
expire_in: 1 week # GitLab-specific
- dependencies: []
# We need to duplicate this job's definition because it seems it's impossible to
# override an included `only.refs`.
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index e23708337a4..77d0ebaccfc 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -248,7 +248,9 @@ danger-review:
- .review:rules:danger
image: registry.gitlab.com/gitlab-org/gitlab-build-images:danger
stage: test
- dependencies: []
+ needs:
+ - job: "retrieve-tests-metadata"
+ artifacts: false
script:
- git version
- node --version
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 4facbfd2b6a..41a96f445a7 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -371,11 +371,11 @@
##################
.releases:rules:canonical-dot-com-gitlab-stable-branch-only:
rules:
- - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAME == "gitlab-org/gitlab" && $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable-ee$/'
+ - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_PATH == "gitlab-org/gitlab" && $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable-ee$/'
.releases:rules:canonical-dot-com-security-gitlab-stable-branch-only:
rules:
- - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAME == "gitlab-org/security/gitlab" && $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable-ee$/'
+ - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_PATH == "gitlab-org/security/gitlab" && $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable-ee$/'
#################
# Reports rules #