Merge "Remove neutron isolated jobs"

This commit is contained in:
Jenkins 2014-03-05 00:01:02 +00:00 committed by Gerrit Code Review
commit 49870d0323
2 changed files with 4 additions and 87 deletions

View File

@ -209,40 +209,6 @@
- console-log
- job-template:
name: '{pipeline}-tempest-dsvm-neutron-isolated{branch-designator}'
node: '{node}'
wrappers:
- timeout:
timeout: 125
fail: true
- timestamps
builders:
- 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 DEVSTACK_GATE_CONFIGDRIVE=0
export DEVSTACK_GATE_SMOKE_SERIAL=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
- link-logs
publishers:
- devstack-logs
- console-log
- job-template:
name: '{pipeline}-tempest-dsvm-neutron-isolated-parallel{branch-designator}'
node: '{node}'
@ -274,39 +240,6 @@
- devstack-logs
- console-log
- job-template:
name: '{pipeline}-tempest-dsvm-neutron-pg-isolated{branch-designator}'
node: '{node}'
wrappers:
- timeout:
timeout: 125
fail: true
- timestamps
builders:
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_POSTGRES=1
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1
export DEVSTACK_GATE_SMOKE_SERIAL=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
- link-logs
publishers:
- devstack-logs
- console-log
- job-template:
name: '{pipeline}-tempest-dsvm-neutron-full{branch-designator}'

View File

@ -303,10 +303,6 @@ jobs:
- name: check-devstack-dsvm-neutron
branch: ^(?!stable/grizzly).*$
voting: false
- name: ^(gate|check)-tempest-dsvm-neutron-isolated$
branch: ^(?!stable/grizzly).*$
- name: ^(gate|check)-tempest-dsvm-neutron-pg-isolated$
branch: ^(?!stable/grizzly).*$
- name: ^(gate|check)-tempest-dsvm-neutron-full$
branch: ^(?!stable/grizzly).*$
voting: false
@ -955,26 +951,23 @@ projects:
- check-tempest-dsvm-neutron
- check-tempest-dsvm-neutron-full
- check-tempest-dsvm-neutron-pg
- check-tempest-dsvm-neutron-isolated
- check-tempest-dsvm-neutron-pg-isolated
- check-tempest-dsvm-neutron
- check-tempest-dsvm-neutron-pg
- gate-tempest-dsvm-neutron-large-ops
- check-grenade-dsvm-neutron
- check-devstack-dsvm-neutron
gate:
- gate-tempest-dsvm-neutron
- gate-tempest-dsvm-neutron-pg
- gate-tempest-dsvm-neutron-isolated
- gate-tempest-dsvm-neutron-pg-isolated
- gate-tempest-dsvm-neutron
- gate-tempest-dsvm-neutron-pg
- gate-tempest-dsvm-neutron-large-ops
experimental:
- check-tempest-dsvm-neutron-isolated-parallel
- gate-grenade-dsvm-neutron-forward
- neutron-upstream-translation-update
- check-neutron-dsvm-functional
- experimental-tempest-dsvm-neutron
- experimental-tempest-dsvm-neutron-pg
- experimental-tempest-dsvm-neutron-isolated
- experimental-tempest-dsvm-neutron-pg-isolated
experimental-tripleo:
- check-tripleo-seed-precise
- check-tripleo-undercloud-precise
@ -1018,8 +1011,6 @@ projects:
experimental:
- gate-grenade-dsvm-forward
- check-tempest-dsvm-neutron-pg
- check-tempest-dsvm-neutron-isolated
- check-tempest-dsvm-neutron-pg-isolated
experimental-tripleo:
- check-tripleo-seed-precise
- check-tripleo-undercloud-precise
@ -1499,8 +1490,6 @@ projects:
- check-tempest-dsvm-neutron
- check-tempest-dsvm-neutron-full
- check-tempest-dsvm-neutron-pg
- check-tempest-dsvm-neutron-isolated
- check-tempest-dsvm-neutron-pg-isolated
- gate-tempest-dsvm-large-ops
- gate-tempest-dsvm-neutron-large-ops
- check-grenade-dsvm
@ -1511,8 +1500,6 @@ projects:
- gate-tempest-dsvm-postgres-full
- gate-tempest-dsvm-neutron
- gate-tempest-dsvm-neutron-pg
- gate-tempest-dsvm-neutron-isolated
- gate-tempest-dsvm-neutron-pg-isolated
- gate-tempest-dsvm-large-ops
- gate-tempest-dsvm-neutron-large-ops
- gate-grenade-dsvm
@ -2301,8 +2288,6 @@ projects:
- gate-grenade-dsvm-forward
- gate-tempest-dsvm-trove-full
- check-tempest-dsvm-marconi
- check-tempest-dsvm-neutron-isolated
- check-tempest-dsvm-neutron-pg-isolated
experimental-tripleo:
- check-tripleo-seed-precise
- check-tripleo-undercloud-precise
@ -2546,7 +2531,6 @@ projects:
- gate-grenade-dsvm-forward
- gate-swift-dsvm-functional
experimental:
- check-tempest-dsvm-neutron-isolated
- gate-grenade-dsvm-forward
- name: openstack-dev/grenade