X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fshell%2Frun_bluval.sh;h=844c6110e81fa75daa9a2a1d8efe0886a323e1f9;hb=28f5a48f1d4d9ec4f3ac4cf0703b70c7b58f5a13;hp=3bb4a6f4cca173563ea16ae1b136ea4c0748edf8;hpb=ecd7ed34ed2a547d8d64dddae12c1087754f7981;p=ci-management.git

diff --git a/jjb/shell/run_bluval.sh b/jjb/shell/run_bluval.sh
index 3bb4a6f..844c611 100755
--- a/jjb/shell/run_bluval.sh
+++ b/jjb/shell/run_bluval.sh
@@ -107,7 +107,7 @@ cluster_master_ip=${cluster_master_ip:-$CLUSTER_MASTER_IP}
 ssh_user=${sh_user:-$CLUSTER_SSH_USER}
 blueprint_layer=${blueprint_layer:-$LAYER}
 
-if [ "$blueprint_layer" == "k8s" ]
+if [ "$blueprint_layer" == "k8s" ] || [ -z "$blueprint_layer" ]
 then
     if [ -z "$cluster_master_ip" ]
     then
@@ -131,8 +131,27 @@ then
 fi
 
 volumes_path="$cwd/bluval/volumes.yaml"
-#update information in volumes yaml
-sed -i -e "/kube_config_dir/{n; s@local: ''@local: '$k8s_config_dir'@}" -e "/blueprint_dir/{n; s@local: ''@local: '$cwd/bluval/'@}" -e "/results_dir/{n; s@local: ''@local: '$results_dir'@}" "$volumes_path"
+# update information in volumes yaml
+sed -i \
+    -e "/ssh_key_dir/{n; s@local: ''@local: '$cwd/ssh_key_dir'@}" \
+    -e "/kube_config_dir/{n; s@local: ''@local: '$k8s_config_dir'@}" \
+    -e "/custom_variables_file/{n; s@local: ''@local: '$cwd/tests/variables.yaml'@}" \
+    -e "/blueprint_dir/{n; s@local: ''@local: '$cwd/bluval/'@}" \
+    -e "/results_dir/{n; s@local: ''@local: '$results_dir'@}" \
+    "$volumes_path"
+
+# create ssh_key_dir
+mkdir -p $cwd/ssh_key_dir
+
+# copy ssh_key in ssh_key_dir
+cp $ssh_key $cwd/ssh_key_dir/id_rsa
+
+variables_path="$cwd/tests/variables.yaml"
+# update information in variables yaml
+sed -i \
+    -e "s@host: [0-9]*.[0-9]*.[0-9]*.[0-9]*@host: $cluster_master_ip@" \
+    -e "s@username: [A-Za-z0-9_]* @username: $ssh_user@" \
+    "$variables_path"
 
 if [[ -n $blueprint_layer ]]
 then
@@ -143,8 +162,6 @@ then
     options+=" -o"
 fi
 
-printf 'ok / PASS /\nerror / FAIL /\n' > ./bluval/rules.txt
-
 set +e
 # even if the script fails we need to change the owner of results
 # shellcheck disable=SC2086