networking-odl: add experimental job with new vpnservice with
Add experimental job with new netvirt(vpnservice) + v2 driver by adding a new parameter to specify opendaylight openstack service provider to use. This patch consolidates the logic a bit. Depends-On: Icb8ff1f3731b125074cab23bc4037b4a17607119 Change-Id: Ic09bc60ea2fe3665db51a21eb8259341d97f9894
This commit is contained in:
Isaku Yamahata
parent
b63283e583
commit
386baacfbe
|
|
@ -1,5 +1,5 @@
|
|||
- job-template:
|
||||
name: '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}-{driver-version}{suffix}'
|
||||
name: '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}-{odl-provider}{driver-version}{suffix}'
|
||||
node: '{node}'
|
||||
|
||||
wrappers:
|
||||
|
|
@ -41,6 +41,7 @@
|
|||
# specify ODL release to use
|
||||
export ODL_RELEASE_BASE={odl-release-base}
|
||||
export ODL_GATE_V2DRIVER={driver-version}
|
||||
export ODL_GATE_SERVICE_PROVIDER={odl-provider}
|
||||
export ODL_TEST_SUFFIX={suffix}
|
||||
|
||||
function pre_test_hook {{
|
||||
|
|
@ -66,74 +67,6 @@
|
|||
- devstack-logs
|
||||
- console-log
|
||||
|
||||
- job-template:
|
||||
name: '{pipeline}-tempest-dsvm-networking-odl-new-{odl-release-base}{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 PYTHONUNBUFFERED=true
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
# Make sure tempest is installed, but run it out of the post_test_hooks.sh
|
||||
# script from the networking-odl repository.
|
||||
export DEVSTACK_GATE_TEMPEST=1
|
||||
export DEVSTACK_GATE_TEMPEST_NOTESTS=1
|
||||
|
||||
export BRANCH_OVERRIDE={branch-override}
|
||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||
fi
|
||||
# Because we are testing a non standard project, add
|
||||
# our project repository. This makes zuul do the right
|
||||
# reference magic for testing changes.
|
||||
export PROJECTS="openstack/networking-odl $PROJECTS"
|
||||
# Note the actual url here is somewhat irrelevant because it
|
||||
# caches in nodepool, however make it a valid url for
|
||||
# documentation purposes.
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-odl git://git.openstack.org/openstack/networking-odl"
|
||||
|
||||
# Keep localrc to be able to set some vars in pre_test_hook
|
||||
export KEEP_LOCALRC=1
|
||||
|
||||
# specify ODL release to use
|
||||
export ODL_RELEASE_BASE={odl-release-base}
|
||||
export ODL_GATE_SERVICE_PROVIDER="vpnservice"
|
||||
export ODL_GATE_V2DRIVER=v2driver
|
||||
|
||||
function pre_test_hook {{
|
||||
if [ -f $BASE/new/networking-odl/devstack/pre_test_hook.sh ] ; then
|
||||
. $BASE/new/networking-odl/devstack/pre_test_hook.sh
|
||||
fi
|
||||
}}
|
||||
export -f pre_test_hook
|
||||
|
||||
function post_test_hook {{
|
||||
if [ -f $BASE/new/networking-odl/devstack/post_test_hook.sh ] ; then
|
||||
. $BASE/new/networking-odl/devstack/post_test_hook.sh
|
||||
fi
|
||||
}}
|
||||
export -f post_test_hook
|
||||
|
||||
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-odl/devstack/devstackgaterc
|
||||
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}-rally-dsvm-networking-odl-{odl-release-base}{suffix}'
|
||||
node: '{node}'
|
||||
|
|
|
|||
|
|
@ -7236,56 +7236,65 @@
|
|||
- translation-jobs
|
||||
- openstack-releasenotes-jobs
|
||||
- pypi-jobs
|
||||
- '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}-{driver-version}{suffix}':
|
||||
- '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}-{odl-provider}{driver-version}{suffix}':
|
||||
pipeline: gate
|
||||
node: ubuntu-trusty
|
||||
suffix: '-mitaka-nv'
|
||||
odl-provider: ''
|
||||
driver-version: 'v1driver'
|
||||
odl-release-base:
|
||||
- 'beryllium-snapshot'
|
||||
- 'boron-snapshot'
|
||||
- 'carbon-snapshot'
|
||||
branch-override: stable/mitaka
|
||||
- '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}-{driver-version}{suffix}':
|
||||
- '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}-{odl-provider}{driver-version}{suffix}':
|
||||
pipeline: periodic
|
||||
node: ubuntu-trusty
|
||||
suffix: '-mitaka'
|
||||
odl-provider: ''
|
||||
driver-version: 'v1driver'
|
||||
odl-release-base: 'boron-snapshot'
|
||||
branch-override: stable/mitaka
|
||||
# tempest-dsvm-networking-odl-{odl-release-base} is for newton+
|
||||
- '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}-{driver-version}{suffix}':
|
||||
- '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}-{odl-provider}{driver-version}{suffix}':
|
||||
pipeline: gate
|
||||
node: ubuntu-xenial
|
||||
suffix: '-nv'
|
||||
odl-provider: ''
|
||||
driver-version: 'v2driver'
|
||||
odl-release-base:
|
||||
- 'carbon-snapshot'
|
||||
branch-override: default
|
||||
# NOTE(mkolesni): Keep this for checking latest ODL with V1 until we drop
|
||||
# the V1 driver support.
|
||||
- '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}-{driver-version}{suffix}':
|
||||
- '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}-{odl-provider}{driver-version}{suffix}':
|
||||
pipeline: gate
|
||||
node: ubuntu-xenial
|
||||
suffix: ''
|
||||
odl-provider: ''
|
||||
driver-version: 'v1driver'
|
||||
odl-release-base:
|
||||
- 'carbon-snapshot'
|
||||
branch-override: default
|
||||
- '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}-{driver-version}{suffix}':
|
||||
- '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}-{odl-provider}{driver-version}{suffix}':
|
||||
pipeline: gate
|
||||
node: ubuntu-xenial
|
||||
suffix: ''
|
||||
odl-provider: ''
|
||||
driver-version: 'v2driver'
|
||||
odl-release-base:
|
||||
- 'beryllium-snapshot'
|
||||
- 'boron-snapshot'
|
||||
- 'carbon-snapshot'
|
||||
branch-override: default
|
||||
- '{pipeline}-tempest-dsvm-networking-odl-new-{odl-release-base}{suffix}':
|
||||
- '{pipeline}-tempest-dsvm-networking-odl-{odl-release-base}-{odl-provider}{driver-version}{suffix}':
|
||||
pipeline: gate
|
||||
node: ubuntu-xenial
|
||||
suffix: '-nv'
|
||||
odl-provider: 'vpnservice-'
|
||||
driver-version:
|
||||
- 'v1driver'
|
||||
- 'v2driver'
|
||||
odl-release-base:
|
||||
- 'boron-snapshot'
|
||||
- 'carbon-snapshot'
|
||||
|
|
|
|||
|
|
@ -12129,8 +12129,10 @@ projects:
|
|||
- networking-odl-coverage-ubuntu-trusty
|
||||
- networking-odl-coverage-ubuntu-xenial
|
||||
experimental:
|
||||
- gate-tempest-dsvm-networking-odl-new-boron-snapshot-nv
|
||||
- gate-tempest-dsvm-networking-odl-new-carbon-snapshot-nv
|
||||
- gate-tempest-dsvm-networking-odl-boron-snapshot-vpnservice-v1driver-nv
|
||||
- gate-tempest-dsvm-networking-odl-boron-snapshot-vpnservice-v2driver-nv
|
||||
- gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v1driver-nv
|
||||
- gate-tempest-dsvm-networking-odl-carbon-snapshot-vpnservice-v2driver-nv
|
||||
post:
|
||||
- networking-odl-coverage-ubuntu-trusty
|
||||
- networking-odl-coverage-ubuntu-xenial
|
||||
|
|
|
|||
Loading…
Reference in New Issue