From ee8879ca589845990b4709ab28be2906d64a9299 Mon Sep 17 00:00:00 2001 From: xiaolihope Date: Tue, 17 May 2016 18:05:10 +0800 Subject: [PATCH] Add a heat job to use devstack plugin Heat now has a devstack plugin in tree. Make a job to be able to test that it works, non-voting, before we actually switch everything over and drop the devstack code. Depends-On: I8d0918a8f8bb8399793c7164d26739953710b3ec Change-Id: I58bd05073755c83d37e69484d87ee09924f43239 --- jenkins/jobs/heat.yaml | 33 +++++++++++++++++++++++++++++++++ jenkins/jobs/projects.yaml | 5 +++++ zuul/layout.yaml | 1 + 3 files changed, 39 insertions(+) diff --git a/jenkins/jobs/heat.yaml b/jenkins/jobs/heat.yaml index 8c7792b882..30ef0bae9e 100644 --- a/jenkins/jobs/heat.yaml +++ b/jenkins/jobs/heat.yaml @@ -304,3 +304,36 @@ publishers: - devstack-logs - console-log + +- job-template: + name: '{pipeline}-heat-dsvm-dsplugin{job-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_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_REGEX="orchestration" + export DEVSTACK_GATE_HEAT=1 + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" + export BRANCH_OVERRIDE={branch-override} + if [ "$BRANCH_OVERRIDE" != "default" ] ; then + export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE + fi + 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 diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index fcf1a944d6..2c1a105d85 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -2380,6 +2380,11 @@ node: ubuntu-trusty job-suffix: '-nv' branch-override: default + - '{pipeline}-heat-dsvm-dsplugin{job-suffix}': + pipeline: gate + node: ubuntu-trusty + job-suffix: '' + branch-override: default - python-liberty-bitrot-db-jobs - python-mitaka-bitrot-db-jobs - openstack-publish-jobs diff --git a/zuul/layout.yaml b/zuul/layout.yaml index ec2b553261..f0b0588e08 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6766,6 +6766,7 @@ projects: experimental: - gate-rally-dsvm-fakevirt-heat - gate-heat-dsvm-functional-orig-postgres-lbaasv1 + - gate-heat-dsvm-dsplugin - name: openstack/heat-cfntools template: