From 44d8f8f826a962eabcd219316d9f5e9650a807c3 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Wed, 23 Nov 2011 23:21:06 -0600 Subject: [PATCH] Check out integration tests and install prereqs Change-Id: I2a70a91c69005051f149a247faef42cfa88856a0 --- tools/build_ci_config.sh | 51 +++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/tools/build_ci_config.sh b/tools/build_ci_config.sh index 8eed8ec..f627f43 100755 --- a/tools/build_ci_config.sh +++ b/tools/build_ci_config.sh @@ -6,18 +6,14 @@ function usage { echo "$0 - Build config.ini for openstack-integration-tests" echo "" - echo "Usage: $0 configdir" + echo "Usage: $0 [configdir]" exit 1 } -if [ ! "$#" -eq "1" ]; then +if [ "$1" = "-h" ]; then usage fi -CONFIG_DIR=$1 -CONFIG_CONF=$CONFIG_DIR/storm.conf -CONFIG_INI=$CONFIG_DIR/config.ini - # Clean up any resources that may be in use cleanup() { set +o errexit @@ -53,8 +49,51 @@ source ./stackrc # Where Openstack code lives DEST=${DEST:-/opt/stack} +CITEST_DIR=$DEST/openstack-integration-tests + +CONFIG_DIR=${1:-$CITEST_DIR/etc} +CONFIG_CONF=$CONFIG_DIR/storm.conf +CONFIG_INI=$CONFIG_DIR/config.ini + DIST_NAME=${DIST_NAME:-oneiric} +# git clone only if directory doesn't exist already. Since ``DEST`` might not +# be owned by the installation user, we create the directory and change the +# ownership to the proper user. +function git_clone { + + GIT_REMOTE=$1 + GIT_DEST=$2 + GIT_BRANCH=$3 + + # do a full clone only if the directory doesn't exist + if [ ! -d $GIT_DEST ]; then + git clone $GIT_REMOTE $GIT_DEST + cd $2 + # This checkout syntax works for both branches and tags + git checkout $GIT_BRANCH + elif [[ "$RECLONE" == "yes" ]]; then + # if it does exist then simulate what clone does if asked to RECLONE + cd $GIT_DEST + # set the url to pull from and fetch + git remote set-url origin $GIT_REMOTE + git fetch origin + # remove the existing ignored files (like pyc) as they cause breakage + # (due to the py files having older timestamps than our pyc, so python + # thinks the pyc files are correct using them) + find $GIT_DEST -name '*.pyc' -delete + git checkout -f origin/$GIT_BRANCH + # a local branch might not exist + git branch -D $GIT_BRANCH || true + git checkout -b $GIT_BRANCH + fi +} + +# Install tests and prerequisites +sudo PIP_DOWNLOAD_CACHE=/var/cache/pip pip install --use-mirrors `cat $TOP_DIR/files/pips/openstack-integration-tests` + +git_clone $CITEST_REPO $CITEST_DIR $CITEST_BRANCH + if [ ! -f $DEST/.ramdisk ]; then # Process network configuration vars GUEST_NETWORK=${GUEST_NETWORK:-1}