Commit 76275d0c authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'qa-remove-unneeded-only-extend' into 'master'

Fixes two bugs with the `package-and-qa-manual:master` and `build-qa-image` jobs

See merge request gitlab-org/gitlab-ce!32584
parents f4ddf205 3ca11aef
......@@ -10,34 +10,31 @@
- install_gitlab_gem
- ./scripts/trigger-build omnibus
only:
- branches@gitlab-org/gitlab-ce
- branches@gitlab-org/gitlab-ee
except:
- master
refs:
- branches@gitlab-org/gitlab-ce
- branches@gitlab-org/gitlab-ee
package-and-qa-manual:
extends:
- .package-and-qa-base
- .except-docs-qa
extends: .package-and-qa-base
except:
refs:
- master
needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
when: manual
needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
package-and-qa-manual:master:
extends:
- .package-and-qa-base
needs: ["build-qa-image", "gitlab:assets:compile"]
extends: .package-and-qa-base
only:
refs:
- master
when: manual
needs: ["build-qa-image", "gitlab:assets:compile"]
package-and-qa:
extends: .package-and-qa-base
only:
refs:
- /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ce
- /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ee
needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
allow_failure: true
only:
- /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ce
- /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ee
......@@ -40,7 +40,7 @@
build-qa-image:
extends:
- .review-docker
- .except-docs-qa
- .except-docs
only:
refs:
- branches@gitlab-org/gitlab-ce
......
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