[trafficcontrol] 03/04: Updated instructions and fixed file references

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dangogh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git

commit 29f0b62ba795b6ea711d3f860091c01374d356fd
Author: moltzaum <ma...@moltzau.net>
AuthorDate: Tue Nov 6 13:37:04 2018 -0700

    Updated instructions and fixed file references
---
 .../docker-compose.traffic-ops-test.yml            | 23 ++++++++--------------
 .../traffic_ops_integration_test/Dockerfile        |  6 +++---
 .../traffic_ops_integration_test/run.sh            |  2 +-
 3 files changed, 12 insertions(+), 19 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 c6dd25b..2a30c62 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
@@ -15,20 +15,13 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-# To use this compose you should first build Traffic Ops and then copy the RPM to :
-#
-# trafficcontrol/infrastructure/cdn-in-a-box/traffic_ops/traffic_ops.rpm
-#
-#      cd trafficcontrol/infrastructure/cdn-in-a-box
-#
-# Adjust the settings in `variables.env` to suit your needs.
-#
-#      docker-compose up -d
-#
-# The Traffic Ops Go API will then be available on https://localhost:6443,
-# the Perl API on https://localhost:60443, and the postgres database on localhost 5432.
-#
-# Note that this setup is intended for testing and not for production use.
+# This compose file runs the traffic ops integration tests assuming
+# there is already a trafficops 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
 
 ---
 version: '2.1'
@@ -47,7 +40,7 @@ services:
   integration:
     build:
       context: ../..
-      dockerfile: infrastructure/cdn-in-a-box/to_integration/Dockerfile
+      dockerfile: infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile
     env_file: 
       - variables.env
     hostname: integration
diff --git a/infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile b/infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile
index 41b40cf..768ed48 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile
@@ -22,7 +22,7 @@ COPY ./lib/ /go/src/github.com/apache/trafficcontrol/lib/
 COPY ./vendor/ /go/src/github.com/apache/trafficcontrol/vendor/
 COPY ./traffic_ops/client/ /go/src/github.com/apache/trafficcontrol/traffic_ops/client/
 COPY ./traffic_ops/vendor/ /go/src/github.com/apache/trafficcontrol/traffic_ops/vendor/
-COPY ./infrastructure/cdn-in-a-box/to_integration/ /go/src/github.com/apache/trafficcontrol/infrastructure/cdn-in-a-box/to_integration/
+COPY ./infrastructure/cdn-in-a-box/traffic_ops_integration_test/ /go/src/github.com/apache/trafficcontrol/infrastructure/cdn-in-a-box/traffic_ops_integration_test/
 COPY ./traffic_ops/testing/api /go/src/github.com/apache/trafficcontrol/traffic_ops/testing/api
 COPY ./traffic_ops/traffic_ops_golang /go/src/github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang
 COPY ./infrastructure/cdn-in-a-box/ /go/src/github.com/apache/trafficcontrol/infrastructure/cdn-in-a-box/
@@ -41,9 +41,9 @@ RUN apt-get update && apt-get install -y netcat curl dnsutils net-tools vim && a
 # config.sh                     (sourced, and creates config for bin file)
 # tc-fixtures.json              (test data to run tests with)
 # traffic_ops_integration_test  (main bin, from integration-builder)
-COPY ./infrastructure/cdn-in-a-box/to_integration/run.sh    /opt/integration/app/
+COPY ./infrastructure/cdn-in-a-box/traffic_ops_integration_test/run.sh    /opt/integration/app/
 COPY ./infrastructure/cdn-in-a-box/traffic_ops/to-access.sh /opt/integration/app/
-COPY ./infrastructure/cdn-in-a-box/to_integration/config.sh /opt/integration/app/
+COPY ./infrastructure/cdn-in-a-box/traffic_ops_integration_test/config.sh /opt/integration/app/
 COPY ./traffic_ops/testing/api/v14/tc-fixtures.json         /opt/integration/app/
 COPY --from=integration-builder \
     /go/src/github.com/apache/trafficcontrol/traffic_ops/testing/api/traffic_ops_integration_test \
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 c6b36bd..c1403b2 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
@@ -35,6 +35,6 @@ done
 # if [[ -x ]]; then;./config.sh; done          traffic_ops/run-go.sh
 source config.sh
 
-./traffic_ops_integration -cfg=traffic-ops-test.conf
+./traffic_ops_integration_test -cfg=traffic-ops-test.conf
 exit $?