Update nfd test script (#68006)

* Update nfd test script

chnging cpu images and printing logs

* Update ci-operator/step-registry/gather/must-gather/gather-must-gather-commands.sh

Co-authored-by: Vadim Rutkovsky <vrutkovs@redhat.com>

* Update nfd-tests-e2e-commands.sh

* Update ci-operator/step-registry/gather/must-gather/gather-must-gather-commands.sh

Co-authored-by: Vadim Rutkovsky <vrutkovs@redhat.com>

---------

Co-authored-by: Guy Gordani <ggordani@ggordani-thinkpadp1gen3.raanaii.csb>
Co-authored-by: Vadim Rutkovsky <vrutkovs@redhat.com>

Author: 3 people

ci-operator/step-registry/gather/must-gather/gather-must-gather-commands.sh

@@ -268,7 +268,10 @@ MUST_GATHER_TIMEOUT=${MUST_GATHER_TIMEOUT:-"15m"}
 set -x # log the MG commands
 echo "Running must-gather..."
 mkdir -p ${ARTIFACT_DIR}/must-gather
-oc --insecure-skip-tls-verify adm must-gather $MUST_GATHER_IMAGE --timeout=$MUST_GATHER_TIMEOUT --dest-dir ${ARTIFACT_DIR}/must-gather ${EXTRA_MG_ARGS} > ${ARTIFACT_DIR}/must-gather/must-gather.log
+if [ -n "$MUST_GATHER_IMAGE" ]; then
+    EXTRA_MG_ARGS="${EXTRA_MG_ARGS} ${MUST_GATHER_IMAGE}"
+fi
+oc --insecure-skip-tls-verify adm must-gather --timeout="$MUST_GATHER_TIMEOUT" --dest-dir "${ARTIFACT_DIR}/must-gather" ${EXTRA_MG_ARGS} > "${ARTIFACT_DIR}/must-gather/must-gather.log"
 find "${ARTIFACT_DIR}/must-gather" -type f -path '*/cluster-scoped-resources/machineconfiguration.openshift.io/*' -exec sh -c 'echo "REDACTED" > "$1" && mv "$1" "$1.redacted"' _ {} \;
 [ -f "${ARTIFACT_DIR}/must-gather/event-filter.html" ] && cp "${ARTIFACT_DIR}/must-gather/event-filter.html" "${ARTIFACT_DIR}/event-filter.html"
 installCamgi

ci-operator/step-registry/nfd/tests-e2e/nfd-tests-e2e-commands.sh

@@ -18,32 +18,12 @@ spec:
   restartPolicy: Never
   containers:
   - name: run-nfd
-    image: quay.io/ocp-edge-qe/eco-gotests:latest
-    command: [ "/bin/bash", "-c", "--" ]
-    args: [ "scripts/test-runner.sh && sleep 500" ]
+    image: quay.io/rh_ee_ggordani/nfd_test:latest
+    command: [ "python3", "/app/nfd_test.py" ]
+    args: [ ]
     env:
     - name: KUBECONFIG
       value: "/kubeconfig/kubeconfig"
-    - name: ECO_TEST_FEATURES
-      value: "nfd"
-    - name: ECO_TEST_LABELS
-      value: "NFD"
-    - name: ECO_TEST_VERBOSE
-      value: "true"
-    - name: ECO_VERBOSE_LEVEL
-      value: "100"
-    - name: ECO_TC_PREFIX
-      value: "OCP"
-    - name: ECO_HWACCEL_NFD_SUBSCRIPTION_NAME
-      value: "nfd"
-    - name: ECO_HWACCEL_NFD_CATALOG_SOURCE
-      value: "redhat-operators"
-    - name: ECO_DUMP_FAILED_TESTS
-      value: "true"
-    - name: ECO_HWACCEL_NFD_CPU_FLAGS_HELPER_IMAGE
-      value: quay.io/rh_ee_ggordani/cpuinfo:release-4.15
-    - name: ECO_REPORTS_DUMP_DIR
-      value: /home/testuser/reports
     imagePullPolicy: Always
     resources:
       limits:
@@ -74,19 +54,15 @@ echo "Check pod status"
 oc wait --for=condition=ContainersReady=true pod/testpod --timeout=300s
 oc get pod testpod
 
-while : ; do
-  oc exec testpod -- ls /home/testuser/reports > /tmp/Files
-  if ! grep -q 'nfd_suite_test_junit.xml' /tmp/Files ; then
-    echo
-    echo "Waiting for test results..."
-    sleep 30
-  else
-    echo
-    echo "Test results found."
-    break
-  fi
-done
+echo "Waiting for pod to complete..."
+oc wait --for=condition=PodReadyCondition=false pod/testpod --timeout=1800s || true
+oc wait --for=jsonpath='{.status.phase}'=Succeeded pod/testpod --timeout=300s
+echo "Pod completed, checking final status and logs..."
+oc get pod testpod
+oc logs testpod
 
 echo "Retrieve test results..."
-oc exec testpod -- cat /home/testuser/reports/nfd_suite_test_junit.xml > ${ARTIFACT_DIR}/junit_nfd_suite_test.xml
-oc exec testpod -- cat /home/testuser/reports/report_testrun.xml > ${ARTIFACT_DIR}/junit_report_testrun.xml
+oc cp testpod:/home/testuser/reports/nfd_suite_test_junit.xml ${ARTIFACT_DIR}/junit_nfd_suite_test.xml || \
+  echo "Warning: Could not copy nfd_suite_test_junit.xml"
+oc cp testpod:/home/testuser/reports/report_testrun.xml ${ARTIFACT_DIR}/junit_report_testrun.xml || \
+  echo "Warning: Could not copy report_testrun.xml"