openstack/project-config
Code Issues Proposed changes

Merge "Add heat lbaas specific test for v1 and v2"

Browse Source
This commit is contained in:
Jenkins 2016-02-19 12:16:35 +00:00 committed by Gerrit Code Review
commit 38d0862d27
3 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
jenkins/jobs/heat.yaml
View File

@ -54,7 +54,7 @@
- console-log
- job-template:
name: '{pipeline}-heat-dsvm-functional-{engine}-{datastore}{job-suffix}'
name: '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{job-suffix}'
node: '{node}'
wrappers:
@ -69,7 +69,13 @@
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
services=c-api,c-bak,c-sch,c-vol,cinder,dstat,g-api,g-reg,h-api,h-api-cfn,h-api-cw,h-eng,heat,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,q-vpn,rabbit,s-account,s-container,s-object,s-proxy,q-lbaas,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-anotification
services=c-api,c-bak,c-sch,c-vol,cinder,dstat,g-api,g-reg,h-api
services+=,h-api-cfn,h-api-cw,h-eng,heat,key,mysql,n-api,n-cond
services+=,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering
services+=,q-svc,q-vpn,rabbit,s-account,s-container,s-object,s-proxy
services+=,ceilometer-acompute,ceilometer-acentral
services+=,ceilometer-collector,ceilometer-api
services+=,ceilometer-anotification
# n-obj has been removed from mitaka
if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then
services+=,n-obj,
@ -91,6 +97,20 @@
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
fi
if [ "{lbaasversion}" = "lbaasv2" ]; then
# Enable LBaaS V2 plugin
export PROJECTS="openstack/neutron-lbaas $PROJECTS"
services+=",q-lbaasv2"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
# Enable default recommended implementation for LBaaS v2, Octavia
export PROJECTS="openstack/octavia $PROJECTS"
services+=",octavia,o-cw,o-hk,o-hm,o-api"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin octavia https://git.openstack.org/openstack/octavia"
else
services+=",q-lbaas"
fi
export OVERRIDE_ENABLED_SERVICES=$services
if [ "{datastore}" == "postgres" ] ; then

26
jenkins/jobs/projects.yaml
View File

@ -2009,27 +2009,47 @@
jobs:
- python-jobs
- '{pipeline}-heat-dsvm-functional-{engine}-{datastore}{job-suffix}':
- '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{job-suffix}':
datastore: mysql
pipeline: gate
node: devstack-trusty
job-suffix: ''
branch-override: default
engine: orig
- '{pipeline}-heat-dsvm-functional-{engine}-{datastore}{job-suffix}':
lbaasversion: lbaasv1
- '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{job-suffix}':
datastore: mysql
pipeline: gate
node: devstack-trusty
job-suffix: ''
branch-designator: ''
branch-override: default
engine: orig
lbaasversion: lbaasv2
- '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{job-suffix}':
datastore: postgres
pipeline: gate
node: devstack-trusty
job-suffix: ''
branch-override: default
engine: orig
- '{pipeline}-heat-dsvm-functional-{engine}-{datastore}{job-suffix}':
lbaasversion: lbaasv1
- '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{job-suffix}':
datastore: mysql
pipeline: gate
node: devstack-trusty
job-suffix: ''
branch-override: default
engine: convg
lbaasversion: lbaasv1
- '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}{job-suffix}':
datastore: mysql
pipeline: gate
node: devstack-trusty
job-suffix: ''
branch-override: default
engine: convg
lbaasversion: lbaasv2
- '{pipeline}-tempest-dsvm-heat{job-suffix}':
pipeline: gate
node: devstack-trusty

18
zuul/layout.yaml
View File

@ -1092,7 +1092,9 @@ jobs:
- name: gate-tempest-dsvm-neutron-nv
branch: ^feature/pecan
- name: gate-heat-dsvm-functional-orig-postgres
# NOTE(markvan) Make these non-voting until resources
# and lbaasv2 environment stablizes
- name: ^gate-heat-dsvm-functional-.*-lbaasv2$
voting: false
# NOTE(tonyb) (heat) functional testing was introduced in the liberty
@ -1100,7 +1102,7 @@ jobs:
- name: gate-heatclient-dsvm-functional
branch: ^(?!stable/kilo).*$
- name: gate-heat-dsvm-functional-convg-mysql
- name: ^gate-heat-dsvm-functional-convg-mysql-lbaasv2
branch: ^(?!stable/(kilo|liberty)).*$
- name: gate-tempest-dsvm-heat
@ -5790,22 +5792,24 @@ projects:
- name: experimental-tripleo-jobs
- name: release-notes-jobs
check:
- gate-heat-dsvm-functional-orig-mysql
- gate-heat-dsvm-functional-convg-mysql
- gate-heat-dsvm-functional-orig-mysql-lbaasv1
- gate-heat-dsvm-functional-convg-mysql-lbaasv1
- gate-tempest-dsvm-heat
- gate-tempest-dsvm-heat-apache
- gate-grenade-dsvm-heat
gate:
- gate-heat-dsvm-functional-orig-mysql
- gate-heat-dsvm-functional-convg-mysql
- gate-heat-dsvm-functional-orig-mysql-lbaasv1
- gate-heat-dsvm-functional-convg-mysql-lbaasv1
- gate-tempest-dsvm-heat
- gate-tempest-dsvm-heat-apache
- gate-grenade-dsvm-heat
post:
- heat-coverage
experimental:
- gate-heat-dsvm-functional-orig-mysql-lbaasv2
- gate-heat-dsvm-functional-convg-mysql-lbaasv2
- gate-rally-dsvm-fakevirt-heat
- gate-heat-dsvm-functional-orig-postgres
- gate-heat-dsvm-functional-orig-postgres-lbaasv1
- name: openstack/heat-cfntools
template: