From 053906d137822f8c3c7f7686879648ecdab0aee4 Mon Sep 17 00:00:00 2001 From: Anthony Young Date: Thu, 10 Nov 2011 11:38:09 -0800 Subject: [PATCH] add in rc --- tools/jenkins/build_configuration.sh | 7 ++++--- tools/jenkins/configurations/kvm.sh | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/jenkins/build_configuration.sh b/tools/jenkins/build_configuration.sh index cab133d..e295ef2 100755 --- a/tools/jenkins/build_configuration.sh +++ b/tools/jenkins/build_configuration.sh @@ -3,18 +3,19 @@ EXECUTOR_NUMBER=$1 CONFIGURATION=$2 ADAPTER=$3 +RC=$4 function usage() { echo "Usage: $0 - Build a configuration" echo "" - echo "$0 [EXECUTOR_NUMBER] [CONFIGURATION] [ADAPTER]" + echo "$0 [EXECUTOR_NUMBER] [CONFIGURATION] [ADAPTER] [RC (optional)]" exit 1 } # Validate inputs -if [[ "$EXECUTOR_NUMBER" = "" || "$CONFIGURATION" = "" ]]; then +if [[ "$EXECUTOR_NUMBER" = "" || "$CONFIGURATION" = "" || "$ADAPTER" = "" ]]; then usage fi # Execute configuration script -cd configurations && ./$CONFIGURATION.sh $EXECUTOR_NUMBER $CONFIGURATION $ADAPTER +cd configurations && ./$CONFIGURATION.sh $EXECUTOR_NUMBER $CONFIGURATION $ADAPTER "$RC" diff --git a/tools/jenkins/configurations/kvm.sh b/tools/jenkins/configurations/kvm.sh index d7b12b4..7c641d2 100755 --- a/tools/jenkins/configurations/kvm.sh +++ b/tools/jenkins/configurations/kvm.sh @@ -3,11 +3,12 @@ EXECUTOR_NUMBER=$1 CONFIGURATION=$2 ADAPTER=$3 +RC=$4 function usage() { echo "Usage: $0 - Build a test configuration" echo "" - echo "$0 [EXECUTOR_NUMBER] [CONFIGURATION] [ADAPTER]" + echo "$0 [EXECUTOR_NUMBER] [CONFIGURATION] [ADAPTER] [RC (optional)]" exit 1 } @@ -44,6 +45,7 @@ ADMIN_PASSWORD=chicken USERNAME=admin TENANT=admin NET_NAME=$BASE_NAME +$RC EOF cd tools sudo ./build_uec.sh