Commit adcac7e4 authored by Sean McGivern's avatar Sean McGivern

Merge branch '207388-fix-docs-only-ci' into 'master'

Make sure docs only merge requests can run CI

Closes #207388

See merge request gitlab-org/gitlab!25612
parents 1f3a8d10 c31bd991
...@@ -46,9 +46,7 @@ docs lint: ...@@ -46,9 +46,7 @@ docs lint:
- .docs:rules:docs-lint - .docs:rules:docs-lint
image: "registry.gitlab.com/gitlab-org/gitlab-docs:docs-lint" image: "registry.gitlab.com/gitlab-org/gitlab-docs:docs-lint"
stage: test stage: test
needs: needs: []
- job: "retrieve-tests-metadata"
artifacts: false
script: script:
- scripts/lint-doc.sh - scripts/lint-doc.sh
# Lint Markdown # Lint Markdown
......
...@@ -8,6 +8,10 @@ ...@@ -8,6 +8,10 @@
memory-static: memory-static:
extends: .only-code-memory-job-base extends: .only-code-memory-job-base
stage: test
needs:
- job: setup-test-env
artifacts: true
variables: variables:
SETUP_DB: "false" SETUP_DB: "false"
script: script:
...@@ -36,6 +40,12 @@ memory-on-boot: ...@@ -36,6 +40,12 @@ memory-on-boot:
extends: extends:
- .only-code-memory-job-base - .only-code-memory-job-base
- .use-pg10 - .use-pg10
stage: test
needs:
- job: setup-test-env
artifacts: true
- job: compile-assets pull-cache
artifacts: true
variables: variables:
NODE_ENV: "production" NODE_ENV: "production"
RAILS_ENV: "production" RAILS_ENV: "production"
......
...@@ -3,9 +3,7 @@ ...@@ -3,9 +3,7 @@
- .default-tags - .default-tags
- .default-retry - .default-retry
stage: test stage: test
needs: needs: []
- job: "retrieve-tests-metadata"
artifacts: false
cache: cache:
key: "qa-framework-jobs:v1" key: "qa-framework-jobs:v1"
paths: paths:
......
...@@ -12,9 +12,7 @@ code_quality: ...@@ -12,9 +12,7 @@ code_quality:
- .default-retry - .default-retry
- .reports:rules:code_quality - .reports:rules:code_quality
stage: test stage: test
needs: needs: []
- job: "retrieve-tests-metadata"
artifacts: false
image: docker:stable image: docker:stable
allow_failure: true allow_failure: true
services: services:
...@@ -54,9 +52,7 @@ sast: ...@@ -54,9 +52,7 @@ sast:
- .reports:rules:sast - .reports:rules:sast
stage: test stage: test
allow_failure: true allow_failure: true
needs: needs: []
- job: "retrieve-tests-metadata"
artifacts: false
artifacts: artifacts:
paths: paths:
- gl-sast-report.json # GitLab-specific - gl-sast-report.json # GitLab-specific
...@@ -94,9 +90,7 @@ dependency_scanning: ...@@ -94,9 +90,7 @@ dependency_scanning:
- .default-retry - .default-retry
- .reports:rules:dependency_scanning - .reports:rules:dependency_scanning
stage: test stage: test
needs: needs: []
- job: "retrieve-tests-metadata"
artifacts: false
image: docker:stable image: docker:stable
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
......
...@@ -248,9 +248,7 @@ danger-review: ...@@ -248,9 +248,7 @@ danger-review:
- .review:rules:danger - .review:rules:danger
image: registry.gitlab.com/gitlab-org/gitlab-build-images:danger image: registry.gitlab.com/gitlab-org/gitlab-build-images:danger
stage: test stage: test
needs: needs: []
- job: "retrieve-tests-metadata"
artifacts: false
script: script:
- git version - git version
- node --version - node --version
......
...@@ -23,12 +23,13 @@ cache gems: ...@@ -23,12 +23,13 @@ cache gems:
extends: extends:
- .default-tags - .default-tags
- .default-retry - .default-retry
dependencies: [] needs: []
gitlab_git_test: gitlab_git_test:
extends: extends:
- .minimal-job - .minimal-job
- .setup:rules:gitlab_git_test - .setup:rules:gitlab_git_test
stage: test
script: script:
- spec/support/prepare-gitlab-git-test-for-commit --check-for-changes - spec/support/prepare-gitlab-git-test-for-commit --check-for-changes
...@@ -36,5 +37,6 @@ no_ee_check: ...@@ -36,5 +37,6 @@ no_ee_check:
extends: extends:
- .minimal-job - .minimal-job
- .setup:rules:no_ee_check - .setup:rules:no_ee_check
stage: test
script: script:
- scripts/no-ee-check - scripts/no-ee-check
...@@ -6,7 +6,8 @@ lint-ci-gitlab: ...@@ -6,7 +6,8 @@ lint-ci-gitlab:
- .default-retry - .default-retry
- .yaml:rules - .yaml:rules
image: sdesbure/yamllint:latest image: sdesbure/yamllint:latest
dependencies: [] stage: test
needs: []
variables: variables:
LINT_PATHS: .gitlab-ci.yml .gitlab/ci lib/gitlab/ci/templates changelogs LINT_PATHS: .gitlab-ci.yml .gitlab/ci lib/gitlab/ci/templates changelogs
script: script:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment