From c6db17ea4f9cfeaa710ffc8b95ee315d9f555a84 Mon Sep 17 00:00:00 2001
From: DANIEL STOICA <daniel.stoica@enea.com>
Date: Tue, 24 Mar 2020 15:30:23 +0200
Subject: [PATCH] Enable vuls and lynis tests in CI

 - created the ssh_key_dir and put the ssh_key
 - set host and username variable in validation/tests/variables.yaml
 - set ssh_key_dir and custom_variables_file path in validatin/bluval/volumes.yaml

Signed-off-by: DANIEL STOICA <daniel.stoica@enea.com>
Depends-On: Ibb16f76405f5b43797e0d859db0681759adf5e18
Change-Id: I9e5349a0e3e3a1e7331a5f5b4b4a8d5a1b01aa51
---
 jjb/shell/run_bluval.sh | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

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
-- 
2.16.6