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 b0521bc7ef..c9b17e9889 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 @@ -125,6 +125,38 @@ - devstack-logs - console-log +- job-template: + name: '{pipeline}-tempest-dsvm-full-apache-services{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_FULL=1 + export DEVSTACK_GATE_USE_APACHE=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-master-dsvm-full{branch-designator}' node: '{node}' @@ -1238,3 +1270,4 @@ - '{pipeline}-tempest-dsvm-neutron-full-non-isolated{branch-designator}' - '{pipeline}-tempest-dsvm-keystonev3-full{branch-designator}' - '{pipeline}-tempest-dsvm-neutron-keystonev3-full{branch-designator}' + - '{pipeline}-tempest-dsvm-full-apache-services{branch-designator}'