You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2019/05/10 01:22:43 UTC
[trafficcontrol] branch master updated: use google-chrome-stable in
TP tests (#3561)
This is an automated email from the ASF dual-hosted git repository.
mitchell852 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 799942d use google-chrome-stable in TP tests (#3561)
799942d is described below
commit 799942dc91450a89264ced39fc8988e1a1b9e164
Author: Dan Kirkwood <da...@apache.org>
AuthorDate: Thu May 9 19:22:38 2019 -0600
use google-chrome-stable in TP tests (#3561)
---
.../cdn-in-a-box/docker-compose.traffic-portal-test.yml | 8 ++++----
.../cdn-in-a-box/traffic_portal_integration_test/Dockerfile | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
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 062724f..1de361b 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
@@ -15,13 +15,13 @@
# specific language governing permissions and limitations
# under the License.
#
-# This compose file runs the traffic ops integration tests assuming
-# there is already a trafficops docker instance. When using docker,
+# This compose file runs the traffic portal integration tests assuming
+# there is already a trafficportal docker instance. When using docker,
# 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-perl trafficops
-# docker-compose -f docker-compose.traffic-ops-test.yml up --build integration
+# docker-compose up --build db trafficops trafficops-perl trafficportal
+# docker-compose -f docker-compose.traffic-portal-test.yml up --build
---
version: '2.1'
diff --git a/infrastructure/cdn-in-a-box/traffic_portal_integration_test/Dockerfile b/infrastructure/cdn-in-a-box/traffic_portal_integration_test/Dockerfile
index 197f8b6..a7d39d9 100644
--- a/infrastructure/cdn-in-a-box/traffic_portal_integration_test/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_portal_integration_test/Dockerfile
@@ -32,7 +32,7 @@ gpgkey=https://dl-ssl.google.com/linux/linux_signing_key.pub \n\
RUN yum update -y
-RUN yum install -y java-1.8.0-openjdk git google-chrome bind-utils net-tools
+RUN yum install -y java-1.8.0-openjdk git google-chrome-stable bind-utils net-tools
RUN curl -LO https://nodejs.org/dist/v10.15.0/node-v10.15.0-linux-x64.tar.xz