You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by oc...@apache.org on 2023/01/11 18:32:15 UTC
[trafficcontrol] branch master updated: Docker go tests runners: Unwrap commands from bash shell to inherit environment variables (#7281)
This is an automated email from the ASF dual-hosted git repository.
ocket8888 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 1cb5ae4dd0 Docker go tests runners: Unwrap commands from bash shell to inherit environment variables (#7281)
1cb5ae4dd0 is described below
commit 1cb5ae4dd01274aeb52cf00c17dae60fadb70bf9
Author: Zach Hoffman <zr...@apache.org>
AuthorDate: Wed Jan 11 11:32:09 2023 -0700
Docker go tests runners: Unwrap commands from bash shell to inherit environment variables (#7281)
* Docker go tests runners: Unwrap commands from bash shell to inherit environment variables
* untab
---
traffic_monitor/tests/Dockerfile-golangtest | 10 +++++++---
traffic_ops/app/bin/tests/Dockerfile-golangtest | 3 ++-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/traffic_monitor/tests/Dockerfile-golangtest b/traffic_monitor/tests/Dockerfile-golangtest
index 2daa2709e9..f809664c23 100644
--- a/traffic_monitor/tests/Dockerfile-golangtest
+++ b/traffic_monitor/tests/Dockerfile-golangtest
@@ -18,6 +18,7 @@ FROM debian:buster
COPY --from=get-go /usr/local/go /usr/local/go
ENV PATH=/usr/local/go/bin:${PATH} \
GOPATH=/go
+ENV PATH=${GOPATH}/bin:${PATH}
RUN apt-get update && \
apt-get install -y --no-install-recommends \
@@ -41,8 +42,11 @@ VOLUME ["/junit"]
WORKDIR /go/src/$DIR/traffic_monitor
-RUN bash -c "go install github.com/jstemmer/go-junit-report@latest"
-RUN bash -c "go mod vendor -v"
-CMD bash -c 'go test -v ./... ../lib/go-tc/... 2>&1 | go-junit-report --package-name=golang.test.tm --set-exit-code > /junit/golang.test.tm.xml && chmod 777 -R /junit && cat /junit/golang.test.tm.xml'
+RUN go install github.com/jstemmer/go-junit-report@latest
+RUN go mod vendor -v
+CMD go test -v ./... ../lib/go-tc/... 2>&1 | \
+ go-junit-report --package-name=golang.test.tm --set-exit-code > /junit/golang.test.tm.xml && \
+ chmod 777 -R /junit && \
+ cat /junit/golang.test.tm.xml
#
# vi:syntax=Dockerfile
diff --git a/traffic_ops/app/bin/tests/Dockerfile-golangtest b/traffic_ops/app/bin/tests/Dockerfile-golangtest
index aa7a1ac9e9..b8807235bf 100644
--- a/traffic_ops/app/bin/tests/Dockerfile-golangtest
+++ b/traffic_ops/app/bin/tests/Dockerfile-golangtest
@@ -20,6 +20,7 @@ ARG DIR=github.com/apache/trafficcontrol
COPY --from=get-go /usr/local/go /usr/local/go
ENV PATH=/usr/local/go/bin:${PATH} \
GOPATH=/go
+ENV PATH=${GOPATH}/bin:${PATH}
RUN apt-get update && \
apt-get install -y --no-install-recommends \
@@ -39,6 +40,6 @@ ADD vendor /go/src/$DIR/vendor
WORKDIR /go/src/$DIR/traffic_ops/traffic_ops_golang
-CMD bash -c 'go mod vendor -v && go test -cover -v ./... ../../lib/go-tc/...'
+CMD go mod vendor -v && go test -cover -v ./... ../../lib/go-tc/...
#
# vi:syntax=Dockerfile