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 0d3ca1130a..d24a177bf2 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 @@ -882,6 +882,74 @@ - console-log +- job-template: + name: '{pipeline}-tempest-dsvm-keystonev3-full{branch-designator}' + node: '{node}' + + wrappers: + - timeout: + timeout: 185 + fail: true + - timestamps + + builders: + - link-logs + - net-info + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=180 + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_FULL=1 + export DEVSTACK_GATE_KEYSTONE_V3=1 + export BRANCH_OVERRIDE={branch-override} + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + + publishers: + - devstack-logs + - console-log + + +- job-template: + name: '{pipeline}-tempest-dsvm-neutron-keystonev3-full{branch-designator}' + node: '{node}' + + wrappers: + - timeout: + timeout: 125 + fail: true + - timestamps + + builders: + - link-logs + - net-info + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=120 + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_TESTR_FULL=1 + export DEVSTACK_GATE_NEUTRON=1 + export DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1 + export DEVSTACK_GATE_KEYSTONE_V3=1 + export BRANCH_OVERRIDE={branch-override} + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + + publishers: + - devstack-logs + - console-log + + - job-template: name: '{pipeline}-grenade-dsvm' node: '{node}' @@ -1284,3 +1352,5 @@ - '{pipeline}-tempest-dsvm-stress{branch-designator}' - '{pipeline}-tempest-dsvm-full-non-isolated{branch-designator}' - '{pipeline}-tempest-dsvm-neutron-full-non-isolated{branch-designator}' + - '{pipeline}-tempest-dsvm-keystonev3-full{branch-designator}' + - '{pipeline}-tempest-dsvm-neutron-keystonev3-full{branch-designator}' diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 23e5df8e35..fc45090e46 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -2171,6 +2171,8 @@ projects: - gate-grenade-dsvm-forward - check-tempest-dsvm-marconi - check-tempest-dsvm-virtual-ironic-nv + - check-tempest-dsvm-keystonev3-full + - check-tempest-dsvm-neutron-keystonev3-full experimental-tripleo: - check-tripleo-seed-precise - check-tripleo-ironic-seed-precise