Fixing tier-1 tests

Tmt connectivity test fo AutoSD container was broken Signed-off-by: Yariv Rachmani <[email protected]>
containers · Nov 8, 2023 · 17c1873 · 17c1873
1 parent df39515
commit 17c1873
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 24 deletions.
diff --git a/plans/e2e/tier-1.fmf b/plans/e2e/tier-1.fmf
@@ -13,12 +13,13 @@ adjust:
       - name: Install rpms
         how: install
         package: podman
-      - name: Setp AutoSD env
+
+      - name: Setup AutoSD env
         how: shell
         script: |
            # Currently option passing c9s
            podman run --replace -d --name autosd \
-                  --privileged -it \
+                  --privileged \
                   quay.io/centos-sig-automotive/autosd:latest
    when: distro == centos-stream-9 or distro == fedora
 

diff --git a/tests/e2e/lib/tests b/tests/e2e/lib/tests
@@ -24,23 +24,23 @@ readarray -d ' ' -t NODES_FOR_TESTING <<< "$NODES_FOR_TESTING_ARR"
 CONTROL_CONTAINER_NAME="${CONTROL_CONTAINER_NAME:-control}"
 
 test_bluechi_list_all_units() {
+
+    local bluechictl_cmd
+
     for node_name in "${NODES_FOR_TESTING[@]}"
     do
         echo
         info_message "Connected to \033[92m${CONTROL_CONTAINER_NAME}\033[0m, listing few systemd units from \033[92m${node_name}\033[0m"
-        if [ "${CONTROL_CONTAINER_NAME}" = "host" ]; then
-           bluechictl_cmd=$(eval "bluechictl \
-                   list-units \
-                   ${node_name}"
-           )
+        if [ "${CONTROL_CONTAINER_NAME}" == "host" ]; then
+           bluechictl_cmd="bluechictl list-units ${node_name}"
         else
-           bluechictl_cmd=$(eval "podman exec \
-                   ${CONTROL_CONTAINER_NAME} \
-                   bluechictl \
-                   list-units \
-                   ${node_name}"
-           )
+           bluechictl_cmd="podman exec"
+           bluechictl_cmd+=" ${CONTROL_CONTAINER_NAME}"
+           bluechictl_cmd+=" bluechictl list-units ${node_name}"
+           sleep 1
         fi
+        eval "${bluechictl_cmd}"
+
         if_error_exit "unable to execute bluechictl command on ${CONTROL_CONTAINER_NAME}"
 
         if [ "${CONTROL_CONTAINER_NAME}" = "host" -o "${CONTROL_CONTAINER_NAME}" = "autosd" ]; then

diff --git a/tests/e2e/lib/utils b/tests/e2e/lib/utils
@@ -52,7 +52,7 @@ info_message() {
 exec_cmd() {
     local cmd="$1"
     eval "$cmd"
-    if_error_exit "Error: Command "$cmd" failed"
+    if_error_exit "Error: Command $cmd failed"
 }
 
 cleanup() {

diff --git a/tests/qm-connectivity/main.fmf b/tests/qm-connectivity/main.fmf
@@ -1,6 +1,3 @@
-test:
-  ./test.sh
-
 /tier0:
     summary: Test is calling e2e/lib/tests as stand alone test
     test:
@@ -9,12 +6,11 @@ test:
 
 /tier1:
     summary: Test is calling e2e/lib/tests AutoSD container
-    test:
-      ./test.sh
-    tier: 1
-    tag: ffi
     environment:
       CONTROL_CONTAINER_NAME: "autosd"
-      NODES_FOR_TESTING_ARR: "localrootfs qm.localrootfs"
+      NODES_FOR_TESTING_ARR: "qm.localrootfs localrootfs"
+    test:
+      bash -x ./test.sh
+    tier: 1
 framework:
     shell
diff --git a/tests/qm-connectivity/test.sh b/tests/qm-connectivity/test.sh
@@ -2,10 +2,10 @@
 
 # shellcheck disable=SC1094
 # shellcheck source=tests/e2e/lib/utils
-. ../e2e/lib/utils
+source ../e2e/lib/utils
 
 # shellcheck disable=SC1094
 # shellcheck source=tests/e2e/lib/utils
-. ../e2e/lib/tests
+source ../e2e/lib/tests
 
 test_bluechi_list_all_units