diff --git a/.zuul.yaml b/.zuul.yaml index 053dc7d4613..a26030c42a8 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -11,7 +11,6 @@ - publish-openstack-docs-pti - periodic-stable-jobs - check-requirements - - integrated-gate-networking - release-notes-jobs-python3 check: jobs: @@ -22,8 +21,7 @@ - neutron-tempest-linuxbridge - neutron-grenade-multinode - neutron-grenade-dvr-multinode - - tempest-multinode-full-py3: - voting: false + - tempest-integrated-networking: # We don't run the job on things like neutron docs-only changes irrelevant-files: &tempest-irrelevant-files - ^(test-|)requirements.txt$ @@ -37,6 +35,9 @@ - ^tox.ini$ - ^vagrant/.*$ - ^migration/.*$ + - tempest-multinode-full-py3: + voting: false + irrelevant-files: *tempest-irrelevant-files - neutron-tempest-dvr-ha-multinode-full - neutron-tempest-iptables_hybrid - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa: @@ -48,8 +49,6 @@ - networking-midonet-tempest-aio-ml2-centos-7: voting: false irrelevant-files: *tempest-irrelevant-files - - grenade-py3: - irrelevant-files: *tempest-irrelevant-files - tempest-ipv6-only: irrelevant-files: *tempest-irrelevant-files - openstacksdk-functional-devstack-networking: @@ -78,6 +77,7 @@ jobs: - neutron-functional - neutron-fullstack + - tempest-integrated-networking - neutron-tempest-dvr - neutron-tempest-linuxbridge - neutron-tempest-iptables_hybrid @@ -85,8 +85,6 @@ - neutron-grenade-dvr-multinode - tempest-slow-py3: irrelevant-files: *tempest-irrelevant-files - - grenade-py3: - irrelevant-files: *tempest-irrelevant-files - tempest-ipv6-only: irrelevant-files: *tempest-irrelevant-files #- neutron-ovn-tempest-ovs-release diff --git a/doc/source/contributor/testing/ci_scenario_jobs.rst b/doc/source/contributor/testing/ci_scenario_jobs.rst index d6bb160259b..8bfdd4b4f7b 100644 --- a/doc/source/contributor/testing/ci_scenario_jobs.rst +++ b/doc/source/contributor/testing/ci_scenario_jobs.rst @@ -109,8 +109,6 @@ Below is summary of those jobs. | Job name | python | nodes | L2 agent | firewall | L3 agent | L3 HA | L3 DVR | enable_dvr | Run in gate | | | version | | | driver | mode | | | | queue | +================================+=========+=======+=============+=============+==========+=======+========+============+=============+ - | grenade-py3 | 3.6 | 1 | openvswitch | openvswitch | legacy | False | False | True | Yes | - +--------------------------------+---------+-------+-------------+-------------+----------+-------+--------+------------+-------------+ | neutron-grenade-multinode | 3.6 | 2 | openvswitch | openvswitch | legacy | False | False | True | Yes | +--------------------------------+---------+-------+-------------+-------------+----------+-------+--------+------------+-------------+ | neutron-grenade-dvr-multinode | 3.6 | 2 | openvswitch | openvswitch | dvr | False | False | True | Yes |