Fix parity tests job

Author: khyatimahendru

.github/workflows/release-udmi.yaml

@@ -80,7 +80,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: build and push image
         run: |
-          IMAGE_REF="$PUSH_REGISTRY/${GITHUB_REPOSITORY_OWNER,,}/udmi/discoverynode"
+          IMAGE_REF="$PUSH_REGISTRY/$GITHUB_REPOSITORY_OWNER/udmi/discoverynode"
           IMAGE_TAG=${REF_NAME//\//-}
           [[ $REF_NAME == master ]] && IMAGE_TAG=latest
           ./misc/discoverynode/bin/build_container_and_push $IMAGE_REF:$IMAGE_TAG
@@ -111,7 +111,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: build and push image
         run: |
-          IMAGE_REF="$PUSH_REGISTRY/${GITHUB_REPOSITORY_OWNER,,}/udmi/spotter"
+          IMAGE_REF="$PUSH_REGISTRY/$GITHUB_REPOSITORY_OWNER/udmi/spotter"
           IMAGE_TAG=${REF_NAME//\//-}
           [[ $REF_NAME == master ]] && IMAGE_TAG=latest
           docker build -t $IMAGE_REF:$IMAGE_TAG -f edge/spotter/container/Dockerfile .

edge/spotter/bin/run_spotter_tests

@@ -36,11 +36,17 @@ fi
 
 if [[ "$MODE" == "integration" || "$MODE" == "all" ]]; then
     SPOTTER_PYTHON="${WORKSPACE_DIR}/edge/spotter/venv/bin/python3"
-    echo "--- Step 3: Building udmi-spotter:latest Container Image ---"
-    CONTAINER_ENGINE="docker"
-    if ! command -v docker >/dev/null 2>&1 && command -v podman >/dev/null 2>&1; then
-        CONTAINER_ENGINE="podman"
+    CONTAINER_ENGINE="${CONTAINER_ENGINE:-}"
+    if [[ -z "${CONTAINER_ENGINE}" ]]; then
+        if command -v docker >/dev/null 2>&1; then
+            CONTAINER_ENGINE="docker"
+        elif command -v podman >/dev/null 2>&1; then
+            CONTAINER_ENGINE="podman"
+        else
+            CONTAINER_ENGINE="docker"
+        fi
     fi
+    export CONTAINER_ENGINE
     ${CONTAINER_ENGINE} build -t udmi-spotter:latest -f "${WORKSPACE_DIR}/edge/spotter/container/Dockerfile" "${WORKSPACE_DIR}" >/dev/null
 
     echo "--- Step 4: Running Container Lifecycle Integration Tests (test_container) ---"
@@ -62,7 +68,7 @@ if [[ "$MODE" == "integration" || "$MODE" == "all" ]]; then
     "${SCRIPT_DIR}/test_fault_injection"
     echo "-- Network Resilience Integration: PASSED!"
 
-    if ${CONTAINER_ENGINE} network inspect parity-spotter-net >/dev/null 2>&1 || ${CONTAINER_ENGINE} network create --subnet=192.168.12.0/24 parity-spotter-net >/dev/null 2>&1; then
+    if ${CONTAINER_ENGINE} network inspect parity-spotter-net >/dev/null 2>&1 || ${CONTAINER_ENGINE} network create --subnet=192.168.12.0/24 --gateway=192.168.12.254 parity-spotter-net >/dev/null 2>&1; then
         echo "--- Step 8: Running Discovery Parity Tests (test_parity) ---"
         echo "Building legacy discovery node container and simulated BACnet device image..."
         "${WORKSPACE_DIR}/misc/discoverynode/bin/build_container" test-discovery_node >/dev/null

edge/spotter/bin/test_parity

@@ -25,9 +25,17 @@ import paho.mqtt.client as mqtt  # pylint: disable=g-import-not-at-top
 sys.path.insert(0, os.path.join(_workspace_dir, "clientlib/python/src"))
 sys.path.insert(0, _workspace_dir)
 
-CONTAINER_ENGINE = os.environ.get("CONTAINER_ENGINE") or (
-    "podman" if shutil.which("podman") else "docker"
-)
+def get_container_engine():
+  if os.environ.get("CONTAINER_ENGINE"):
+    return os.environ["CONTAINER_ENGINE"]
+  if shutil.which("docker"):
+    return "docker"
+  if shutil.which("podman"):
+    return "podman"
+  return "docker"
+
+
+CONTAINER_ENGINE = get_container_engine()
 PARITY_TEST_NUM_DEVICES = int(os.environ.get("PARITY_TEST_NUM_DEVICES", "2"))
 
 
@@ -116,17 +124,36 @@ class TestParity(unittest.TestCase):
         check=False,
     )
     if res.returncode != 0:
-      subprocess.run(
-          [
-              CONTAINER_ENGINE,
-              "network",
-              "create",
-              "--subnet=192.168.12.0/24",
-              "--gateway=192.168.12.254",
-              "parity-spotter-net",
-          ],
-          check=True,
-      )
+      try:
+        subprocess.run(
+            [
+                CONTAINER_ENGINE,
+                "network",
+                "create",
+                "--subnet=192.168.12.0/24",
+                "--gateway=192.168.12.254",
+                "parity-spotter-net",
+            ],
+            check=True,
+        )
+      except subprocess.CalledProcessError:
+        subprocess.run(
+            [CONTAINER_ENGINE, "network", "rm", "-f", "parity-spotter-net"],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+            check=False,
+        )
+        subprocess.run(
+            [
+                CONTAINER_ENGINE,
+                "network",
+                "create",
+                "--subnet=192.168.12.0/24",
+                "--gateway=192.168.12.254",
+                "parity-spotter-net",
+            ],
+            check=True,
+        )
 
   def setUp(self):
     # pylint: disable=consider-using-with
@@ -215,17 +242,20 @@ allow_anonymous true
         check=False,
     )
     if res.returncode != 0:
-      subprocess.run(
-          [
-              CONTAINER_ENGINE,
-              "network",
-              "create",
-              "--subnet=192.168.12.0/24",
-              "--gateway=192.168.12.254",
-              "parity-spotter-net",
-          ],
-          check=True,
-      )
+      try:
+        subprocess.run(
+            [
+                CONTAINER_ENGINE,
+                "network",
+                "create",
+                "--subnet=192.168.12.0/24",
+                "--gateway=192.168.12.254",
+                "parity-spotter-net",
+            ],
+            check=True,
+        )
+      except subprocess.CalledProcessError:
+        pass
 
     # 4. Start N simulated BACnet devices
     self.simulated_devices = []