test(fix): add mac support

NOAA-OWP · Feb 2, 2024 · 595540b · 595540b
1 parent 7d54429
commit 595540b
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/python/lib/scheduler/dmod/test/setup_it_env.sh b/python/lib/scheduler/dmod/test/setup_it_env.sh
@@ -14,15 +14,25 @@ it_redis_startup()
 
 do_setup()
 {
+
     # Make sure the necessary Docker networks have been set up, as the tests will fail otherwise
-    docker_dev_init_swarm_network ${DOCKER_MPI_NET_NAME:=mpi-net} \
-            ${DOCKER_MPI_NET_SUBNET:?Need to set MPI net subnet value for testing within .test_env} \
-            ${DOCKER_MPI_NET_GATEWAY:?Need to set MPI net gateway value for testing within .test_env} \
-            ${DOCKER_MPI_NET_VXLAN_ID:=4097}
+    if [ -z "${DOCKER_MPI_NET_VXLAN_ID:-}" ]; then
+        docker_dev_init_swarm_network ${DOCKER_MPI_NET_NAME:=mpi-net} \
+                    ${DOCKER_MPI_NET_SUBNET:?Need to set MPI net subnet value for testing within .test_env} \
+                    ${DOCKER_MPI_NET_GATEWAY:?Need to set MPI net gateway value for testing within .test_env} \
+                    ${DOCKER_MPI_NET_DRIVER:-overlay}
+    else
+        docker_dev_init_swarm_network ${DOCKER_MPI_NET_NAME:=mpi-net} \
+                ${DOCKER_MPI_NET_SUBNET:?Need to set MPI net subnet value for testing within .test_env} \
+                ${DOCKER_MPI_NET_GATEWAY:?Need to set MPI net gateway value for testing within .test_env} \
+                ${DOCKER_MPI_NET_DRIVER:=macvlan} \
+                ${DOCKER_MPI_NET_VXLAN_ID}
+    fi
     # Then the requests-net
     docker_dev_init_swarm_network ${DOCKER_REQUESTS_NET_NAME:=requests-net} \
             ${DOCKER_REQUESTS_NET_SUBNET:?Need to set requests net subnet value for testing within .test_env} \
-            ${DOCKER_REQUESTS_NET_GATEWAY:?Need to set requests net gateway value for testing within .test_env}
+            ${DOCKER_REQUESTS_NET_GATEWAY:?Need to set requests net gateway value for testing within .test_env} \
+            ${DOCKER_REQUESTS_NET_DRIVER:-overlay}
     # Need Docker container with Redis instance
     it_redis_startup
 }