Commit 336ef2a9 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'qa-use-dag-for-package-and-qa-always-job' into 'master'

Use the 'needs' keyword for 'package-and-qa' job

See merge request gitlab-org/gitlab-ce!32085
parents 18206a74 05fd0259
.package-and-qa-base: .package-and-qa-base:
image: ruby:2.6-alpine image: ruby:2.6-alpine
stage: review # So even if review-deploy failed we can still run this stage: qa
before_script: [] before_script: []
needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
dependencies: [] dependencies: []
cache: {} cache: {}
variables: variables:
...@@ -14,12 +15,16 @@ ...@@ -14,12 +15,16 @@
only: only:
- branches@gitlab-org/gitlab-ce - branches@gitlab-org/gitlab-ce
- branches@gitlab-org/gitlab-ee - branches@gitlab-org/gitlab-ee
except:
- master
package-and-qa-manual: package-and-qa-manual:
extends: extends: .package-and-qa-base
- .package-and-qa-base
- .no-docs-and-no-qa
when: manual when: manual
except:
- master
- /(^docs[\/-].+|.+-docs$)/
- /(^qa[\/-].*|.*-qa$)
package-and-qa: package-and-qa:
extends: .package-and-qa-base extends: .package-and-qa-base
......
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