gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed old netcon references in docker test files

Browse Source
This commit is contained in:
Joseph Henry
2016-07-06 16:58:58 -05:00
parent e6fbbfc249
commit f9fcc89f62
53 changed files with 275 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_entrypoint.sh
View File

@@ -8,7 +8,7 @@ test_namefile=$(ls *.name)
test_name="${test_namefile%.*}" # test network id
nwconf=$(ls *.conf) # blank test network config file
nwid="${nwconf%.*}" # test network id
netcon_wait_time=35 # wait for test container to come online
sdk_wait_time=35 # wait for test container to come online
app_timeout_time=25 # app-specific timeout
file_path=/opt/results/ # test result output file path (fs shared between host and containers)
file_base="$test_name".txt # test result output file
@@ -33,8 +33,8 @@ while [ -z "$virtip4" ]; do
done
echo '*** Starting Test...'
echo '*** Up and running at' $virtip4 ' on network: ' $nwid
echo '*** Sleeping for (' "$netcon_wait_time" 's ) while we wait for the Network Container to come online...'
sleep "$netcon_wait_time"s
echo '*** Sleeping for (' "$sdk_wait_time" 's ) while we wait for the Network Container to come online...'
sleep "$sdk_wait_time"s
ncvirtip=$(<$address_file)

10
tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_dockerfile → tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/sdk_dockerfile
View File

@@ -14,8 +14,8 @@ EXPOSE 9993/udp 80/udp
# 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 sdk_identity.public /var/lib/zerotier-one/identity.public
ADD sdk_identity.secret /var/lib/zerotier-one/identity.secret
ADD *.conf /var/lib/zerotier-one/networks.d/
ADD *.conf /
ADD *.name /
@@ -32,10 +32,10 @@ ADD zerotier-cli /
ADD zerotier-sdk-service /
# Install test scripts
ADD netcon_entrypoint.sh /netcon_entrypoint.sh
RUN chmod -v +x /netcon_entrypoint.sh
ADD sdk_entrypoint.sh /sdk_entrypoint.sh
RUN chmod -v +x /sdk_entrypoint.sh
ADD nginx.conf_ /
# Start ZeroTier-One
CMD ["./netcon_entrypoint.sh"]
CMD ["./sdk_entrypoint.sh"]

0
tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_entrypoint.sh → tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/sdk_entrypoint.sh
View File

4
tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/_two_party_test.sh
View File

@@ -7,8 +7,8 @@ touch "$test_name".name
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
echo "waiting $sdk_test_wait_time for test to complete."
sleep $sdk_test_wait_time
docker stop $(docker ps -a -q)
docker rm $test_container
docker rm $monitor_container

6
tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh
View File

@@ -8,7 +8,7 @@ test_namefile=$(ls *.name)
test_name="${test_namefile%.*}" # test network id
nwconf=$(ls *.conf) # blank test network config file
nwid="${nwconf%.*}" # test network id
netcon_wait_time=35 # wait for test container to come online
sdk_wait_time=35 # wait for test container to come online
app_timeout_time=25 # app-specific timeout
file_path=/opt/results/ # test result output file path (fs shared between host and containers)
file_base="$test_name".txt # test result output file
@@ -33,8 +33,8 @@ while [ -z "$virtip4" ]; do
done
echo '*** Starting Test...'
echo '*** Up and running at' $virtip4 ' on network: ' $nwid
echo '*** Sleeping for (' "$netcon_wait_time" 's ) while we wait for the Network Container to come online...'
sleep "$netcon_wait_time"s
echo '*** Sleeping for (' "$sdk_wait_time" 's ) while we wait for the Network Container to come online...'
sleep "$sdk_wait_time"s
ncvirtip=$(<$address_file)

10
tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile → tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/sdk_dockerfile
View File

@@ -11,8 +11,8 @@ EXPOSE 9993/udp 80/udp
# 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 sdk_identity.public /var/lib/zerotier-one/identity.public
ADD sdk_identity.secret /var/lib/zerotier-one/identity.secret
ADD *.conf /var/lib/zerotier-one/networks.d/
ADD *.conf /
ADD *.name /
@@ -29,10 +29,10 @@ ADD zerotier-cli /
ADD zerotier-sdk-service /
# Install test scripts
ADD netcon_entrypoint.sh /netcon_entrypoint.sh
RUN chmod -v +x /netcon_entrypoint.sh
ADD sdk_entrypoint.sh /sdk_entrypoint.sh
RUN chmod -v +x /sdk_entrypoint.sh
ADD nginx.conf_ /
# Start ZeroTier-One
CMD ["./netcon_entrypoint.sh"]
CMD ["./sdk_entrypoint.sh"]

0
tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh → tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/sdk_entrypoint.sh
View File

6
tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh
View File

@@ -8,7 +8,7 @@ test_namefile=$(ls *.name)
test_name="${test_namefile%.*}" # test network id
nwconf=$(ls *.conf) # blank test network config file
nwid="${nwconf%.*}" # test network id
netcon_wait_time=35 # wait for test container to come online
sdk_wait_time=35 # wait for test container to come online
app_timeout_time=25 # app-specific timeout
file_path=/opt/results/ # test result output file path (fs shared between host and containers)
file_base="$test_name".txt # test result output file
@@ -33,8 +33,8 @@ while [ -z "$virtip4" ]; do
done
echo '*** Starting Test...'
echo '*** Up and running at' $virtip4 ' on network: ' $nwid
echo '*** Sleeping for (' "$netcon_wait_time" 's ) while we wait for the Network Container to come online...'
sleep "$netcon_wait_time"s
echo '*** Sleeping for (' "$sdk_wait_time" 's ) while we wait for the Network Container to come online...'
sleep "$sdk_wait_time"s
ncvirtip=$(<$address_file)

10
tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile → tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/sdk_dockerfile
View File

@@ -11,8 +11,8 @@ EXPOSE 9993/udp 80/udp
# 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 sdk_identity.public /var/lib/zerotier-one/identity.public
ADD sdk_identity.secret /var/lib/zerotier-one/identity.secret
ADD *.conf /var/lib/zerotier-one/networks.d/
ADD *.conf /
ADD *.name /
@@ -29,10 +29,10 @@ ADD zerotier-cli /
ADD zerotier-sdk-service /
# Install test scripts
ADD netcon_entrypoint.sh /netcon_entrypoint.sh
RUN chmod -v +x /netcon_entrypoint.sh
ADD sdk_entrypoint.sh /sdk_entrypoint.sh
RUN chmod -v +x /sdk_entrypoint.sh
ADD nginx.conf_ /
# Start ZeroTier-One
CMD ["./netcon_entrypoint.sh"]
CMD ["./sdk_entrypoint.sh"]

0
tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh → tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/sdk_entrypoint.sh
View File