Merge "introduce default parameters for mode"

slave-scripts/dib.sh

@@ -19,7 +19,6 @@ plugin="$1"
 os="$2"
 image_name=${HOST}_${plugin}_${os}_${ZUUL_CHANGE}
 eval ${plugin//./_}_image=$image_name
-mode="distribute"
 sahara_plugin=$(echo $plugin | awk -F '_' '{ print $1 } ')
 
 # Clone Sahara
@@ -111,6 +110,6 @@ sudo pip install . --no-cache-dir
 enable_pypi
 write_sahara_main_conf "$sahara_conf_file" "$sahara_plugin"
 write_tests_conf "$cluster_name" "$image_variable_name" "$image_name" "$scenario_conf_file"
-start_sahara "$sahara_conf_file" "$mode" && run_tests "$scenario_conf_file"
+start_sahara "$sahara_conf_file" && run_tests "$scenario_conf_file"
 print_python_env
 cleanup_image "$plugin" "$os"

slave-scripts/functions-common.sh

@@ -122,7 +122,7 @@ start_sahara() {
   local conf_path=$1
   local conf_dir
   conf_dir=$(dirname $1)
-  local mode=$2
+  local mode=${2:-"distribute"}
   mkdir $WORKSPACE/logs
   sahara-db-manage --config-file $conf_path  upgrade head || failure "Command 'sahara-db-manage' failed"
   if [ "$mode" == "distribute" ]; then

slave-scripts/gate-sahara.sh

@@ -22,8 +22,6 @@ fi
 plugin=$(echo $JOB_NAME | awk -F '-' '{ print $3 }')
 os=$(echo $JOB_NAME | awk -F '-' '{ print $4 }')
 image_name=${plugin}_${os}
-mode="distribute"
-concurrency=1
 sahara_plugin=$(echo $plugin | awk -F '_' '{ print $1 } ')
 scenario_conf_file=$(get_template_path $ZUUL_BRANCH $plugin $sahara_templates_path)
 image_variable_name=$(get_image_variable_name $scenario_conf_file)
@@ -48,5 +46,5 @@ sudo pip install -r requirements.txt . --no-cache-dir
 enable_pypi
 write_sahara_main_conf "$sahara_conf_file" "$sahara_plugin"
 write_tests_conf "$cluster_name" "$image_variable_name" "$image_name" "$scenario_conf_file"
-start_sahara "$sahara_conf_file" "$mode" && run_tests "$scenario_conf_file" "$concurrency"
+start_sahara "$sahara_conf_file" "$mode" && run_tests "$scenario_conf_file"
 print_python_env