diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml index 315e385daf..5480b56864 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml @@ -29,7 +29,7 @@ - job-template: - name: '{pipeline}-tempest-dsvm-heat-slow{branch-designator}' + name: '{pipeline}-tempest-dsvm-neutron-heat-slow{branch-designator}' node: '{node}' wrappers: @@ -44,6 +44,7 @@ #!/bin/bash -xe export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_TEMPEST_HEAT_SLOW=1 export BRANCH_OVERRIDE={branch-override} if [ "$BRANCH_OVERRIDE" != "default" ] ; then @@ -659,7 +660,7 @@ - '{pipeline}-tempest-dsvm-neutron-large-ops{branch-designator}' - '{pipeline}-tempest-dsvm-postgres{branch-designator}' - '{pipeline}-tempest-dsvm-postgres-full{branch-designator}' - - '{pipeline}-tempest-dsvm-heat-slow{branch-designator}' + - '{pipeline}-tempest-dsvm-neutron-heat-slow{branch-designator}' - '{pipeline}-tempest-dsvm-postgres-zeromq-full{branch-designator}' - '{pipeline}-grenade-dsvm' - '{pipeline}-tempest-dsvm-savanna-full{branch-designator}' diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 3adaef310a..5af087967d 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -118,7 +118,7 @@ jobs: - name: ^(gate|check)-tempest-dsvm-neutron-full$ branch: ^(?!stable/grizzly).*$ voting: false - - name: gate-tempest-dsvm-heat-slow + - name: gate-tempest-dsvm-neutron-heat-slow branch: ^(?!stable/grizzly).*$ voting: false - name: ^(gate|check)-devstack-dsvm-cells$ @@ -1663,7 +1663,7 @@ projects: - gate-grenade-dsvm - gate-swift-dsvm-functional experimental: - - gate-tempest-dsvm-heat-slow + - gate-tempest-dsvm-neutron-heat-slow - gate-grenade-dsvm-stable - gate-devstack-dsvm-cells @@ -1751,7 +1751,7 @@ projects: - gate-tempest-dsvm-neutron-large-ops - gate-grenade-dsvm experimental: - - gate-tempest-dsvm-heat-slow + - gate-tempest-dsvm-neutron-heat-slow - gate-grenade-dsvm-stable - gate-devstack-dsvm-cells - gate-tempest-dsvm-neutron-full