From 57c277d6cb16560e19e6a05bc0a739752c7e9411 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 11 Sep 2014 15:29:51 -0700 Subject: [PATCH] Install PyYaml for test-matrix.py We have an implicit dependency on PyYaml in test-matrix.py, install it prior to running test-matrix.py. Co-authored-by: Aaron Rosen Change-Id: I7d16a73d5d73e0901a54309ef2e7c4b68a5abd3f --- devstack-vm-gate.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index 01a4f91d..14009956 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -21,6 +21,15 @@ set -o errexit +# Keep track of the devstack directory +TOP_DIR=$(cd $(dirname "$0") && pwd) + +# Prepare the environment +# ----------------------- + +# Import common functions +source $TOP_DIR/functions.sh + echo $PPID > $WORKSPACE/gate.pid function setup_localrc { @@ -33,6 +42,13 @@ function setup_localrc { rm -f localrc fi + # Install PyYaml for test-matrix.py + if is_ubuntu; then + sudo apt-get update + sudo apt-get install python-yaml + elif is_fedora; then + sudo yum install PyYAML + fi MY_ENABLED_SERVICES=`cd $BASE/new/devstack-gate && ./test-matrix.py -b $LOCALRC_BRANCH -f $DEVSTACK_GATE_FEATURE_MATRIX` # Allow optional injection of ENABLED_SERVICES from the calling context