From 966d91397adf6ffa21044cc429bf664f0332e171 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Mon, 5 Dec 2016 10:17:15 +0000 Subject: [PATCH] Switch to the new DevStack plugin for Blazar Change-Id: Ifff3a8ed2c1f6b9635ef27bfbeadb78ec06a6b9f --- jenkins/jobs/blazar.yaml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/jenkins/jobs/blazar.yaml b/jenkins/jobs/blazar.yaml index d73c6f76d5..5d761485ca 100644 --- a/jenkins/jobs/blazar.yaml +++ b/jenkins/jobs/blazar.yaml @@ -19,6 +19,7 @@ export PROJECTS="openstack/blazar $PROJECTS" export PROJECTS="openstack/blazar-nova $PROJECTS" export PROJECTS="openstack/python-blazarclient $PROJECTS" + export DEVSTACK_LOCAL_CONFIG="enable_plugin blazar git://git.openstack.org/openstack/blazar" # Construct a regex to limiting scope of tempest r="^(?:tempest\.cli\.simple_read_only\.test_resource_.*)" @@ -26,16 +27,9 @@ export DEVSTACK_GATE_TEMPEST_REGEX="$r" function pre_test_hook { - # Install blazar devstack integration - BLAZAR_BASE=/opt/stack/new/blazar - BLAZAR_DEVSTACK_BASE=$BLAZAR_BASE/contrib/devstack - DEVSTACK_BASE=/opt/stack/new/devstack - cp $BLAZAR_DEVSTACK_BASE/lib/* $DEVSTACK_BASE/lib - cp $BLAZAR_DEVSTACK_BASE/extras.d/* $DEVSTACK_BASE/extras.d - # Install blazar tempest integration # Copying Tempest test suites - BLAZAR_TEMPEST_DIR=$BLAZAR_BASE/contrib/tempest + BLAZAR_TEMPEST_DIR=/opt/stack/new/blazar/contrib/tempest TEMPEST_DIR=${TEMPEST_DIR:-/opt/stack/new/tempest} cp -R $BLAZAR_TEMPEST_DIR/tempest/* $TEMPEST_DIR/tempest }