From cb4507d15ba546cbc881353a8fabda5839fbb7dc Mon Sep 17 00:00:00 2001
From: Wenjia Zhang <wenjiazhang@google.com>
Date: Mon, 5 Aug 2019 22:19:45 -0700
Subject: [PATCH] functional:update go.etcd.io/etcd link and go image registry
 for functional test

---
 functional/Dockerfile                     | 10 +++++-----
 functional/scripts/docker-local-agent.sh  |  2 +-
 functional/scripts/docker-local-tester.sh |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/functional/Dockerfile b/functional/Dockerfile
index cc904afba1f..e7da9459a0d 100644
--- a/functional/Dockerfile
+++ b/functional/Dockerfile
@@ -20,12 +20,12 @@ RUN rm -rf ${GOROOT} \
   && mkdir -p ${GOPATH}/src ${GOPATH}/bin \
   && go version
 
-RUN mkdir -p ${GOPATH}/src/github.com/etcd-io/etcd
-ADD . ${GOPATH}/src/github.com/etcd-io/etcd
+RUN mkdir -p ${GOPATH}/src/go.etcd.io/etcd
+ADD . ${GOPATH}/src/go.etcd.io/etcd
 ADD ./functional.yaml /functional.yaml
 
-RUN go get -v github.com/etcd-io/gofail \
-  && pushd ${GOPATH}/src/github.com/etcd-io/etcd \
+RUN go get -v go.etcd.io/gofail \
+  && pushd ${GOPATH}/src/go.etcd.io/etcd \
   && GO_BUILD_FLAGS="-v" ./build \
   && mkdir -p /bin \
   && cp ./bin/etcd /bin/etcd \
@@ -39,4 +39,4 @@ RUN go get -v github.com/etcd-io/gofail \
   && cp ./bin/etcd-tester /bin/etcd-tester \
   && go build -v -o /bin/benchmark ./tools/benchmark \
   && popd \
-  && rm -rf ${GOPATH}/src/github.com/etcd-io/etcd
\ No newline at end of file
+  && rm -rf ${GOPATH}/src/go.etcd.io/etcd
diff --git a/functional/scripts/docker-local-agent.sh b/functional/scripts/docker-local-agent.sh
index 7f65b4f1896..0c612f2d227 100755
--- a/functional/scripts/docker-local-agent.sh
+++ b/functional/scripts/docker-local-agent.sh
@@ -38,5 +38,5 @@ docker run \
   --rm \
   --net=host \
   --name ${AGENT_NAME} \
-  gcr.io/etcd-development/etcd-functional-tester:go${GO_VERSION} \
+  gcr.io/etcd-development/etcd-functional:go${GO_VERSION} \
   /bin/bash -c "./bin/etcd-agent ${AGENT_ADDR_FLAG}"
diff --git a/functional/scripts/docker-local-tester.sh b/functional/scripts/docker-local-tester.sh
index 82237d5c1b0..d3950133dff 100755
--- a/functional/scripts/docker-local-tester.sh
+++ b/functional/scripts/docker-local-tester.sh
@@ -14,5 +14,5 @@ docker run \
   --rm \
   --net=host \
   --name tester \
-  gcr.io/etcd-development/etcd-functional-tester:go${GO_VERSION} \
+  gcr.io/etcd-development/etcd-functional:go${GO_VERSION} \
   /bin/bash -c "./bin/etcd-tester --config ./functional.yaml"