(fixed) test script liblwip.so placement, also streamlined test logic

5 files changed, 6 insertions, 66 deletions

diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile
index 08f08ae1..e8f803cd 100644
--- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile
+++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_dockerfile
@@ -4,6 +4,9 @@ MAINTAINER https://www.zerotier.com/
 
 EXPOSE 9993/udp
 
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
 ADD monitor_identity.public /var/lib/zerotier-one/identity.public
@@ -14,11 +17,6 @@ ADD *.name /
 ADD zerotier-one /
 ADD zerotier-cli /
 
-# Install LWIP library used by service
-ADD liblwip.so /
-RUN mkdir -p ext/bin/lwip
-RUN cp liblwip.so ext/bin/lwip/liblwip.so
-
 # Start ZeroTier-One
 ADD monitor_entrypoint.sh /monitor_entrypoint.sh
 RUN chmod -v +x /monitor_entrypoint.sh
diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh
index 0170ae00..1701a467 100644
--- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh
+++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh
@@ -23,15 +23,7 @@ echo '*** ZeroTier Network Containers Test Monitor'
 chown -R daemon /var/lib/zerotier-one
 chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-echo '*** Waiting for initial identity generation...'
-while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
-	sleep 0.2
-done
-echo '*** Waiting for network config...'
 virtip4=""
-while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
-	sleep 0.2
-done
 while [ -z "$virtip4" ]; do
 	sleep 0.2
 	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile
index d0ce01de..ea2abd68 100644
--- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile
+++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile
@@ -9,6 +9,9 @@ RUN yum clean all
 
 EXPOSE 9993/udp 8080/udp
 
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
 # 
 ADD httpserver.js /
 
@@ -35,10 +38,5 @@ ADD zerotier-cli /
 ADD netcon_entrypoint.sh /netcon_entrypoint.sh
 RUN chmod -v +x /netcon_entrypoint.sh
 
-# Install LWIP library used by service
-ADD liblwip.so /
-RUN mkdir -p ext/bin/lwip
-RUN cp liblwip.so ext/bin/lwip/liblwip.so
-
 # Start ZeroTier-One
 CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh
index d18f3e1c..a6aadb9f 100644
--- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh
+++ b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh
@@ -19,15 +19,7 @@ echo '*** ZeroTier Network Containers Test: ' "$test_name"
 chown -R daemon /var/lib/zerotier-one
 chgrp -R daemon /var/lib/zerotier-one
 su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-echo '*** Waiting for initial identity generation...'
-while [ ! -s /var/lib/zerotier-one/identity.secret ]; do
-	sleep 0.2
-done
-echo '*** Waiting for network config...'
 virtip4=""
-while [ ! -s /var/lib/zerotier-one/networks.d/"$nwconf" ]; do
-	sleep 0.2
-done
 while [ -z "$virtip4" ]; do
 	sleep 0.2
 	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
diff --git a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/test.sh b/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/test.sh
deleted file mode 100755
index fa8daddd..00000000
--- a/netcon/docker-test/nodejs/nodejs-0.10.36-4.fc23/test.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-
-test_name=${PWD##*/}
-echo 'Building dockerfiles for test: ' "$test_name"
-touch "$test_name".name
-
-# Docker won't allow the inclusion of files outside of the build directory
-cp ../../*.conf .
-cp ../../zerotier-one zerotier-one
-cp ../../zerotier-cli zerotier-cli
-cp ../../zerotier-intercept zerotier-intercept
-cp ../../libzerotierintercept.so.1.0 libzerotierintercept.so.1.0
-cp ../../liblwip.so liblwip.so
-cp ../../netcon_identity.public netcon_identity.public
-cp ../../netcon_identity.secret netcon_identity.secret
-cp ../../monitor_identity.public monitor_identity.public
-cp ../../monitor_identity.secret monitor_identity.secret
-
-docker build --tag="$test_name" -f netcon_dockerfile .
-docker build --tag="$test_name"_monitor -f monitor_dockerfile .
-
-rm -f zerotier-one
-rm -f zerotier-cli
-rm -f zerotier-intercept
-rm -f libzerotierintercept.so.1.0
-rm -f liblwip.so
-rm -f netcon_identity.public
-rm -f netcon_identity.secret
-rm -f monitor_identity.public
-rm -f monitor_identity.secret
-rm -f *.conf
-rm -f *.name
-
-# Start netcon container to be tested
-docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest
-docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest
-
-sleep 45s
-docker kill $(docker ps -a -q)
-
-rm -rf ../../_results/*.tmp
\ No newline at end of file