Merge "Constraints jobs non-voting for neutron-vpnaas"

This commit is contained in:
Jenkins 2016-01-13 18:30:14 +00:00 committed by Gerrit Code Review
commit 87b7e1ab81
2 changed files with 22 additions and 51 deletions

View File

@ -1624,43 +1624,6 @@
- console-log
- job-template:
name: '{pipeline}-grenade-dsvm-neutron-vpnaas{job-suffix}'
node: '{node}'
wrappers:
- build-timeout:
timeout: 130
- timestamps
builders:
- print-template-name:
template-name: "{template-name}"
- link-logs
- net-info
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PROJECTS="openstack-dev/grenade $PROJECTS"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_GRENADE=pullup
export DEVSTACK_GATE_NEUTRON=1
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export GRENADE_PLUGINRC="enable_grenade_plugin neutron-vpnaas https://git.openstack.org/openstack/neutron-vpnaas"
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-partial-ncpu{job-suffix}'
node: '{node}'

View File

@ -1083,9 +1083,6 @@ jobs:
branch: ^(stable/).*$
voting: false
- name: ^gate-grenade-dsvm-neutron-vpnaas
voting: false
- name: gate-devstack-dsvm-updown
branch: ^(?!stable)
@ -1225,9 +1222,6 @@ jobs:
- name: ^gate-neutron-lbaas-python34$
branch: ^(?!stable/kilo).*$
- name: ^gate-neutron-vpnaas-python34$
branch: ^(?!stable/kilo).*$
- name: ^gate-group-based-policy-dsvm-functional$
voting: false
@ -2140,6 +2134,22 @@ jobs:
- name: neutron-branch-tarball
branch: ^(?:stable/kilo).*$
# TODO(pcm): When voting, only run non-constraint jobs on Kilo
# For now, make constraints jobs non-voting
- name: ^gate-neutron-vpnaas-.*-constraints$
voting: false
- name: ^neutron-vpnaas-docs-constraints$
voting: false
# Run the non-constraints coverage on Kilo
- name: neutron-vpnaas-coverage
branch: ^(?:stable/kilo).*$
# Don't run python34 on Kilo
- name: ^gate-neutron-vpnaas-python34$
branch: ^(?!stable/kilo).*$
- name: gate-nova-python27-constraints
voting: false
@ -6740,20 +6750,18 @@ projects:
- gate-tempest-dsvm-neutron-full
- gate-neutron-vpnaas-dsvm-functional
- gate-neutron-vpnaas-dsvm-functional-sswan
gate:
- gate-tempest-dsvm-neutron-full
- gate-neutron-vpnaas-dsvm-functional
- gate-neutron-vpnaas-dsvm-functional-sswan
experimental:
# New constraints jobs
- gate-neutron-vpnaas-pep8-constraints
- gate-neutron-vpnaas-docs-constraints
- gate-neutron-vpnaas-python27-constraints
- gate-neutron-vpnaas-python34-constraints
# Will be 'post' job
- neutron-vpnaas-coverage-constraints
gate:
- gate-tempest-dsvm-neutron-full
- gate-neutron-vpnaas-dsvm-functional
- gate-neutron-vpnaas-dsvm-functional-sswan
post:
- neutron-vpnaas-coverage
- neutron-vpnaas-coverage-constraints
- neutron-vpnaas-docs-constraints
- name: openstack/nomad
template: