From fcbee2345626fc8a4ee8a3569c56775625d8d7a8 Mon Sep 17 00:00:00 2001 From: Federico Ressi Date: Wed, 22 Apr 2020 13:47:57 +0200 Subject: [PATCH] Use OS stable/train branch for testing with DevStack centos-7 Change-Id: I7de1ad4fd548f7b0d537dfc9db86c778bf7d462e --- zuul.d/project.yaml | 5 +++-- zuul.d/tobiko-devstack.yaml | 20 +++++++++++++------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index e08fe197e..a11556068 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -15,8 +15,9 @@ jobs: - tobiko-tox-py36-centos-8 - tobiko-tox-py38-centos-8 - - tobiko-devstack-functional - - tobiko-devstack-faults-centos-7-train + - tobiko-devstack-functional-ubuntu-bionic + - tobiko-devstack-functional-centos-7 + - tobiko-devstack-faults-centos-7 - tobiko-devstack-faults-ubuntu-bionic - tobiko-tox-infrared-centos-7 - tobiko-tox-infrared-centos-8 diff --git a/zuul.d/tobiko-devstack.yaml b/zuul.d/tobiko-devstack.yaml index be276ffe3..d2cd11406 100644 --- a/zuul.d/tobiko-devstack.yaml +++ b/zuul.d/tobiko-devstack.yaml @@ -2,7 +2,6 @@ name: tobiko-devstack-base parent: devstack abstract: true - nodeset: openstack-single-node-bionic description: | Base Tobiko devstack job. @@ -147,6 +146,19 @@ - ^tobiko/tests/unit/ +- job: + name: tobiko-devstack-functional-centos-7 + parent: tobiko-devstack-functional + nodeset: devstack-single-node-centos-7 + override-checkout: stable/train + + +- job: + name: tobiko-devstack-functional-ubuntu-bionic + parent: tobiko-devstack-functional + nodeset: openstack-single-node-bionic + + - job: name: tobiko-devstack-scenario parent: tobiko-devstack @@ -221,12 +233,6 @@ name: tobiko-devstack-faults-centos-7 parent: tobiko-devstack-faults nodeset: openstack-three-node-centos-7 - voting: false - - -- job: - name: tobiko-devstack-faults-centos-7-train - parent: tobiko-devstack-faults-centos-7 override-checkout: stable/train voting: false vars: