diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 98b8a438..ccf2cb0a 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -524,17 +524,6 @@ load_balancer: loadbalancer_topology: ACTIVE_STANDBY -- job: - name: octavia-v2-act-stdby-dsvm-py2-scenario-two-node - parent: octavia-v2-act-stdby-dsvm-scenario-two-node - host-vars: - controller: - devstack_localrc: - USE_PYTHON3: False - controller2: - devstack_localrc: - USE_PYTHON3: False - - job: name: octavia-v2-dsvm-py2-scenario-centos-7 parent: octavia-v2-dsvm-py2-scenario @@ -782,13 +771,6 @@ tempest_test_regex: ^octavia_tempest_plugin.tests.act_stdby_scenario.v2.test_active_standby\. tox_envlist: all -- job: - name: octavia-v2-act-stdby-dsvm-py2-scenario - parent: octavia-v2-act-stdby-dsvm-scenario - vars: - devstack_localrc: - USE_PYTHON3: False - - job: name: octavia-v2-act-stdby-dsvm-scenario-stable-train parent: octavia-v2-act-stdby-dsvm-scenario diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 6b363fe4..965f9618 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -9,35 +9,27 @@ check: jobs: - octavia-v2-dsvm-noop-api - - octavia-v2-dsvm-noop-py2-api - octavia-v2-dsvm-noop-api-stable-train - octavia-v2-dsvm-noop-api-stable-stein - octavia-v2-dsvm-noop-py2-api-stable-rocky - octavia-v2-dsvm-noop-py2-api-stable-queens - octavia-v2-dsvm-scenario - - octavia-v2-dsvm-py2-scenario - octavia-v2-dsvm-scenario-stable-train - octavia-v2-dsvm-scenario-stable-stein - octavia-v2-dsvm-py2-scenario-stable-rocky - octavia-v2-dsvm-py2-scenario-stable-queens - octavia-v2-dsvm-scenario-ipv6-only: voting: false - - octavia-v2-dsvm-scenario-centos-7: - voting: false - octavia-v2-dsvm-scenario-ubuntu-bionic: voting: false - octavia-v2-act-stdby-dsvm-scenario-two-node: voting: false - - octavia-v2-act-stdby-dsvm-py2-scenario-two-node: - voting: false - octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-rocky: voting: false - octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-queens: voting: false - octavia-v2-act-stdby-dsvm-scenario: voting: false - - octavia-v2-act-stdby-dsvm-py2-scenario: - voting: false - octavia-v2-act-stdby-dsvm-scenario-stable-train: voting: false - octavia-v2-act-stdby-dsvm-scenario-stable-stein: @@ -54,8 +46,6 @@ voting: false - octavia-v2-dsvm-spare-pool: voting: false - - octavia-v2-dsvm-py2-spare-pool: - voting: false - octavia-v2-dsvm-spare-pool-stable-train: voting: false - octavia-v2-dsvm-spare-pool-stable-stein: @@ -71,13 +61,11 @@ queue: octavia jobs: - octavia-v2-dsvm-noop-api - - octavia-v2-dsvm-noop-py2-api - octavia-v2-dsvm-noop-api-stable-train - octavia-v2-dsvm-noop-api-stable-stein - octavia-v2-dsvm-noop-py2-api-stable-rocky - octavia-v2-dsvm-noop-py2-api-stable-queens - octavia-v2-dsvm-scenario - - octavia-v2-dsvm-py2-scenario - octavia-v2-dsvm-scenario-stable-train - octavia-v2-dsvm-scenario-stable-stein - octavia-v2-dsvm-py2-scenario-stable-rocky