From c8fd8b50328fea99d28e62f4abf1886858ac14d2 Mon Sep 17 00:00:00 2001 From: Eli Qiao Date: Mon, 30 May 2016 10:27:09 +0800 Subject: [PATCH] devstack: Add gate_hook for devstack gate job This gate_hook.sh will be used by project-config. BTW, fix a seeting mistake for higgins-conductor service. Change-Id: I55542a1522121b9504f8018ce682be9b874fa941 --- devstack/gate_hook.sh | 24 ++++++++++++++++++++++++ devstack/settings | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100755 devstack/gate_hook.sh diff --git a/devstack/gate_hook.sh b/devstack/gate_hook.sh new file mode 100755 index 000000000..3cdf8f704 --- /dev/null +++ b/devstack/gate_hook.sh @@ -0,0 +1,24 @@ +#!/bin/bash -x +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# This script is executed inside gate_hook function in devstack gate. + + +# Keep all devstack settings here instead of project-config for easy +# maintain if we want to change devstack config settings in future. + +export PROJECTS="openstack/higgins $PROJECTS" +export DEVSTACK_LOCAL_CONFIG="enable_plugin higgins git://git.openstack.org/openstack/higgins" + +$BASE/new/devstack-gate/devstack-vm-gate.sh diff --git a/devstack/settings b/devstack/settings index 87d7e06dd..d5303ed4f 100644 --- a/devstack/settings +++ b/devstack/settings @@ -17,4 +17,4 @@ # Enable Higgins services enable_service higgins-api -enable_service higgins-cond +enable_service higgins-conductor