diff options
| author | Joseph Henry <josephjah@gmail.com> | 2015-12-03 18:50:20 -0800 |
|---|---|---|
| committer | Joseph Henry <josephjah@gmail.com> | 2015-12-03 18:50:20 -0800 |
| commit | 2196d982c374231e09f41d23cc32932391036ee8 (patch) | |
| tree | d38df4d0ee567bfe12b6e949af1c2923260370f7 /netcon/docker-test/httpd | |
| parent | 5c5943a00c38f2540c6d30616e1b48222d1fa6c2 (diff) | |
| download | infinitytier-2196d982c374231e09f41d23cc32932391036ee8.tar.gz infinitytier-2196d982c374231e09f41d23cc32932391036ee8.zip | |
(fixed) nwid detection in test script
Diffstat (limited to 'netcon/docker-test/httpd')
4 files changed, 9 insertions, 6 deletions
diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh index 9e8f7253..52470efd 100644 --- a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh +++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh @@ -8,8 +8,8 @@ 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=25 # wait for test container to come online -app_timeout_time=15 # app-specific timeout +netcon_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 fail=FAIL. # appended to result file in event of failure diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh index 37277d53..1c5dcbd1 100644 --- a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh +++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh @@ -16,7 +16,6 @@ bigfile_name=bigfile bigfile_size=10M # size of file we want to use for the test tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext" - # --- Network Config --- echo '*** ZeroTier Network Containers Test: ' "$test_name" chown -R daemon /var/lib/zerotier-one @@ -26,11 +25,13 @@ virtip4="" 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` + dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^<dev>//" | tr '\n' '\0'` done -echo '*** Up and running at' $virtip4 ' on network: ' $nwid +echo '--- Up and running at' $virtip4 ' on network: ' $nwid echo '*** Writing address to ' "$address_file" echo $virtip4 > "$address_file" +export ZT_NC_NWID=$dev # --- Test section --- # Generate large random file for transfer test, share md5sum for monitor container to check diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_entrypoint.sh index 9e8f7253..52470efd 100644 --- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_entrypoint.sh +++ b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/monitor_entrypoint.sh @@ -8,8 +8,8 @@ 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=25 # wait for test container to come online -app_timeout_time=15 # app-specific timeout +netcon_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 fail=FAIL. # appended to result file in event of failure diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh index 37277d53..44f8db12 100644 --- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh +++ b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh @@ -26,11 +26,13 @@ virtip4="" 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` + dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^<dev>//" | tr '\n' '\0'` done echo '*** Up and running at' $virtip4 ' on network: ' $nwid echo '*** Writing address to ' "$address_file" echo $virtip4 > "$address_file" +export ZT_NC_NWID=$dev # --- Test section --- # Generate large random file for transfer test, share md5sum for monitor container to check |