This is an automated email from the ASF dual-hosted git repository.
rob pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 0419b8a change cdn-in-a-box integration tests to use ddns
0419b8a is described below
commit 0419b8a89577cdbec433cff47dcf804bcfa6a9a4
Author: Dan Kirkwood <dang...@apache.org>
AuthorDate: Wed Jan 16 10:06:05 2019 -0700
change cdn-in-a-box integration tests to use ddns
---
.../cdn-in-a-box/docker-compose.traffic-ops-test.yml | 15 ++-------------
.../cdn-in-a-box/traffic_ops_integration_test/run.sh | 4 +++-
2 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/infrastructure/cdn-in-a-box/docker-compose.traffic-ops-test.yml
b/infrastructure/cdn-in-a-box/docker-compose.traffic-ops-test.yml
index 010a782..abe1959 100644
--- a/infrastructure/cdn-in-a-box/docker-compose.traffic-ops-test.yml
+++ b/infrastructure/cdn-in-a-box/docker-compose.traffic-ops-test.yml
@@ -26,16 +26,6 @@
---
version: '2.1'
-networks:
- tcnet:
- driver: bridge
- enable_ipv6: true
- ipam:
- driver: default
- config:
- - subnet: 172.16.239.0/24
- - subnet: "fc01:9400:1000:8::/64"
-
services:
integration:
build:
@@ -45,11 +35,10 @@ services:
- variables.env
hostname: integration
domainname: infra.ciab.test
- networks:
- tcnet:
volumes:
- shared:/shared
- - ./dns/container-resolv.conf:/etc/resolv.conf
+ - ./dns/set-dns.sh:/usr/local/sbin/set-dns.sh
+ - ./dns/insert-self-into-dns.sh:/usr/local/sbin/insert-self-into-dns.sh
volumes:
shared:
diff --git a/infrastructure/cdn-in-a-box/traffic_ops_integration_test/run.sh
b/infrastructure/cdn-in-a-box/traffic_ops_integration_test/run.sh
index c1403b2..a6291a6 100755
--- a/infrastructure/cdn-in-a-box/traffic_ops_integration_test/run.sh
+++ b/infrastructure/cdn-in-a-box/traffic_ops_integration_test/run.sh
@@ -25,6 +25,9 @@ done
source to-access.sh
+set-dns.sh
+insert-self-into-dns.sh
+
TO_URL="https://$TO_FQDN:$TO_PORT";
while ! to-ping 2>/dev/null; do
echo waiting for trafficops
@@ -37,4 +40,3 @@ source config.sh
./traffic_ops_integration_test -cfg=traffic-ops-test.conf
exit $?
-
