summaryrefslogtreecommitdiff
path: root/.gitlab/ci
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-20 18:08:51 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-20 18:08:51 +0000
commitdf2eda3f14dccb703bd7054d4ddde7803cb1fe7e (patch)
tree0200bb0def01cde22da3bc4c9ed0a7b0f91d6b50 /.gitlab/ci
parentb9bac6dbf78a5a7976fba14aaeef96bdeb0da612 (diff)
downloadgitlab-ce-df2eda3f14dccb703bd7054d4ddde7803cb1fe7e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci')
-rw-r--r--.gitlab/ci/docs.gitlab-ci.yml4
-rw-r--r--.gitlab/ci/memory.gitlab-ci.yml10
-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/setup.gitlab-ci.yml4
-rw-r--r--.gitlab/ci/yaml.gitlab-ci.yml3
7 files changed, 21 insertions, 20 deletions
diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml
index 3e5ffcf796a..c6f758b6719 100644
--- a/.gitlab/ci/docs.gitlab-ci.yml
+++ b/.gitlab/ci/docs.gitlab-ci.yml
@@ -46,9 +46,7 @@ docs lint:
- .docs:rules:docs-lint
image: "registry.gitlab.com/gitlab-org/gitlab-docs:docs-lint"
stage: test
- needs:
- - job: "retrieve-tests-metadata"
- artifacts: false
+ needs: []
script:
- scripts/lint-doc.sh
# Lint Markdown
diff --git a/.gitlab/ci/memory.gitlab-ci.yml b/.gitlab/ci/memory.gitlab-ci.yml
index a8e2d90a4ee..b090cef7796 100644
--- a/.gitlab/ci/memory.gitlab-ci.yml
+++ b/.gitlab/ci/memory.gitlab-ci.yml
@@ -8,6 +8,10 @@
memory-static:
extends: .only-code-memory-job-base
+ stage: test
+ needs:
+ - job: setup-test-env
+ artifacts: true
variables:
SETUP_DB: "false"
script:
@@ -36,6 +40,12 @@ memory-on-boot:
extends:
- .only-code-memory-job-base
- .use-pg10
+ stage: test
+ needs:
+ - job: setup-test-env
+ artifacts: true
+ - job: compile-assets pull-cache
+ artifacts: true
variables:
NODE_ENV: "production"
RAILS_ENV: "production"
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index 180c62445df..c25f30f39a8 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -3,9 +3,7 @@
- .default-tags
- .default-retry
stage: test
- needs:
- - job: "retrieve-tests-metadata"
- artifacts: false
+ needs: []
cache:
key: "qa-framework-jobs:v1"
paths:
diff --git a/.gitlab/ci/reports.gitlab-ci.yml b/.gitlab/ci/reports.gitlab-ci.yml
index 9bd8109edc5..964aa8e523f 100644
--- a/.gitlab/ci/reports.gitlab-ci.yml
+++ b/.gitlab/ci/reports.gitlab-ci.yml
@@ -12,9 +12,7 @@ code_quality:
- .default-retry
- .reports:rules:code_quality
stage: test
- needs:
- - job: "retrieve-tests-metadata"
- artifacts: false
+ needs: []
image: docker:stable
allow_failure: true
services:
@@ -54,9 +52,7 @@ sast:
- .reports:rules:sast
stage: test
allow_failure: true
- needs:
- - job: "retrieve-tests-metadata"
- artifacts: false
+ needs: []
artifacts:
paths:
- gl-sast-report.json # GitLab-specific
@@ -94,9 +90,7 @@ dependency_scanning:
- .default-retry
- .reports:rules:dependency_scanning
stage: test
- needs:
- - job: "retrieve-tests-metadata"
- artifacts: false
+ needs: []
image: docker:stable
variables:
DOCKER_DRIVER: overlay2
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index 77d0ebaccfc..3835ad62ba2 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -248,9 +248,7 @@ danger-review:
- .review:rules:danger
image: registry.gitlab.com/gitlab-org/gitlab-build-images:danger
stage: test
- needs:
- - job: "retrieve-tests-metadata"
- artifacts: false
+ needs: []
script:
- git version
- node --version
diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml
index fb203db1478..b4b911ab607 100644
--- a/.gitlab/ci/setup.gitlab-ci.yml
+++ b/.gitlab/ci/setup.gitlab-ci.yml
@@ -23,12 +23,13 @@ cache gems:
extends:
- .default-tags
- .default-retry
- dependencies: []
+ needs: []
gitlab_git_test:
extends:
- .minimal-job
- .setup:rules:gitlab_git_test
+ stage: test
script:
- spec/support/prepare-gitlab-git-test-for-commit --check-for-changes
@@ -36,5 +37,6 @@ no_ee_check:
extends:
- .minimal-job
- .setup:rules:no_ee_check
+ stage: test
script:
- scripts/no-ee-check
diff --git a/.gitlab/ci/yaml.gitlab-ci.yml b/.gitlab/ci/yaml.gitlab-ci.yml
index cdc3aa6e577..6c0286ed18a 100644
--- a/.gitlab/ci/yaml.gitlab-ci.yml
+++ b/.gitlab/ci/yaml.gitlab-ci.yml
@@ -6,7 +6,8 @@ lint-ci-gitlab:
- .default-retry
- .yaml:rules
image: sdesbure/yamllint:latest
- dependencies: []
+ stage: test
+ needs: []
variables:
LINT_PATHS: .gitlab-ci.yml .gitlab/ci lib/gitlab/ci/templates changelogs
script: