Commit 90c708c1 authored by frtabu's avatar frtabu

bug fixing in the way customized behavior of CI depending of jenkins server is triggered

parent bb57c61a
...@@ -146,9 +146,9 @@ function platform_set { ...@@ -146,9 +146,9 @@ function platform_set {
if [ "$TESTPLATFORM_OWNER" != "" ] if [ "$TESTPLATFORM_OWNER" != "" ]
then then
echo "Running on $TESTPLATFORM_OWNER platform" echo "Running on $TESTPLATFORM_OWNER platform"
if [ -x "${TESTPLATFORM_OWNER}_setenv.sh" ] if [ -x "/usr/local/bin/oai_${TESTPLATFORM_OWNER}_setenv.sh" ]
then then
. ${TESTPLATFORM_OWNER}_setenv.sh . /usr/local/bin/oai_${TESTPLATFORM_OWNER}_setenv.sh
fi fi
fi fi
} }
...@@ -158,6 +158,7 @@ function setvar_usage { ...@@ -158,6 +158,7 @@ function setvar_usage {
HELP_VAR["VM_OSREL"]="OS release to use in virtual machines" HELP_VAR["VM_OSREL"]="OS release to use in virtual machines"
HELP_VAR["RUN_EXPERIMENTAL"]="Enforce execution of variants with EXPERIMENTAL variable set to \"true\"" HELP_VAR["RUN_EXPERIMENTAL"]="Enforce execution of variants with EXPERIMENTAL variable set to \"true\""
HELP_VAR["OPTIONAL_APTCACHER"]="build and Run tests will fail if apt-cacher not installed and this variable not set to \"true\"" HELP_VAR["OPTIONAL_APTCACHER"]="build and Run tests will fail if apt-cacher not installed and this variable not set to \"true\""
HELP_VAR["TESTPLATFORM_OWNER"]="Allow pipeline customization via execution of an externel scripts residing on the jenkins server"
echo "--setvar_<varname> <value> where varname is one of:" echo "--setvar_<varname> <value> where varname is one of:"
for i in ${AUTHORIZED_VAR[@]}; do printf "%20s : %s\n" "$i" "${HELP_VAR[$i]}" ;done for i in ${AUTHORIZED_VAR[@]}; do printf "%20s : %s\n" "$i" "${HELP_VAR[$i]}" ;done
} }
...@@ -456,7 +457,7 @@ RUN_OPTIONS="none" ...@@ -456,7 +457,7 @@ RUN_OPTIONS="none"
# list of variables that can be set via the --setvar option # list of variables that can be set via the --setvar option
AUTHORIZED_VAR=("VM_OSREL RUN_EXPERIMENTAL OPTIONAL_APTCACHER") AUTHORIZED_VAR=("VM_OSREL RUN_EXPERIMENTAL OPTIONAL_APTCACHER TESTPLATFORM_OWNER")
#variables to set which OS VM should use #variables to set which OS VM should use
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment