diff --git a/jenkins/jobs/neutron-lbaas.yaml b/jenkins/jobs/neutron-lbaas.yaml index db67fc4e5c..46256426e3 100644 --- a/jenkins/jobs/neutron-lbaas.yaml +++ b/jenkins/jobs/neutron-lbaas.yaml @@ -1,5 +1,5 @@ - job-template: - name: '{pipeline}-neutron-lbaas-dsvm-api{branch-designator}' + name: '{pipeline}-neutron-{lbaasversion}-dsvm-api{branch-designator}' node: '{node}' wrappers: @@ -26,12 +26,12 @@ fi function gate_hook {{ - $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh + $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh {lbaasversion} }} export -f gate_hook function post_test_hook {{ - $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh + $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh {lbaasversion} }} export -f post_test_hook diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index a8d5ce7b94..57aa88e8e7 100755 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -506,16 +506,30 @@ jobs: - python-jobs - openstack-publish-jobs - - '{pipeline}-neutron-lbaas-dsvm-api{branch-designator}': + - '{pipeline}-neutron-{lbaasversion}-dsvm-api{branch-designator}': pipeline: check node: 'devstack-precise || devstack-trusty' branch-designator: '' branch-override: default - - '{pipeline}-neutron-lbaas-dsvm-api{branch-designator}': + lbaasversion: lbaasv2 + - '{pipeline}-neutron-{lbaasversion}-dsvm-api{branch-designator}': + pipeline: check + node: 'devstack-precise || devstack-trusty' + branch-designator: '' + branch-override: default + lbaasversion: lbaasv1 + - '{pipeline}-neutron-{lbaasversion}-dsvm-api{branch-designator}': pipeline: gate node: 'devstack-precise || devstack-trusty' branch-designator: '' branch-override: default + lbaasversion: lbaasv2 + - '{pipeline}-neutron-{lbaasversion}-dsvm-api{branch-designator}': + pipeline: gate + node: 'devstack-precise || devstack-trusty' + branch-designator: '' + branch-override: default + lbaasversion: lbaasv1 - project: name: neutron-specs diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 614f2167a5..eb8c7f33fd 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -770,7 +770,10 @@ jobs: - name: ^check-neutron-fwaas-dsvm-functional$ voting: false - - name: ^(check|gate)-neutron-lbaas-dsvm-api$ + - name: ^(check|gate)-neutron-lbaasv1-dsvm-api$ + voting: false + + - name: ^(check|gate)-neutron-lbaasv2-dsvm-api$ branch: ^(?!stable/(?:icehouse|juno)).*$ voting: false @@ -1940,12 +1943,11 @@ projects: - check-neutron-dsvm-functional - gate-rally-dsvm-neutron-neutron - check-tempest-dsvm-neutron-dvr - - check-neutron-lbaas-dsvm-api + - check-neutron-lbaasv2-dsvm-api - check-tempest-dsvm-neutron-large-ops gate: - gate-neutron-dsvm-api - gate-neutron-dsvm-functional - - gate-neutron-lbaas-dsvm-api - gate-tempest-dsvm-neutron-large-ops post: - neutron-coverage @@ -1972,9 +1974,9 @@ projects: - name: python-jobs - name: openstack-server-release-jobs check: - - check-neutron-lbaas-dsvm-api - gate: - - gate-neutron-lbaas-dsvm-api + - check-neutron-lbaasv2-dsvm-api + experimental: + - check-neutron-lbaasv1-dsvm-api - name: openstack/neutron-specs template: