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/01/30 17:55:12 UTC
[trafficcontrol] branch master updated: Switch golang api tests to
output in junit format (#3265)
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 c2e902c Switch golang api tests to output in junit format (#3265)
c2e902c is described below
commit c2e902c48858b284a6f18c36967d79186ca57bf1
Author: Robert Butts <ro...@users.noreply.github.com>
AuthorDate: Wed Jan 30 10:55:08 2019 -0700
Switch golang api tests to output in junit format (#3265)
---
.../cdn-in-a-box/docker-compose.traffic-ops-test.yml | 5 +++--
.../cdn-in-a-box/traffic_ops_integration_test/Dockerfile | 10 +++++++++-
.../cdn-in-a-box/traffic_ops_integration_test/config.sh | 10 +++++-----
.../cdn-in-a-box/traffic_ops_integration_test/run.sh | 3 +--
4 files changed, 18 insertions(+), 10 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 abe1959..8bd57de 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
@@ -31,7 +31,7 @@ services:
build:
context: ../..
dockerfile: infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile
- env_file:
+ env_file:
- variables.env
hostname: integration
domainname: infra.ciab.test
@@ -39,8 +39,9 @@ services:
- shared:/shared
- ./dns/set-dns.sh:/usr/local/sbin/set-dns.sh
- ./dns/insert-self-into-dns.sh:/usr/local/sbin/insert-self-into-dns.sh
-
+ - ../../junit:/junit
volumes:
+ junit:
shared:
external: false
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 768ed48..496b5f0 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile
@@ -32,6 +32,9 @@ WORKDIR /go/src/github.com/apache/trafficcontrol/traffic_ops/testing/api
RUN go get -u golang.org/x/net/publicsuffix golang.org/x/crypto/scrypt
RUN go test -c ./v1* -o traffic_ops_integration_test
+RUN go get -u github.com/jstemmer/go-junit-report
+RUN cd /go/src/github.com/jstemmer/go-junit-report && go build
+
FROM debian:stretch
RUN apt-get update && apt-get install -y netcat curl dnsutils net-tools vim && apt-get clean
@@ -49,6 +52,11 @@ COPY --from=integration-builder \
/go/src/github.com/apache/trafficcontrol/traffic_ops/testing/api/traffic_ops_integration_test \
/opt/integration/app/
+COPY --from=integration-builder \
+ /go/bin/go-junit-report \
+ /opt/integration/app/
+
+VOLUME ["/junit"]
+
WORKDIR /opt/integration/app
CMD ./run.sh
-
diff --git a/infrastructure/cdn-in-a-box/traffic_ops_integration_test/config.sh b/infrastructure/cdn-in-a-box/traffic_ops_integration_test/config.sh
index b192ce9..6dafbbb 100755
--- a/infrastructure/cdn-in-a-box/traffic_ops_integration_test/config.sh
+++ b/infrastructure/cdn-in-a-box/traffic_ops_integration_test/config.sh
@@ -31,11 +31,11 @@ cat <<-EOF >/opt/integration/app/traffic-ops-test.conf
{
"default": {
"logLocations": {
- "debug": "stdout",
- "error": "stdout",
- "event": "stdout",
- "info": "stdout",
- "warning": "stdout"
+ "debug": "null",
+ "error": "null",
+ "event": "null",
+ "info": "null",
+ "warning": "null"
},
"session": {
"timeoutInSecs": 60
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 a6291a6..1ac4874 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
@@ -38,5 +38,4 @@ done
# if [[ -x ]]; then;./config.sh; done traffic_ops/run-go.sh
source config.sh
-./traffic_ops_integration_test -cfg=traffic-ops-test.conf
-exit $?
+./traffic_ops_integration_test -test.v -cfg=traffic-ops-test.conf 2>&1 | ./go-junit-report --package-name=golang.test.toapi --set-exit-code > /junit/golang.test.toapi.xml && chmod 777 -R /junit && cat /junit/golang.test.toapi.xml