diff --git a/zuul.d/devstack-tobiko-centos.yaml b/zuul.d/devstack-tobiko-centos.yaml new file mode 100644 index 0000000..ad24ed2 --- /dev/null +++ b/zuul.d/devstack-tobiko-centos.yaml @@ -0,0 +1,25 @@ +--- + +- project-template: + name: devstack-tobiko-centos + description: CentOS Devstack Tobiko Plugin job + check: &CHECK + jobs: + - devstack-tobiko-centos + gate: &GATE + jobs: + - devstack-tobiko-centos + periodic: &PERIODIC + jobs: + - devstack-tobiko-centos + + +# --- Minimal jobs ----------------------------------------------------------- + +- job: + abstract: false + name: devstack-tobiko-centos + parent: devstack-tobiko-minimal + nodeset: devstack-tobiko-centos + voting: false + description: CentOS Devstack Tobiko Plugin job diff --git a/zuul.d/devstack-tobiko-ceph.yaml b/zuul.d/devstack-tobiko-ceph.yaml index 47dd85b..f9d10b3 100644 --- a/zuul.d/devstack-tobiko-ceph.yaml +++ b/zuul.d/devstack-tobiko-ceph.yaml @@ -10,8 +10,6 @@ periodic: jobs: - devstack-tobiko-ceph - - devstack-tobiko-ceph-centos - - devstack-tobiko-ceph-fedora # --- STANDALONE ------------------------------------------------------------- @@ -34,15 +32,3 @@ ENABLE_FILE_INJECTION: false ENABLE_VOLUME_MULTIATTACH: false test_workflow: create-resources - -- job: - name: devstack-tobiko-ceph-centos - parent: devstack-tobiko-ceph - nodeset: devstack-tobiko-centos - voting: false - -- job: - name: devstack-tobiko-ceph-fedora - parent: devstack-tobiko-ceph - nodeset: devstack-tobiko-fedora - voting: false diff --git a/zuul.d/devstack-tobiko-fedora.yaml b/zuul.d/devstack-tobiko-fedora.yaml new file mode 100644 index 0000000..5772385 --- /dev/null +++ b/zuul.d/devstack-tobiko-fedora.yaml @@ -0,0 +1,25 @@ +--- + +- project-template: + name: devstack-tobiko-fedora + description: Fedora Devstack Tobiko Plugin jobs + check: &CHECK + jobs: + - devstack-tobiko-fedora + gate: &GATE + jobs: + - devstack-tobiko-fedora + periodic: &PERIODIC + jobs: + - devstack-tobiko-fedora + + +# --- Minimal jobs ----------------------------------------------------------- + +- job: + abstract: false + name: devstack-tobiko-fedora + parent: devstack-tobiko-minimal + nodeset: devstack-tobiko-fedora + voting: false + description: Fedora Devstack Tobiko Plugin job diff --git a/zuul.d/devstack-tobiko-glance.yaml b/zuul.d/devstack-tobiko-glance.yaml index 9265d39..b30e69b 100644 --- a/zuul.d/devstack-tobiko-glance.yaml +++ b/zuul.d/devstack-tobiko-glance.yaml @@ -10,8 +10,6 @@ periodic: jobs: - devstack-tobiko-glance - - devstack-tobiko-glance-centos - - devstack-tobiko-glance-fedora # --- STANDALONE ------------------------------------------------------------- @@ -24,15 +22,3 @@ voting: false vars: test_workflow: create-resources - -- job: - name: devstack-tobiko-glance-centos - parent: devstack-tobiko-glance - nodeset: devstack-tobiko-centos - voting: false - -- job: - name: devstack-tobiko-glance-fedora - parent: devstack-tobiko-glance - nodeset: devstack-tobiko-fedora - voting: false diff --git a/zuul.d/devstack-tobiko-minimal.yaml b/zuul.d/devstack-tobiko-minimal.yaml index cad42dd..b654045 100644 --- a/zuul.d/devstack-tobiko-minimal.yaml +++ b/zuul.d/devstack-tobiko-minimal.yaml @@ -13,8 +13,6 @@ periodic: &PERIODIC jobs: - devstack-tobiko-minimal - - devstack-tobiko-minimal-centos - - devstack-tobiko-minimal-fedora # --- Minimal jobs ----------------------------------------------------------- @@ -93,15 +91,3 @@ - ^tobiko/tests/faults - ^tobiko/tests/functional - ^tobiko/tests/unit - -- job: - name: devstack-tobiko-minimal-centos - parent: devstack-tobiko-minimal - nodeset: devstack-tobiko-centos - voting: false - -- job: - name: devstack-tobiko-minimal-fedora - parent: devstack-tobiko-minimal - nodeset: devstack-tobiko-fedora - voting: false diff --git a/zuul.d/devstack-tobiko-nova.yaml b/zuul.d/devstack-tobiko-nova.yaml index 44f40ee..86dd3bd 100644 --- a/zuul.d/devstack-tobiko-nova.yaml +++ b/zuul.d/devstack-tobiko-nova.yaml @@ -13,8 +13,6 @@ periodic: jobs: - devstack-tobiko-nova - - devstack-tobiko-nova-centos - - devstack-tobiko-nova-fedora # --- STANDALONE ------------------------------------------------------------- @@ -36,15 +34,3 @@ - ^tobiko/tests/functional/ - ^tobiko/tests/faults/ - ^tobiko/tests/unit/ - -- job: - name: devstack-tobiko-nova-centos - parent: devstack-tobiko-nova - nodeset: devstack-tobiko-centos - voting: false - -- job: - name: devstack-tobiko-nova-fedora - parent: devstack-tobiko-nova - nodeset: devstack-tobiko-fedora - voting: false diff --git a/zuul.d/devstack-tobiko-octavia.yaml b/zuul.d/devstack-tobiko-octavia.yaml index 4a9c6eb..3a17d7c 100644 --- a/zuul.d/devstack-tobiko-octavia.yaml +++ b/zuul.d/devstack-tobiko-octavia.yaml @@ -13,8 +13,6 @@ periodic: jobs: - devstack-tobiko-octavia - - devstack-tobiko-octavia-centos - - devstack-tobiko-octavia-fedora # --- STANDALONE ------------------------------------------------------------- @@ -69,15 +67,3 @@ '/var/log/dib-build/': logs '/var/log/octavia-tenant-traffic.log': logs '/var/log/octavia-amphora.log': logs - -- job: - name: devstack-tobiko-octavia-centos - parent: devstack-tobiko-octavia - nodeset: devstack-tobiko-centos - voting: false - -- job: - name: devstack-tobiko-octavia-fedora - parent: devstack-tobiko-octavia - nodeset: devstack-tobiko-fedora - voting: false diff --git a/zuul.d/devstack-tobiko-ovs.yaml b/zuul.d/devstack-tobiko-ovs.yaml index e859e3a..0a6db15 100644 --- a/zuul.d/devstack-tobiko-ovs.yaml +++ b/zuul.d/devstack-tobiko-ovs.yaml @@ -10,11 +10,7 @@ periodic: jobs: - devstack-tobiko-ovs - - devstack-tobiko-ovs-centos - - devstack-tobiko-ovs-fedora - devstack-tobiko-multinode-ovs - - devstack-tobiko-multinode-ovs-centos - - devstack-tobiko-multinode-ovs-fedora # --- STANDALONE ------------------------------------------------------------- @@ -82,18 +78,6 @@ devstack_plugins: neutron: "https://opendev.org/openstack/neutron" -- job: - name: devstack-tobiko-ovs-centos - parent: devstack-tobiko-ovs - nodeset: devstack-tobiko-centos - voting: false - -- job: - name: devstack-tobiko-ovs-fedora - parent: devstack-tobiko-ovs - nodeset: devstack-tobiko-fedora - voting: false - # --- MULTINODE -------------------------------------------------------------- @@ -127,15 +111,3 @@ q-meta: true q-ovn-metadata-agent: false tls-proxy: false - -- job: - name: devstack-tobiko-multinode-ovs-centos - parent: devstack-tobiko-multinode-ovs - nodeset: devstack-tobiko-multinode-centos - voting: false - -- job: - name: devstack-tobiko-multinode-ovs-fedora - parent: devstack-tobiko-multinode-ovs - nodeset: devstack-tobiko-multinode-fedora - voting: false diff --git a/zuul.d/devstack-tobiko.yaml b/zuul.d/devstack-tobiko.yaml index f1b299d..beefc5c 100644 --- a/zuul.d/devstack-tobiko.yaml +++ b/zuul.d/devstack-tobiko.yaml @@ -14,11 +14,7 @@ periodic: &PERIODIC jobs: - devstack-tobiko - - devstack-tobiko-centos - - devstack-tobiko-fedora - devstack-tobiko-multinode - - devstack-tobiko-multinode-centos - - devstack-tobiko-multinode-fedora # --- STANDALONE ------------------------------------------------------------- @@ -95,18 +91,6 @@ ipv6_dns_nameservers: [] test_workflow: gate -- job: - name: devstack-tobiko-centos - parent: devstack-tobiko - nodeset: devstack-tobiko-centos - voting: false - -- job: - name: devstack-tobiko-fedora - parent: devstack-tobiko - nodeset: devstack-tobiko-fedora - voting: false - # --- MULTINODE -------------------------------------------------------------- @@ -189,15 +173,3 @@ # see bug #1860753 (https://bugs.launchpad.net/devstack/+bug/1860753) memory_tracker: false tls-proxy: false - -- job: - name: devstack-tobiko-multinode-centos - parent: devstack-tobiko-multinode - nodeset: devstack-tobiko-multinode-centos - voting: false - -- job: - name: devstack-tobiko-multinode-fedora - parent: devstack-tobiko-multinode - nodeset: devstack-tobiko-multinode-fedora - voting: false diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 71ba501..2da924a 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -4,7 +4,9 @@ templates: - ansible-role-jobs - devstack-tobiko + - devstack-tobiko-centos - devstack-tobiko-ceph + - devstack-tobiko-fedora - devstack-tobiko-glance - devstack-tobiko-heat - devstack-tobiko-minimal @@ -13,7 +15,3 @@ - devstack-tobiko-faults - devstack-tobiko-octavia - devstack-tobiko-ovs - experimental: - jobs: - - devstack-tobiko-minimal-fedora - - devstack-tobiko-minimal-centos