COMAC-162 Fix test scenario to wait until DP is ready

It takes more than 30s to resolve ARP for S1U and SGI entities in some
environments. Fixed test scenario to wait until ARP resolved and increased
timeout to 60s.
NGIC images are also changed to the one built without STATIC_ARP option.

Change-Id: I917c7854bb59088f21dd5223f21e5b06415a1807
diff --git a/comac-in-a-box/Makefile b/comac-in-a-box/Makefile
index bf536b2..696b40f 100644
--- a/comac-in-a-box/Makefile
+++ b/comac-in-a-box/Makefile
@@ -174,7 +174,11 @@
 	touch $@
 
 test: | $(M)/router
-	@timeout 30s bash -c "until timeout 1 ping -I oip1 13.1.1.254 -c 1; do sleep 1; done"
+	@timeout 60s bash -c \
+	"until timeout 3 ping -I oip1 13.1.1.254 -c 1 > /dev/null 2>&1; do \
+		echo 'Waiting for DP to be ready'; \
+	done"
+	ping -I oip1 13.1.1.254 -c 3
 
 reset-test:
 	kubectl delete po router || true