X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fshell%2Frun_bluval.sh;fp=jjb%2Fshell%2Frun_bluval.sh;h=76f87667c3efa91aaf001189d21441d1f22e4c54;hp=3bb4a6f4cca173563ea16ae1b136ea4c0748edf8;hb=c6db17ea4f9cfeaa710ffc8b95ee315d9f555a84;hpb=dbb5c5d4d08d2bd7b27f96530ac541e3d5c128b9 diff --git a/jjb/shell/run_bluval.sh b/jjb/shell/run_bluval.sh index 3bb4a6f..76f8766 100755 --- a/jjb/shell/run_bluval.sh +++ b/jjb/shell/run_bluval.sh @@ -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