openstack/project-config
Code Issues Proposed changes

Add a amqp1 job for Heat

Browse Source 
This adds a non-voting job for Heat integration tests using amqp1
oslo.messaging plugin, only on master for now.

Change-Id: I42c51524f64368325a132f79706fe305b8f701fa
This commit is contained in:
Thomas Herve 2016-11-22 15:41:00 +01:00
parent 98a7ac46d8
commit 65514e4fe3
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jenkins/jobs/heat.yaml
View File

@ -103,7 +103,13 @@
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi fi
if [ "{special}" == "-identity-v3-only" ] ; then if [ "{special}" == "-identity-v3-only" ] ; then
export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False" export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False"
fi
if [ "{special}" == "-amqp1" ] ; then
export PROJECTS="openstack/oslo.messaging $PROJECTS"
export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-amqp1 git://git.openstack.org/openstack/devstack-plugin-amqp1"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=oslo.messaging"
fi fi
function pre_test_hook {{ function pre_test_hook {{
cd /opt/stack/new/heat/heat_integrationtests cd /opt/stack/new/heat/heat_integrationtests

9
jenkins/jobs/projects.yaml
View File

@ -5299,6 +5299,15 @@
branch-override: default branch-override: default
engine: orig engine: orig
lbaasversion: lbaasv1 lbaasversion: lbaasv1
- '{pipeline}-heat-dsvm-functional-{engine}-{datastore}-{lbaasversion}-{node}{special}{job-suffix}':
datastore: mysql
pipeline: gate
node: 'centos-7'
special: '-amqp1'
job-suffix: '-nv'
branch-override: default
engine: convg
lbaasversion: lbaasv2
- '{pipeline}-tempest-dsvm-heat{special}{job-suffix}': - '{pipeline}-tempest-dsvm-heat{special}{job-suffix}':
pipeline: gate pipeline: gate
node: ubuntu-trusty node: ubuntu-trusty

5
zuul/layout.yaml
View File

@ -1905,6 +1905,10 @@ jobs:
- name: ^gate-heat-dsvm-functional-convg-mysql-lbaasv2-ubuntu-xenial$ - name: ^gate-heat-dsvm-functional-convg-mysql-lbaasv2-ubuntu-xenial$
branch: ^(?!stable/(liberty|mitaka)).*$ branch: ^(?!stable/(liberty|mitaka)).*$
# NOTE(therve) (heat) run amqp1 ocata and forward
- name: ^gate-heat-dsvm-functional-convg-mysql-lbaasv2-centos-7-amqp1-nv$
branch: ^(?!stable/(liberty|mitaka|newton)).*$
- name: gate-tempest-dsvm-heat - name: gate-tempest-dsvm-heat
branch: ^(stable/liberty).*$ branch: ^(stable/liberty).*$
@ -10200,6 +10204,7 @@ projects:
- gate-heat-dsvm-functional-orig-mysql-lbaasv2-ubuntu-xenial - gate-heat-dsvm-functional-orig-mysql-lbaasv2-ubuntu-xenial
- gate-heat-dsvm-functional-convg-mysql-lbaasv2-ubuntu-trusty - gate-heat-dsvm-functional-convg-mysql-lbaasv2-ubuntu-trusty
- gate-heat-dsvm-functional-convg-mysql-lbaasv2-ubuntu-xenial - gate-heat-dsvm-functional-convg-mysql-lbaasv2-ubuntu-xenial
- gate-heat-dsvm-functional-convg-mysql-lbaasv2-centos-7-amqp1-nv
- gate-tempest-dsvm-heat - gate-tempest-dsvm-heat
- gate-tempest-dsvm-heat-apache-ubuntu-trusty - gate-tempest-dsvm-heat-apache-ubuntu-trusty
- gate-tempest-dsvm-heat-apache-ubuntu-xenial - gate-tempest-dsvm-heat-apache-ubuntu-xenial