summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-04-25 01:18:21 +0000
committerGerrit Code Review <review@openstack.org>2018-04-25 01:18:21 +0000
commit26159ed06f8cce977153db87cc8c39cf0f3d21ec (patch)
tree608b1e7a28e3e8c3d4e1ff88b93e4ab3a940eded
parente556a40055b63bb0b2ddb316a927287c56a27262 (diff)
parent5fc098403346a85fa588e4f5b98138256b581298 (diff)
Merge "Revert "Disable voting on tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates""
-rw-r--r--zuul.d/base.yaml4
-rw-r--r--zuul.d/multinode-jobs.yaml4
2 files changed, 6 insertions, 2 deletions
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index b8fabe5..7924744 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -50,7 +50,7 @@
50 run: playbooks/tripleo-ci/run.yaml 50 run: playbooks/tripleo-ci/run.yaml
51 post-run: playbooks/tripleo-ci/post.yaml 51 post-run: playbooks/tripleo-ci/post.yaml
52 timeout: 10800 52 timeout: 10800
53 voting: false 53 voting: true
54 nodeset: legacy-centos-7-2-node 54 nodeset: legacy-centos-7-2-node
55 branches: ^(?!stable/(newton|ocata|pike|queens)).*$ 55 branches: ^(?!stable/(newton|ocata|pike|queens)).*$
56 vars: 56 vars:
@@ -75,4 +75,4 @@
75 - ^spec/.*$ 75 - ^spec/.*$
76 - ^Puppetfile.*$ 76 - ^Puppetfile.*$
77 - tox.ini 77 - tox.ini
78 - ^setup.*$ 78 - ^setup.*$ \ No newline at end of file
diff --git a/zuul.d/multinode-jobs.yaml b/zuul.d/multinode-jobs.yaml
index f49da55..86c21b0 100644
--- a/zuul.d/multinode-jobs.yaml
+++ b/zuul.d/multinode-jobs.yaml
@@ -17,6 +17,10 @@
17 check: 17 check:
18 jobs: 18 jobs:
19 - tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates 19 - tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates
20 gate:
21 queue: tripleo
22 jobs:
23 - tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates
20 24
21- project-template: 25- project-template:
22 name: tripleo-multinode-container-minimal 26 name: tripleo-multinode-container-minimal