This is an automated email from the ASF dual-hosted git repository.
rawlin 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 3a5ff41 CiaB: Unset DIG_IP_RETRY for TO test and TP test (#5560)
3a5ff41 is described below
commit 3a5ff4181aac37b1991574b6e6d945358834a02d
Author: Zach Hoffman <[email protected]>
AuthorDate: Mon Feb 22 15:23:15 2021 -0700
CiaB: Unset DIG_IP_RETRY for TO test and TP test (#5560)
* Unset DIG_IP_RETRY and LOAD_TRAFFIC_OPS_DATA for the TO API tests
* Unset DIG_IP_RETRY for the TP UI tests
---
infrastructure/cdn-in-a-box/docker-compose.traffic-ops-test.yml | 9 +++++++--
.../cdn-in-a-box/docker-compose.traffic-portal-test.yml | 8 ++++++--
2 files changed, 13 insertions(+), 4 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 02bc077..41ef0d9 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
@@ -20,8 +20,8 @@
# make sure any container rpms you need are updated. Below is an
# example of how to run the main compose with this file:
#
-# docker-compose up --build db trafficops
-# docker-compose -f docker-compose.traffic-ops-test.yml up --build integration
+# docker-compose -f docker-compose.yml -f docker-compose.traffic-ops-test.yml
up -d edge enroller dns db smtp trafficops trafficvault integration
+# docker-compose -f docker-compose.yml -f docker-compose.traffic-ops-test.yml
logs -f integration
---
version: '2.1'
@@ -39,6 +39,11 @@ services:
- shared:/shared
- ../../junit:/junit
+ trafficops:
+ environment:
+ DIG_IP_RETRY: ${DIG_IP_RETRY:-0}
+ LOAD_TRAFFIC_OPS_DATA: ${LOAD_TRAFFIC_OPS_DATA:-false}
+
volumes:
junit:
shared:
diff --git a/infrastructure/cdn-in-a-box/docker-compose.traffic-portal-test.yml
b/infrastructure/cdn-in-a-box/docker-compose.traffic-portal-test.yml
index f7eadbb..8366624 100644
--- a/infrastructure/cdn-in-a-box/docker-compose.traffic-portal-test.yml
+++ b/infrastructure/cdn-in-a-box/docker-compose.traffic-portal-test.yml
@@ -20,8 +20,8 @@
# make sure any container rpms you need are updated. Below is an
# example of how to run the main compose with this file:
#
-# docker-compose up --build db trafficops trafficportal
-# docker-compose -f docker-compose.traffic-portal-test.yml up --build
+# docker-compose -f docker-compose.yml -f
docker-compose.traffic-portal-test.yml up -d db edge trafficportal trafficops
trafficvault portal-integration-test
+# docker-compose -f docker-compose.yml -f
docker-compose.traffic-portal-test.yml logs -f portal-integration-test
---
version: '2.1'
@@ -43,6 +43,10 @@ services:
- shared:/shared
- ../../junit:/junit
+ trafficops:
+ environment:
+ DIG_IP_RETRY: ${DIG_IP_RETRY:-0}
+
volumes:
shared:
external: false
