openstack/project-config
Code Issues Proposed changes

Merge "Run Heat functional tests in Identity v3-only"

Browse Source
This commit is contained in:
Jenkins 2016-06-23 14:05:53 +00:00 committed by Gerrit Code Review
commit b9b6d88b16
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jenkins/jobs/heat.yaml
View File

@ -55,7 +55,7 @@
- console-log
- job-template:
name: '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{job-suffix}'
name: '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{special}{job-suffix}'
node: '{node}'
wrappers:
@ -129,7 +129,9 @@
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
if [ "{special}" == "-identity-v3-only" ] ; then
export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
fi
function pre_test_hook {{
cd /opt/stack/new/heat/heat_integrationtests
./pre_test_hook.sh

24
jenkins/jobs/projects.yaml
View File

@ -2363,47 +2363,61 @@
jobs:
- python-db-jobs
- '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{job-suffix}':
- '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{special}{job-suffix}':
datastore: mysql
pipeline: gate
node: ubuntu-trusty
special: ''
job-suffix: ''
branch-override: default
engine: orig
lbaasversion: lbaasv1
- '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{job-suffix}':
- '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{special}{job-suffix}':
datastore: mysql
pipeline: gate
node: ubuntu-trusty
special: ''
job-suffix: ''
branch-designator: ''
branch-override: default
engine: orig
lbaasversion: lbaasv2
- '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{job-suffix}':
- '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{special}{job-suffix}':
datastore: postgres
pipeline: gate
node: ubuntu-trusty
special: ''
job-suffix: ''
branch-override: default
engine: orig
lbaasversion: lbaasv1
- '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{job-suffix}':
- '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{special}{job-suffix}':
datastore: mysql
pipeline: gate
node: ubuntu-trusty
special: ''
job-suffix: ''
branch-override: default
engine: convg
lbaasversion: lbaasv1
- '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{job-suffix}':
- '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{special}{job-suffix}':
datastore: mysql
pipeline: gate
node: ubuntu-trusty
special: ''
job-suffix: ''
branch-override: default
engine: convg
lbaasversion: lbaasv2
- '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{special}{job-suffix}':
datastore: mysql
pipeline: gate
node: ubuntu-trusty
special: '-identity-v3-only'
job-suffix: '-nv'
branch-override: default
engine: orig
lbaasversion: lbaasv1
- '{pipeline}-tempest-dsvm-heat{job-suffix}':
pipeline: gate
node: ubuntu-trusty

1
zuul/layout.yaml
View File

@ -6989,6 +6989,7 @@ projects:
periodic:
- gate-rally-dsvm-fakevirt-heat
experimental:
- gate-heat-dsvm-functional-orig-mysql-lbaasv1-identity-v3-only-nv
- gate-rally-dsvm-fakevirt-heat
- gate-heat-dsvm-functional-orig-postgres-lbaasv1