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:
parent
da0a5c7cc2
commit
3ca11aefdd
|
@ -10,34 +10,31 @@
|
||||||
- install_gitlab_gem
|
- install_gitlab_gem
|
||||||
- ./scripts/trigger-build omnibus
|
- ./scripts/trigger-build omnibus
|
||||||
only:
|
only:
|
||||||
- branches@gitlab-org/gitlab-ce
|
refs:
|
||||||
- branches@gitlab-org/gitlab-ee
|
- branches@gitlab-org/gitlab-ce
|
||||||
except:
|
- branches@gitlab-org/gitlab-ee
|
||||||
- master
|
|
||||||
|
|
||||||
package-and-qa-manual:
|
package-and-qa-manual:
|
||||||
extends:
|
extends: .package-and-qa-base
|
||||||
- .package-and-qa-base
|
|
||||||
- .except-docs-qa
|
|
||||||
except:
|
except:
|
||||||
refs:
|
refs:
|
||||||
- master
|
- master
|
||||||
needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
|
|
||||||
when: manual
|
when: manual
|
||||||
|
needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
|
||||||
|
|
||||||
package-and-qa-manual:master:
|
package-and-qa-manual:master:
|
||||||
extends:
|
extends: .package-and-qa-base
|
||||||
- .package-and-qa-base
|
|
||||||
needs: ["build-qa-image", "gitlab:assets:compile"]
|
|
||||||
only:
|
only:
|
||||||
refs:
|
refs:
|
||||||
- master
|
- master
|
||||||
when: manual
|
when: manual
|
||||||
|
needs: ["build-qa-image", "gitlab:assets:compile"]
|
||||||
|
|
||||||
package-and-qa:
|
package-and-qa:
|
||||||
extends: .package-and-qa-base
|
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"]
|
needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
only:
|
|
||||||
- /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ce
|
|
||||||
- /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ee
|
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
build-qa-image:
|
build-qa-image:
|
||||||
extends:
|
extends:
|
||||||
- .review-docker
|
- .review-docker
|
||||||
- .except-docs-qa
|
- .except-docs
|
||||||
only:
|
only:
|
||||||
refs:
|
refs:
|
||||||
- branches@gitlab-org/gitlab-ce
|
- branches@gitlab-org/gitlab-ce
|
||||||
|
|
Loading…
Reference in New Issue