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 0125678ddd..4c8e410d09 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 @@ -344,37 +344,6 @@ - console-log -- job-template: - name: '{pipeline}-tempest-dsvm-neutron-isolated-parallel{branch-designator}' - node: '{node}' - - wrappers: - - build-timeout: - timeout: 125 - - 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_NEUTRON=1 - export DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=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-dvr{branch-designator}' node: '{node}' @@ -1523,7 +1492,6 @@ - '{pipeline}-tempest-dsvm-neutron{branch-designator}' - '{pipeline}-tempest-master-dsvm-neutron{branch-designator}' - '{pipeline}-tempest-dsvm-neutron-pg{branch-designator}' - - '{pipeline}-tempest-dsvm-neutron-isolated-parallel{branch-designator}' - '{pipeline}-tempest-dsvm-neutron-dvr{branch-designator}' - '{pipeline}-tempest-dsvm-neutron-full{branch-designator}' - '{pipeline}-tempest-dsvm-neutron-pg-full{branch-designator}'