openstack/project-config
Code Issues Proposed changes

Refactor VPN functional tests to use common template

Browse Source 
This will change the existing functional test jobs to use a common job
template. To do this the following steps were taken:

- Make the jobs non-voting, so they don't break the gate. This means
  that reviewers need to check the non-voting results, prior to +A.

- Removed experimental functional jobs that were previously created,
  in neutron-vpnaas repos. These jobs were going to replace the existing
  ones (but do the same thing). Aborting that approach.

- Remove the experimental API job. A separate commit will add it back
  in, and use the new common template, as part of work to getting the
  API job working.

Partial-Bug: #1495584

Change-Id: I015bb7727676a68b1dfc3f04d10a80a308b00435
This commit is contained in:
Paul Michali 2015-11-02 15:37:03 -05:00
parent 973bfd8282
commit 22cb0da79a
3 changed files with 9 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
jenkins/jobs/neutron-vpnaas.yaml
View File

@ -1,5 +1,5 @@
- job-template:
name: '{pipeline}-neutron-vpnaas-dsvm-functional{job-suffix}'
name: '{pipeline}-neutron-vpnaas-dsvm-{vpnaastest}{job-suffix}'
node: '{node}'
wrappers:
@ -26,102 +26,12 @@
fi
function gate_hook {{
bash -xe $BASE/new/neutron-vpnaas/neutron_vpnaas/tests/contrib/gate_hook.sh dsvm-functional
bash -xe $BASE/new/neutron-vpnaas/neutron_vpnaas/tests/contrib/gate_hook.sh dsvm-{vpnaastest}
}}
export -f gate_hook
function post_test_hook {{
bash -xe $BASE/new/neutron-vpnaas/neutron_vpnaas/tests/contrib/post_test_hook.sh dsvm-functional
}}
export -f post_test_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
publishers:
- test-results
- devstack-logs
- console-log
- job-template:
name: '{pipeline}-neutron-vpnaas-dsvm-functional-sswan{job-suffix}'
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_UNSTACK=1
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_EXERCISES=0
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_INSTALL_TESTONLY=1
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
function gate_hook {{
bash -xe $BASE/new/neutron-vpnaas/neutron_vpnaas/tests/contrib/gate_hook.sh dsvm-functional-sswan
}}
export -f gate_hook
function post_test_hook {{
bash -xe $BASE/new/neutron-vpnaas/neutron_vpnaas/tests/contrib/post_test_hook.sh dsvm-functional-sswan
}}
export -f post_test_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
publishers:
- test-results
- devstack-logs
- console-log
- job-template:
name: '{pipeline}-neutron-vpnaas-test-dsvm-{vpnaastest}{job-suffix}'
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_UNSTACK=1
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_EXERCISES=0
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_INSTALL_TESTONLY=1
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
function gate_hook {{
bash -xe $BASE/new/neutron-vpnaas/neutron_vpnaas/tests/contrib/gate_hook.sh {vpnaastest}
}}
export -f gate_hook
function post_test_hook {{
bash -xe $BASE/new/neutron-vpnaas/neutron_vpnaas/tests/contrib/post_test_hook.sh {vpnaastest}
bash -xe $BASE/new/neutron-vpnaas/neutron_vpnaas/tests/contrib/post_test_hook.sh dsvm-{vpnaastest}
}}
export -f post_test_hook

20
jenkins/jobs/projects.yaml
View File

@ -3115,34 +3115,18 @@
- python-kilo-bitrot-jobs
- python-liberty-bitrot-jobs
- openstack-publish-jobs
- '{pipeline}-neutron-vpnaas-dsvm-functional{job-suffix}':
pipeline: gate
node: 'devstack-precise || devstack-trusty'
job-suffix: ''
branch-override: default
- '{pipeline}-neutron-vpnaas-dsvm-functional-sswan{job-suffix}':
pipeline: gate
node: 'devstack-precise || devstack-trusty'
job-suffix: ''
branch-override: default
- '{pipeline}-neutron-vpnaas-test-dsvm-{vpnaastest}{job-suffix}':
- '{pipeline}-neutron-vpnaas-dsvm-{vpnaastest}{job-suffix}':
pipeline: gate
node: 'devstack-precise || devstack-trusty'
vpnaastest: functional
job-suffix: ''
branch-override: default
- '{pipeline}-neutron-vpnaas-test-dsvm-{vpnaastest}{job-suffix}':
- '{pipeline}-neutron-vpnaas-dsvm-{vpnaastest}{job-suffix}':
pipeline: gate
node: 'devstack-precise || devstack-trusty'
vpnaastest: functional-sswan
job-suffix: ''
branch-override: default
- '{pipeline}-neutron-vpnaas-test-dsvm-{vpnaastest}{job-suffix}':
pipeline: gate
node: 'devstack-precise || devstack-trusty'
vpnaastest: api
job-suffix: ''
branch-override: default
- project:
name: nodepool

9
zuul/layout.yaml
View File

@ -1108,8 +1108,12 @@ jobs:
- name: ^gate-neutron-vpnaas-python34$
branch: ^(?!stable/(?:juno|kilo)).*$
- name: ^gate-neutron-vpnaas-dsvm-functional$
voting: false
- name: ^gate-neutron-vpnaas-dsvm-functional-sswan$
branch: ^(?!stable/juno).*$
voting: false
- name: ^gate-group-based-policy-dsvm-functional$
voting: false
@ -6423,12 +6427,7 @@ projects:
- gate-neutron-vpnaas-dsvm-functional-sswan
gate:
- gate-tempest-dsvm-neutron-full
- gate-neutron-vpnaas-dsvm-functional
- gate-neutron-vpnaas-dsvm-functional-sswan
experimental:
- gate-neutron-vpnaas-test-dsvm-api
- gate-neutron-vpnaas-test-dsvm-functional
- gate-neutron-vpnaas-test-dsvm-functional-sswan
- gate-grenade-dsvm-neutron-vpnaas
- gate-tempest-dsvm-neutron-pg-full
post: