Merge pull request #10060 from vimalk78/go.etcd.io-move-minor-changes

*: path changes for moving to github/etcd-io/etcd

contrib/systemd/etcd.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=etcd key-value store
-Documentation=https://github.com/coreos/etcd
+Documentation=https://github.com/etcd-io/etcd
 After=network.target
 
 [Service]

functional.yaml

@@ -169,7 +169,7 @@ tester-config:
   case-shuffle: true
 
   # For full descriptions,
-  # https://godoc.org/github.com/coreos/etcd/functional/rpcpb#Case
+  # https://godoc.org/github.com/etcd-io/etcd/functional/rpcpb#Case
   cases:
   - SIGTERM_ONE_FOLLOWER
   - SIGTERM_ONE_FOLLOWER_UNTIL_TRIGGER_SNAPSHOT

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/coreos/etcd
-ADD . ${GOPATH}/src/github.com/coreos/etcd
+RUN mkdir -p ${GOPATH}/src/github.com/etcd-io/etcd
+ADD . ${GOPATH}/src/github.com/etcd-io/etcd
 ADD ./functional.yaml /functional.yaml
 
-RUN go get -v github.com/coreos/gofail \
-  && pushd ${GOPATH}/src/github.com/coreos/etcd \
+RUN go get -v github.com/etcd-io/gofail \
+  && pushd ${GOPATH}/src/github.com/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/coreos/gofail \
   && cp ./bin/etcd-tester /bin/etcd-tester \
   && go build -v -o /bin/benchmark ./tools/benchmark \
   && popd \
-  && rm -rf ${GOPATH}/src/github.com/coreos/etcd
+  && rm -rf ${GOPATH}/src/github.com/etcd-io/etcd

scripts/build-binary

@@ -17,7 +17,7 @@ function setup_env {
 	local ver=${2}
 
 	if [ ! -d "${proj}" ]; then
-		git clone https://github.com/coreos/"${proj}"
+		git clone https://github.com/etcd-io/"${proj}"
 	fi
 
 	pushd "${proj}" >/dev/null

scripts/build-docker

@@ -15,7 +15,7 @@ if [ -z "${BINARYDIR}" ]; then
 	RELEASE="etcd-${1}"-$(go env GOOS)-$(go env GOARCH)
 	BINARYDIR="${RELEASE}"
 	TARFILE="${RELEASE}.tar.gz"
-	TARURL="https://github.com/coreos/etcd/releases/download/${1}/${TARFILE}"
+	TARURL="https://github.com/etcd-io/etcd/releases/download/${1}/${TARFILE}"
 	if ! curl -f -L -o "${TARFILE}" "${TARURL}" ; then
 		echo "Failed to download ${TARURL}."
 		exit 1

scripts/release

@@ -56,7 +56,7 @@ main() {
   if [ ! -d "${reldir}/etcd" ]; then
     mkdir -p "${reldir}"
     cd "${reldir}"
-    git clone [email protected]:coreos/etcd.git --branch "${BRANCH}"
+    git clone [email protected]:etcd-io/etcd.git --branch "${BRANCH}"
   fi
   cd "${reldir}/etcd"
 
@@ -106,7 +106,7 @@ main() {
 
     # Push the version change if it's not already been pushed.
     if [ $(git rev-list --count "origin/${BRANCH}..${BRANCH}") -gt 0 ]; then
-      read -p "Push version bump up to ${VERSION} to github.com/coreos/etcd [y/N]? " confirm
+      read -p "Push version bump up to ${VERSION} to github.com/etcd-io/etcd [y/N]? " confirm
       [[ "${confirm,,}" == "y" ]] || exit 1
       git push
     fi
@@ -202,7 +202,7 @@ main() {
     git add version/version.go
     git commit -m "version: bump up to ${VERSION}+git"
     git diff --staged
-    read -p "Push version bump up to ${VERSION}+git to github.com/coreos/etcd [y/N]? " confirm
+    read -p "Push version bump up to ${VERSION}+git to github.com/etcd-io/etcd [y/N]? " confirm
     [[ "${confirm,,}" == "y" ]] || exit 1
     git push
   fi

test

@@ -53,7 +53,7 @@ COVER=${COVER:-"-cover"}
 IGNORE_PKGS="(vendor/|etcdserverpb|rafttest|gopath.proto|v3lockpb|v3electionpb)"
 INTEGRATION_PKGS="(integration|tests/e2e|contrib|functional)"
 
-# all github.com/coreos/etcd/whatever pkgs that are not auto-generated / tools
+# all github.com/etcd-io/etcd/whatever pkgs that are not auto-generated / tools
 # shellcheck disable=SC1117
 PKGS=$(find . -name \*.go | while read -r a; do dirname "$a"; done | sort | uniq | grep -vE "$IGNORE_PKGS" | grep -vE "(tools/|contrib/|tests/e2e|pb)" | sed "s|\.|${REPO_PATH}|g" | xargs echo)
 # pkg1,pkg2,pkg3
@@ -353,7 +353,7 @@ function release_pass {
 	echo "Downloading $file"
 
 	set +e
-	curl --fail -L "https://github.com/coreos/etcd/releases/download/$UPGRADE_VER/$file" -o "/tmp/$file"
+	curl --fail -L "https://github.com/etcd-io/etcd/releases/download/$UPGRADE_VER/$file" -o "/tmp/$file"
 	local result=$?
 	set -e
 	case $result in