Allow running ExecuteOnNode and CopyToNode without rlRun

linux-system-roles · Jan 17, 2025 · ba8702a · ba8702a
1 parent da6c231
commit ba8702a
Showing 1 changed file with 49 additions and 12 deletions.
diff --git a/library/lib.sh b/library/lib.sh
@@ -569,21 +569,54 @@ lsrCopyToNode() {
     local dest_path=$3
     local guests_yml=$4
     local tmt_tree_provision=$5
-    local identity_file_arg node_ip
-    identity_file_arg=$(lsrGetIdentityFile "$guests_yml" "$tmt_tree_provision")
+    local execute_with_rlrun=$6
+    local print_out=$7
+    local identity_file_args node_ip scp_cmd
+    identity_file_args=$(lsrGetIdentityFile "$guests_yml" "$tmt_tree_provision")
     node_ip=$(lsrGetNodeIp "$guests_yml" "$node")
-    rlRun "scp $identity_file_arg -o StrictHostKeyChecking=no $cp_files root@$node_ip:$dest_path"
+    scp_cmd=(scp $identity_file_args -o StrictHostKeyChecking=no $cp_files root@"$node_ip":"$dest_path")
+    if [ "$execute_with_rlrun" == false ]; then
+        if [ "$print_out" == false ]; then
+            echo "${scp_cmd[@]} &>/dev/null"
+            "${scp_cmd[@]}" &>/dev/null
+        else
+            echo "${scp_cmd[@]}"
+            "${scp_cmd[@]}"
+        fi
+    else
+        if [ "$print_out" == false ]; then
+            rlRun "${scp_cmd[@]} &>/dev/null"
+        else
+            rlRun "${scp_cmd[@]}"
+        fi
+    fi
 }
 
 lsrExecuteOnNode() {
     local node=$1
     local cmd=$2
     local guests_yml=$3
     local tmt_tree_provision=$4
-    local identity_file_arg node_ip
-    identity_file_arg=$(lsrGetIdentityFile "$guests_yml" "$tmt_tree_provision")
+    local execute_with_rlrun=$5
+    local print_out=$7
+    local identity_file_args node_ip ssh_cmd
+    identity_file_args=$(lsrGetIdentityFile "$guests_yml" "$tmt_tree_provision")
     node_ip=$(lsrGetNodeIp "$guests_yml" "$node")
-    rlRun "ssh $identity_file_arg -o StrictHostKeyChecking=no root@$node_ip \"$cmd\""
+    ssh_cmd=(ssh $identity_file_args -o StrictHostKeyChecking=no root@"$node_ip" "$cmd")
+    if [ "$execute_with_rlrun" == false ]; then
+        if [ "$print_out" == false ]; then
+            echo "${ssh_cmd[@]} &>/dev/null"
+            "${ssh_cmd[@]}" &>/dev/null
+        else
+            "${ssh_cmd[@]}"
+        fi
+    else
+        if [ "$print_out" == false ]; then
+            rlRun "${ssh_cmd[@]} &>/dev/null"
+        else
+            rlRun "${ssh_cmd[@]}"
+        fi
+    fi
 }
 
 lsrGenerateTestDisks() {
@@ -601,18 +634,22 @@ lsrGenerateTestDisks() {
 
     managed_nodes=$(lsrGetManagedNodes "$guests_yml")
     for managed_node in $managed_nodes; do
-        available=$(lsrExecuteOnNode "$managed_node" "df -k /tmp --output=avail | tail -1" "$guests_yml" "$tmt_tree_provision")
+        available=$(lsrExecuteOnNode "$managed_node" "df -k /tmp --output=avail | tail -1" "$guests_yml" "$tmt_tree_provision" "false" "true")
         rlLog "Available disk space: $available"
         if [ "$available" -gt 10485760 ]; then
             disk_provisioner_dir=/tmp/disk_provisioner
         else
             disk_provisioner_dir=/var/tmp/disk_provisioner
         fi
-        lsrCopyToNode "$managed_node" "$disk_provisioner_script $provisionfmf" "/tmp/" "$guests_yml" "$tmt_tree_provision"
-        lsrExecuteOnNode "$managed_node" "WORK_DIR=$disk_provisioner_dir FMF_DIR=/tmp/ /tmp/$disk_provisioner_script $action" "$guests_yml" "$tmt_tree_provision"
-        # Ensure that a new devices really exists
-        lsrExecuteOnNode "$managed_node" "fdisk -l | grep 'Disk /dev/'" "$guests_yml" "$tmt_tree_provision"
-        lsrExecuteOnNode "$managed_node" "lsblk -l | cut -d\  -f1 | grep -v NAME | sed 's/^/\/dev\//' | xargs ls -l" "$guests_yml" "$tmt_tree_provision"
+        lsrCopyToNode "$managed_node" "$disk_provisioner_script $provisionfmf" "/tmp/" "$guests_yml" \
+            "$tmt_tree_provision" "false" "false"
+        lsrExecuteOnNode "$managed_node" \
+            "WORK_DIR=$disk_provisioner_dir FMF_DIR=/tmp/ /tmp/$disk_provisioner_script $action" \
+            "$guests_yml" "$tmt_tree_provision" "false" "false"
+        # Print devices
+        lsrExecuteOnNode "$managed_node" "fdisk -l | grep 'Disk /dev/'" "$guests_yml" "$tmt_tree_provision" "false" "false"
+        lsrExecuteOnNode "$managed_node" "lsblk -l | cut -d\  -f1 | grep -v NAME | sed 's/^/\/dev\//' | xargs ls -l" \
+            "$guests_yml" "$tmt_tree_provision" "false" "false"
     done
 }