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 497b6e0 Fix v2 tests in trafficops integration container (#4535)
497b6e0 is described below
commit 497b6e05cf9435fee5d7d2684020460e51542a0a
Author: Michael Hoppal <[email protected]>
AuthorDate: Tue Mar 24 10:25:53 2020 -0600
Fix v2 tests in trafficops integration container (#4535)
---
.../cdn-in-a-box/traffic_ops_integration_test/Dockerfile | 6 +++---
infrastructure/cdn-in-a-box/traffic_ops_integration_test/run.sh | 9 ++-------
2 files changed, 5 insertions(+), 10 deletions(-)
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 768647c..da8c369 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile
@@ -46,8 +46,7 @@ RUN apk add --no-cache --update \
bash \
nmap \
bind-tools \
- net-tools \
- postgresql-client
+ net-tools
# MANIFEST
# run.sh (wait on TO, then run bin)
@@ -58,7 +57,8 @@ RUN apk add --no-cache --update \
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/traffic_ops_integration_test/config.sh
/opt/integration/app/
-COPY ./traffic_ops/testing/api/v1/tc-fixtures.json
/opt/integration/app/
+COPY ./traffic_ops/testing/api/v1/tc-fixtures.json
/opt/integration/app/tc-fixtures-v1.json
+COPY ./traffic_ops/testing/api/v2/tc-fixtures.json
/opt/integration/app/tc-fixtures-v2.json
COPY --from=integration-builder \
/go/src/github.com/apache/trafficcontrol/traffic_ops/testing/api/traffic_ops_v1_integration_test
\
/opt/integration/app/
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 78f721c..9dcc007 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
@@ -39,14 +39,9 @@ done
# if [[ -x ]]; then;./config.sh; done traffic_ops/run-go.sh
source config.sh
-PGPASSWORD="$DB_USER_PASS" pg_dump --blobs --no-owner --format=c
"--host=$DB_SERVER" "--port=$DB_PORT" "--username=$DB_USER" traffic_ops >
dbdump.manual
-to-get api/2.0/dbdump > dbdump.api
-
-diff dbdump.api dbdump.manual && rm -f dbdump.api dbdump.manual
-
-./traffic_ops_v1_integration_test -test.v -cfg=traffic-ops-test.conf 2>&1 |
./go-junit-report --package-name=golang.test.toapi.v1 --set-exit-code >
/junit/golang.test.toapi.v1.xml && find /junit -type 'f' | xargs chmod 664
+./traffic_ops_v1_integration_test -test.v -cfg=traffic-ops-test.conf
-fixtures=tc-fixtures-v1.json 2>&1 | ./go-junit-report
--package-name=golang.test.toapi.v1 --set-exit-code >
/junit/golang.test.toapi.v1.xml && find /junit -type 'f' | xargs chmod 664
export v1=$?
-./traffic_ops_v2_integration_test -test.v -cfg=traffic-ops-test.conf 2>&1 |
./go-junit-report --package-name=golang.test.toapi.v2 --set-exit-code >
/junit/golang.test.toapi.v2.xml && find /junit -type 'f' | xargs chmod 664
+./traffic_ops_v2_integration_test -test.v -cfg=traffic-ops-test.conf
-fixtures=tc-fixtures-v2.json 2>&1 | ./go-junit-report
--package-name=golang.test.toapi.v2 --set-exit-code >
/junit/golang.test.toapi.v2.xml && find /junit -type 'f' | xargs chmod 664
export v2=$?
cat /junit/golang.test.toapi.v1.xml /junit/golang.test.toapi.v2.xml
