From bcde798fddacc42ca3bcef43d96bcf84cabfef97 Mon Sep 17 00:00:00 2001 From: Vimal K Date: Mon, 3 Sep 2018 21:57:23 +0530 Subject: [PATCH] *: path changes for moving to github/etcd-io/etcd --- contrib/systemd/etcd.service | 2 +- functional.yaml | 2 +- functional/Dockerfile | 10 +++++----- scripts/build-binary | 2 +- scripts/build-docker | 2 +- scripts/release | 6 +++--- test | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/contrib/systemd/etcd.service b/contrib/systemd/etcd.service index 3550f3d77..787413c75 100644 --- a/contrib/systemd/etcd.service +++ b/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] diff --git a/functional.yaml b/functional.yaml index bb1bba101..588be1232 100644 --- a/functional.yaml +++ b/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 diff --git a/functional/Dockerfile b/functional/Dockerfile index fbcc34ec2..cc904afba 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/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 \ No newline at end of file + && rm -rf ${GOPATH}/src/github.com/etcd-io/etcd \ No newline at end of file diff --git a/scripts/build-binary b/scripts/build-binary index 6780b1511..1558d2126 100755 --- a/scripts/build-binary +++ b/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 diff --git a/scripts/build-docker b/scripts/build-docker index 40a4dd3a9..1e9db2301 100755 --- a/scripts/build-docker +++ b/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 diff --git a/scripts/release b/scripts/release index 5d1a27f1a..5f553cfcd 100755 --- a/scripts/release +++ b/scripts/release @@ -56,7 +56,7 @@ main() { if [ ! -d "${reldir}/etcd" ]; then mkdir -p "${reldir}" cd "${reldir}" - git clone git@github.com:coreos/etcd.git --branch "${BRANCH}" + git clone git@github.com: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 diff --git a/test b/test index bfbc078ad..3c6e63ba2 100755 --- a/test +++ b/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