openstack/devstack
Code Issues Proposed changes

add in rc

Browse Source
This commit is contained in:
Anthony Young 2011-11-10 11:38:09 -08:00
parent ea1a5869fd
commit 053906d137
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/jenkins/build_configuration.sh
View File

@ -3,18 +3,19 @@
EXECUTOR_NUMBER=$1 EXECUTOR_NUMBER=$1
CONFIGURATION=$2 CONFIGURATION=$2
ADAPTER=$3 ADAPTER=$3
RC=$4
function usage() { function usage() {
echo "Usage: $0 - Build a configuration" echo "Usage: $0 - Build a configuration"
echo "" echo ""
echo "$0 [EXECUTOR_NUMBER] [CONFIGURATION] [ADAPTER]" echo "$0 [EXECUTOR_NUMBER] [CONFIGURATION] [ADAPTER] [RC (optional)]"
exit 1 exit 1
} }
# Validate inputs # Validate inputs
if [[ "$EXECUTOR_NUMBER" = "" || "$CONFIGURATION" = "" ]]; then if [[ "$EXECUTOR_NUMBER" = "" || "$CONFIGURATION" = "" || "$ADAPTER" = "" ]]; then
usage usage
fi fi
# Execute configuration script # Execute configuration script
cd configurations && ./$CONFIGURATION.sh $EXECUTOR_NUMBER $CONFIGURATION $ADAPTER cd configurations && ./$CONFIGURATION.sh $EXECUTOR_NUMBER $CONFIGURATION $ADAPTER "$RC"

4
tools/jenkins/configurations/kvm.sh
View File

@ -3,11 +3,12 @@
EXECUTOR_NUMBER=$1 EXECUTOR_NUMBER=$1
CONFIGURATION=$2 CONFIGURATION=$2
ADAPTER=$3 ADAPTER=$3
RC=$4
function usage() { function usage() {
echo "Usage: $0 - Build a test configuration" echo "Usage: $0 - Build a test configuration"
echo "" echo ""
echo "$0 [EXECUTOR_NUMBER] [CONFIGURATION] [ADAPTER]" echo "$0 [EXECUTOR_NUMBER] [CONFIGURATION] [ADAPTER] [RC (optional)]"
exit 1 exit 1
} }
@ -44,6 +45,7 @@ ADMIN_PASSWORD=chicken
USERNAME=admin USERNAME=admin
TENANT=admin TENANT=admin
NET_NAME=$BASE_NAME NET_NAME=$BASE_NAME
$RC
EOF EOF
cd tools cd tools
sudo ./build_uec.sh sudo ./build_uec.sh