This is an automated email from the ASF dual-hosted git repository.
rob 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 fd838be Add Grove to TO unit tests and TO API tests Docker images
(#4840)
fd838be is described below
commit fd838becca04212ff4c6459a4e8c48b262edd8c8
Author: Zach Hoffman <[email protected]>
AuthorDate: Tue Jun 30 16:41:16 2020 +0000
Add Grove to TO unit tests and TO API tests Docker images (#4840)
* Add Grove to Traffic Ops unit tests Docker image
* Add golang.org/x/sys/unix and Grove as dependencies in the Traffic Ops
API tests Docker image
---
infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile | 3 ++-
traffic_ops/app/bin/tests/Dockerfile-golangtest | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
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 ee98c9b..203a3b5 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_ops_integration_test/Dockerfile
@@ -19,7 +19,7 @@ FROM golang:1.14.2-alpine3.11 AS integration-builder
RUN apk add --no-cache --update git gcc
-RUN go get -u golang.org/x/net/publicsuffix golang.org/x/crypto/scrypt
+RUN go get -u golang.org/x/net/publicsuffix golang.org/x/crypto/scrypt
golang.org/x/sys/unix
RUN go get -u github.com/jstemmer/go-junit-report
RUN cd /go/src/github.com/jstemmer/go-junit-report && go build
@@ -28,6 +28,7 @@ COPY ./infrastructure/cdn-in-a-box/
/go/src/github.com/apache/trafficcontrol/inf
COPY ./vendor/ /go/src/github.com/apache/trafficcontrol/vendor/
COPY ./traffic_ops/vendor/
/go/src/github.com/apache/trafficcontrol/traffic_ops/vendor/
COPY ./lib/ /go/src/github.com/apache/trafficcontrol/lib/
+COPY ./grove/ /go/src/github.com/apache/trafficcontrol/grove/
COPY ./traffic_ops/v1-client/
/go/src/github.com/apache/trafficcontrol/traffic_ops/v1-client/
COPY ./traffic_ops/v2-client/
/go/src/github.com/apache/trafficcontrol/traffic_ops/v2-client/
COPY ./traffic_ops/client/
/go/src/github.com/apache/trafficcontrol/traffic_ops/client/
diff --git a/traffic_ops/app/bin/tests/Dockerfile-golangtest
b/traffic_ops/app/bin/tests/Dockerfile-golangtest
index 27e6dc4..55098d7 100644
--- a/traffic_ops/app/bin/tests/Dockerfile-golangtest
+++ b/traffic_ops/app/bin/tests/Dockerfile-golangtest
@@ -18,6 +18,7 @@ ARG DIR=github.com/apache/trafficcontrol
ADD traffic_ops /go/src/$DIR/traffic_ops
ADD lib /go/src/$DIR/lib
ADD traffic_monitor /go/src/$DIR/traffic_monitor
+ADD grove /go/src/$DIR/grove
ADD vendor /go/src/$DIR/vendor
WORKDIR /go/src/$DIR/traffic_ops/traffic_ops_golang