Merge "Branching stable/stein upstream jobs"

This commit is contained in:
Zuul 2019-04-01 16:44:11 +00:00 committed by Gerrit Code Review
commit 69212e1cd8
2 changed files with 4 additions and 2 deletions

View File

@ -244,11 +244,12 @@
nodes: 1ctlr
featureset: '044'
# NOTE(rfolco): scen012 should run on master only until it gets stable
- job:
name: tripleo-ci-centos-7-scenario012-multinode-oooq-container
parent: tripleo-ci-base-multinode
voting: false
branches: ^(?!stable/(newton|ocata|pike|queens|rocky)).*$
branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein)).*$
vars:
nodes: 1ctlr
featureset: '054'

View File

@ -545,6 +545,7 @@
'share.capability_create_share_from_snapshot_support': 'False'
test_white_regex: ''
# NOTE(rfolco): scen012 should run on master only until it gets stable
- job:
name: tripleo-ci-centos-7-scenario010-standalone
voting: false
@ -571,7 +572,7 @@
voting: false
parent: tripleo-ci-base-standalone
nodeset: single-centos-7-node
branches: ^(?!stable/(newton|ocata|pike|queens|rocky)).*$
branches: ^(?!stable/(newton|ocata|pike|queens|rocky|stein)).*$
vars:
featureset: '060'
standalone_ceph: true