(WIP) Additional test script changes

3 files changed, 31 insertions, 13 deletions

diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/_two_party_test.sh b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/_two_party_test.sh
new file mode 100755
index 00000000..164b0b2e
--- /dev/null
+++ b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/_two_party_test.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Runs test image and monitor image as daemons
+
+test_name=${PWD##*/}
+echo 'Building dockerfiles for test: ' "$test_name"
+touch "$test_name".name
+
+# Start netcon container to be tested
+test_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest)
+monitor_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest)
+
+echo "waiting $netcon_test_wait_time for test to complete."
+sleep $netcon_test_wait_time
+docker stop $(docker ps -a -q)
+docker rm $test_container
+docker rm $monitor_container
\ No newline at end of file
diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_dockerfile
index cbba716b..e6cd65a3 100644
--- a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_dockerfile
+++ b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/monitor_dockerfile
@@ -6,11 +6,6 @@ RUN yum -y install redis-3.0.4-1.fc23.x86_64
 
 EXPOSE 9993/udp
 
-# Install LWIP library used by service
-ADD liblwip.so /var/lib/zerotier-one/liblwip.so
-
-ADD hello.lua /
-
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
 ADD monitor_identity.public /var/lib/zerotier-one/identity.public
@@ -18,6 +13,12 @@ ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
 ADD *.conf /var/lib/zerotier-one/networks.d/
 ADD *.conf /
 ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+ADD hello.lua /
+
 ADD zerotier-one /
 ADD zerotier-cli /
 
diff --git a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile
index e2eed9fa..395241cd 100644
--- a/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile
+++ b/netcon/docker-test/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile
@@ -7,6 +7,14 @@ RUN yum -y update
 RUN yum -y install redis-3.0.4-1.fc23.x86_64
 RUN yum clean all
 
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD netcon_identity.public /var/lib/zerotier-one/identity.public
+ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
 EXPOSE 9993/udp 6379/udp
 
 # Install LWIP library used by service
@@ -20,14 +28,6 @@ RUN cp libzerotierintercept.so.1.0 /lib/libzerotierintercept.so.1.0
 RUN ln -sf /lib/libzerotierintercept.so.1.0 /lib/libzerotierintercept
 RUN /usr/bin/install -c zerotier-intercept /usr/bin
 
-# Add ZT files
-RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD netcon_identity.public /var/lib/zerotier-one/identity.public
-ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
-ADD *.conf /var/lib/zerotier-one/networks.d/
-ADD *.conf /
-ADD *.name /
-
 ADD zerotier-one /
 ADD zerotier-cli /