summaryrefslogtreecommitdiff
path: root/zuul.d
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-04-19 12:18:39 +0000
committerGerrit Code Review <review@openstack.org>2018-04-19 12:18:39 +0000
commit4c74e3e0079e4b31271c8f643289c93e528e887f (patch)
treef98e22b87b1cd9b2ee4e8e569d97f40f33654754 /zuul.d
parent995271ccc81181246fbdd909ef3c7a99a537e097 (diff)
parent555e1737a9959da03da96ee67ac539e1799d6afc (diff)
Merge "Revert "Temporarly mark 3node job as non-voting""HEADmaster
Diffstat (limited to 'zuul.d')
-rw-r--r--zuul.d/multinode-jobs.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/zuul.d/multinode-jobs.yaml b/zuul.d/multinode-jobs.yaml
index c377a8a..160a32a 100644
--- a/zuul.d/multinode-jobs.yaml
+++ b/zuul.d/multinode-jobs.yaml
@@ -9,6 +9,7 @@
9 gate: 9 gate:
10 queue: tripleo 10 queue: tripleo
11 jobs: 11 jobs:
12 - tripleo-ci-centos-7-3nodes-multinode
12 - tripleo-ci-centos-7-nonha-multinode-oooq 13 - tripleo-ci-centos-7-nonha-multinode-oooq
13 14
14- project-template: 15- project-template:
@@ -82,7 +83,6 @@
82 run: playbooks/tripleo-ci/run.yaml 83 run: playbooks/tripleo-ci/run.yaml
83 post-run: playbooks/tripleo-ci/post.yaml 84 post-run: playbooks/tripleo-ci/post.yaml
84 timeout: 10800 85 timeout: 10800
85 voting: false
86 nodeset: legacy-centos-7-3-node 86 nodeset: legacy-centos-7-3-node
87 branches: ^(?!stable/(newton|ocata|pike)).*$ 87 branches: ^(?!stable/(newton|ocata|pike)).*$
88 vars: 88 vars: