X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fshell%2Frun_bluval.sh;h=4b306a8753f0d096ff7fb6c05b4be17cfd549018;hp=fc16781e9f63fc50e67d273edf8d8b2dd8fb8789;hb=683452330b0784c355d032aae4454674d7fdc60e;hpb=14b538c8e21e6e5517a53a98143dfdea54e62d7b

diff --git a/jjb/shell/run_bluval.sh b/jjb/shell/run_bluval.sh
index fc16781..4b306a8 100755
--- a/jjb/shell/run_bluval.sh
+++ b/jjb/shell/run_bluval.sh
@@ -15,6 +15,7 @@ export PATH=$PATH:/home/jenkins/.local/bin
 cwd=$(pwd)
 current_user=$(whoami)
 is_optional="false"
+pull="false"
 
 info ()  {
     logger -s -t "run_blu_val.info" "$*"
@@ -34,14 +35,16 @@ change_res_owner() {
 
 usage() {
     echo "usage: $0" >&2
-    echo "[-n <blueprint_name>">&2
-    echo "[-b <blueprint_yaml> blueprint definition">&2
-    echo "[-k <k8s_config_dir> k8s config dir">&2
-    echo "[-j <cluster_master_ip> cluster master IP">&2
-    echo "[-u <ssh_user> ssh user">&2
-    echo "[-s <ssh_key>] path to ssh key">&2
+    echo "[-n <blueprint_name> ]">&2
+    echo "[-b <blueprint_yaml> ] blueprint definition">&2
+    echo "[-k <k8s_config_dir> ] k8s config dir">&2
+    echo "[-j <cluster_master_ip> ] cluster master IP">&2
+    echo "[-u <ssh_user> ] ssh user">&2
+    echo "[-p <ssh_password> ] ssh password">&2
+    echo "[-s <ssh_key> ] path to ssh key">&2
     echo "[-c <custmom_var_file> ] path to variables yaml file">&2
     echo "[-l <layer> ] blueprint layer">&2
+    echo "[-P ] pull docker images">&2
     echo "[-o ] run optional tests">&2
     echo "[-v <version> ] version">&2
 }
@@ -49,6 +52,7 @@ usage() {
 verify_connectivity() {
     local ip=$1
     info "Verifying connectivity to $ip..."
+    # shellcheck disable=SC2034
     for i in $(seq 0 10); do
         if ping -c 1 -W 1 "$ip" > /dev/null; then
             info "$ip is reachable!"
@@ -65,16 +69,18 @@ error () {
 }
 
 # Get options from shell
-while getopts "j:k:u:s:b:l:r:n:ov:" optchar; do
+while getopts "j:k:u:p:s:b:l:r:n:oPv:" optchar; do
     case "${optchar}" in
         j) cluster_master_ip=${OPTARG} ;;
         k) k8s_config_dir=${OPTARG} ;;
+        u) sh_user=${OPTARG} ;;
+        p) ssh_password=${OPTARG} ;;
         s) ssh_key=${OPTARG} ;;
         b) blueprint_yaml=${OPTARG} ;;
         l) blueprint_layer=${OPTARG} ;;
         n) blueprint_name=${OPTARG} ;;
-        u) sh_user=${OPTARG} ;;
         o) is_optional="true"  ;;
+        P) pull="true"  ;;
         v) version=${OPTARG} ;;
         *) echo "Non-option argument: '-${OPTARG}'" >&2
            usage
@@ -105,6 +111,7 @@ version=${version:-$VERSION}
 results_dir=$cwd/results
 cluster_master_ip=${cluster_master_ip:-$CLUSTER_MASTER_IP}
 ssh_user=${sh_user:-$CLUSTER_SSH_USER}
+ssh_password=${ssh_password:-$CLUSTER_SSH_PASSWORD}
 blueprint_layer=${blueprint_layer:-$LAYER}
 
 if [ "$blueprint_layer" == "k8s" ] || [ -z "$blueprint_layer" ]
