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 ffd21cb823..e0e50e3ac3 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 @@ -1157,37 +1157,6 @@ - console-log -- job-template: - name: '{pipeline}-tempest-dsvm-trove-full{branch-designator}' - node: '{node}' - - wrappers: - - timeout: - timeout: 95 - fail: true - - timestamps - - builders: - - link-logs - - net-info - - devstack-checkout - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=90 - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_FULL=1 - export DEVSTACK_GATE_TROVE=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 - - job: name: gate-devstack-gate-unittests node: bare-precise @@ -1244,6 +1213,5 @@ - '{pipeline}-tempest-dsvm-all{branch-designator}' - '{pipeline}-tempest-dsvm-coverage{branch-designator}' - '{pipeline}-tempest-dsvm-stress{branch-designator}' - - '{pipeline}-tempest-dsvm-trove-full{branch-designator}' - '{pipeline}-tempest-dsvm-full-non-isolated{branch-designator}' - '{pipeline}-tempest-dsvm-neutron-full-non-isolated{branch-designator}' diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 29c9a5e85b..ade0fe848e 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -445,8 +445,6 @@ jobs: voting: false - name: ^(gate|check)-tempest-dsvm-sahara-neutron-nv$ voting: false - - name: ^(gate|check)-tempest-dsvm-trove-full$ - voting: false - name: gate-keystone-python33 voting: false - name: gate-marconi-python33 @@ -1054,10 +1052,6 @@ projects: - name: openstack-server-publish-jobs - name: check-requirements - name: integrated-gate - check: - - check-tempest-dsvm-trove-full - gate: - - gate-tempest-dsvm-trove-full post: - trove-upstream-translation-update pre-release: @@ -2157,7 +2151,6 @@ projects: - gate-grenade-dsvm-partial-ncpu experimental: - gate-grenade-dsvm-forward - - gate-tempest-dsvm-trove-full - check-tempest-dsvm-marconi - check-tempest-dsvm-virtual-ironic-nv experimental-tripleo: