Remove a useless '.except-docs-qa' extension in 'package-and-qa-manual'

Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
Rémy Coutable 2019-09-03 13:21:42 +02:00
parent da0a5c7cc2
commit 3ca11aefdd
No known key found for this signature in database
GPG Key ID: 98DFFD1C0C62B70B
2 changed files with 12 additions and 15 deletions

View File

@ -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

View File

@ -40,7 +40,7 @@
build-qa-image:
extends:
- .review-docker
- .except-docs-qa
- .except-docs
only:
refs:
- branches@gitlab-org/gitlab-ce