From 5fcc895e277cac069c5663cd8388c3606ac257bc Mon Sep 17 00:00:00 2001 From: Ronelle Landy Date: Mon, 9 Jul 2018 15:06:42 -0400 Subject: [PATCH] Reparent scenario007 and 008 to tripleo-ci-base With the depends-on change, OVS shouls be updated to 2.9.x and we can reparent to triplep-ci-base. Change-Id: I214d7fec886e063e056c18d5447348d921edadcd --- zuul.d/multinode-jobs.yaml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/zuul.d/multinode-jobs.yaml b/zuul.d/multinode-jobs.yaml index cfe5d48ed..a07588aa7 100644 --- a/zuul.d/multinode-jobs.yaml +++ b/zuul.d/multinode-jobs.yaml @@ -240,10 +240,8 @@ - job: name: tripleo-ci-centos-7-scenario007-multinode-oooq - parent: tripleo-ci-dsvm-multinode - run: playbooks/tripleo-ci/run.yaml + parent: tripleo-ci-base post-run: playbooks/tripleo-ci/post.yaml - nodeset: legacy-centos-7-2-node timeout: 10800 branches: ^stable/pike.*$ vars: @@ -251,19 +249,16 @@ - job: name: tripleo-ci-centos-7-scenario007-multinode-oooq-container - parent: tripleo-ci-dsvm-multinode - run: playbooks/tripleo-ci/run.yaml + parent: tripleo-ci-base post-run: playbooks/tripleo-ci/post.yaml timeout: 10800 - nodeset: legacy-centos-7-2-node branches: ^(?!stable/(newton|ocata|pike)).*$ vars: toci_jobtype: multinode-1ctlr-featureset030 - job: name: tripleo-ci-centos-7-scenario008-multinode-oooq-container - parent: tripleo-ci-dsvm-multinode - run: playbooks/tripleo-ci/run.yaml + parent: tripleo-ci-base post-run: playbooks/tripleo-ci/post.yaml timeout: 10800 voting: false @@ -274,12 +269,10 @@ - job: name: tripleo-ci-centos-7-scenario008-multinode-oooq - parent: tripleo-ci-dsvm-multinode - run: playbooks/tripleo-ci/run.yaml + parent: tripleo-ci-base post-run: playbooks/tripleo-ci/post.yaml timeout: 10800 voting: false - nodeset: legacy-centos-7-2-node branches: ^(?!stable/(newton|ocata|pike|queens)).*$ vars: toci_jobtype: multinode-1ctlr-featureset031