@@ -115,13 +122,13 @@ then
         error "Please provide valid IP address to access the k8s cluster."
     fi
     verify_connectivity "${cluster_master_ip}"
-    if [[ -n $CLUSTER_SSH_PASSWORD ]]
+    if [[ -n ${ssh_password} ]]
     then
-        sshpass -p "${CLUSTER_SSH_PASSWORD}" scp -oUserKnownHostsFile=/dev/null -oStrictHostKeyChecking=no -r\
-             "${ssh_user}@${cluster_master_ip}:~/.kube/*" "$k8s_config_dir"
+        sshpass -p "${ssh_password}" scp -oUserKnownHostsFile=/dev/null -oStrictHostKeyChecking=no -r\
+             "${ssh_user}@${cluster_master_ip}:~/.kube/config" "$k8s_config_dir"
     else
         scp -oUserKnownHostsFile=/dev/null -oStrictHostKeyChecking=no -i"$ssh_key" -r\
-            "${ssh_user}"@"${cluster_master_ip}":~/.kube/* "$k8s_config_dir"
+            "${ssh_user}"@"${cluster_master_ip}":~/.kube/config "$k8s_config_dir"
     fi
 fi
 
@@ -130,6 +137,9 @@ then
     cp "$blueprint_yaml" ./bluval/
 fi
 
+# create ssh_key_dir
+mkdir -p "$cwd/ssh_key_dir"
+
 volumes_path="$cwd/bluval/volumes.yaml"
 # update information in volumes yaml
 sed -i \
@@ -140,17 +150,19 @@ sed -i \
     -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
+if [ -n "$ssh_key" ]
+then
+    cp $ssh_key $cwd/ssh_key_dir/id_rsa
+    ssh_keyfile=/root/.ssh/id_rsa
+fi
 
 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@" \
+    -e "s@password: [A-Za-z0-9_]* @password: $ssh_password@" \
+    -e "s@ssh_keyfile: [A-Za-z0-9_]* @ssh_keyfile: $ssh_keyfile@" \
     "$variables_path"
 
 if [[ -n $blueprint_layer ]]
@@ -161,14 +173,23 @@ if [ "$is_optional" == "true" ] || [ "$OPTIONAL" == "yes" ]
 then
     options+=" -o"
 fi
-
-printf 'ok / PASS /\nerror / FAIL /\n' > ./bluval/rules.txt
+if [ "$pull" == "true" ] || [ "$PULL" == "yes" ]
+then
+    options+=" -P"
+fi
 
 set +e
-# even if the script fails we need to change the owner of results
-# shellcheck disable=SC2086
-python3 bluval/blucon.py $options "$blueprint_name"
+if python3 --version > /dev/null; then
+    # shellcheck disable=SC2086
+    python3 bluval/blucon.py $options "$blueprint_name"
+else
+    # shellcheck disable=SC2086
+    VALIDATION_DIR="$WORKSPACE" RESULTS_DIR="$WORKSPACE/results" \
+        bluval/blucon.sh $options "$blueprint_name"
+fi
 
+# even if the script fails we need to change the owner of results
+# shellcheck disable=SC2181
 if [ $? -ne 0 ]; then
     change_res_owner
     error "Bluval validation FAIL "
@@ -183,11 +204,9 @@ else
     TIMESTAMP=$(date +'%Y%m%d-%H%M%S')
     NEXUS_URL=https://nexus.akraino.org/
     NEXUS_PATH="${LAB_SILO}/bluval_results/${blueprint_name}/${VERSION}/${TIMESTAMP}"
-    BUILD_URL="${JENKINS_HOSTNAME}/job/${JOB_NAME}/${BUILD_NUMBER}/"
     zip -r results.zip ./results
     lftools deploy nexus-zip "$NEXUS_URL" logs "$NEXUS_PATH" results.zip
     rm results.zip
 fi
 
 rm -f ~/.netrc
-