Add a shade functional test for keystone v2
Our functional tests should work against both keystone v2 and keystone v3. devstack now runs with both, so modify clouds.yaml to request v2 instead of v3. Change-Id: Ie58af3e9eeca301fbf25e0170e011c9dd10235c2
This commit is contained in:
parent
c340b3e9d6
commit
8dc3804bf6
@ -4947,6 +4947,11 @@
|
||||
- python-jobs
|
||||
- pypi-jobs
|
||||
- infra-publish-jobs
|
||||
- '{pipeline}-shade-dsvm-functional-keystone2{branch-designator}':
|
||||
pipeline: gate
|
||||
node: 'devstack-precise || devstack-trusty'
|
||||
branch-designator: ''
|
||||
branch-override: default
|
||||
- '{pipeline}-shade-dsvm-functional-neutron{branch-designator}':
|
||||
pipeline: gate
|
||||
node: 'devstack-precise || devstack-trusty'
|
||||
|
@ -1,3 +1,41 @@
|
||||
- job-template:
|
||||
name: '{pipeline}-shade-dsvm-functional-keystone2{branch-designator}'
|
||||
node: '{node}'
|
||||
|
||||
wrappers:
|
||||
- build-timeout:
|
||||
timeout: 65
|
||||
- timestamps
|
||||
|
||||
builders:
|
||||
- link-logs
|
||||
- net-info
|
||||
- devstack-checkout
|
||||
- shell: |
|
||||
#!/bin/bash -xe
|
||||
export PYTHONUNBUFFERED=true
|
||||
export DEVSTACK_GATE_TIMEOUT=60
|
||||
export DEVSTACK_GATE_NEUTRON=1
|
||||
export PROJECTS="openstack-infra/shade $PROJECTS"
|
||||
export BRANCH_OVERRIDE={branch-override}
|
||||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||
fi
|
||||
|
||||
function post_test_hook {{
|
||||
$BASE/new/shade/shade/tests/functional/hooks/post_test_hook.sh
|
||||
}}
|
||||
export -f post_test_hook
|
||||
|
||||
sed -ie 's/identity_api_version: 3/identity_api_version: 2.0/g' ~/.config/openstack/clouds.yaml
|
||||
sed -ie '/^.*domain_id.*$/d' ~/.config/openstack/clouds.yaml
|
||||
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}-shade-dsvm-functional-neutron{branch-designator}'
|
||||
node: '{node}'
|
||||
|
@ -6912,10 +6912,12 @@ projects:
|
||||
- name: infra-publish-jobs
|
||||
check:
|
||||
- shade-coverage
|
||||
- gate-shade-dsvm-functional-keystone2
|
||||
- gate-shade-dsvm-functional-neutron
|
||||
- gate-shade-dsvm-functional-nova
|
||||
- gate-dsvm-nodepool-src-shade
|
||||
gate:
|
||||
- gate-shade-dsvm-functional-keystone2
|
||||
- gate-shade-dsvm-functional-neutron
|
||||
- gate-shade-dsvm-functional-nova
|
||||
post:
|
||||
|
Loading…
x
Reference in New Issue
Block a user