Skip to content

[release-22.0] ci: use etcd v3.5.25, add retries (#19015) #19021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timvaillancourt merged 2 commits into from
Dec 15, 2025
Merged

[release-22.0] ci: use etcd v3.5.25, add retries (#19015) #19021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a43299
Cherry-pick 802b55e2a70dbb32d49faf95f52a561cb0663ec4 with conflicts
vitess-bot[bot] Dec 12, 2025
63b39b9
`ci`: use `etcd` v3.5.25, add retries (#19015)
timvaillancourt Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/codecov.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ jobs:
sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk

mkdir -p dist bin
curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist
mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/

go mod download
go install golang.org/x/tools/cmd/goimports@latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit_race.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ jobs:
sudo apt-get -qq install -y make unzip g++ curl git wget ant openjdk-11-jdk

mkdir -p dist bin
curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist
mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/

go mod download
go install golang.org/x/tools/cmd/goimports@latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit_race_evalengine.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ jobs:
sudo apt-get -qq install -y make unzip g++ curl git wget ant openjdk-11-jdk

mkdir -p dist bin
curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist
mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/

go mod download
go install golang.org/x/tools/cmd/goimports@latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit_test_evalengine_mysql57.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ jobs:
sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk

mkdir -p dist bin
curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist
mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/

go mod download
go install golang.org/x/tools/cmd/goimports@latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit_test_evalengine_mysql80.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ jobs:
sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk

mkdir -p dist bin
curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist
mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/

go mod download
go install golang.org/x/tools/cmd/goimports@latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit_test_evalengine_mysql84.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ jobs:
sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk

mkdir -p dist bin
curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist
mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/

go mod download
go install golang.org/x/tools/cmd/goimports@latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit_test_mysql57.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ jobs:
sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk

mkdir -p dist bin
curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist
mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/

go mod download
go install golang.org/x/tools/cmd/goimports@latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit_test_mysql80.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ jobs:
sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk

mkdir -p dist bin
curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist
mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/

go mod download
go install golang.org/x/tools/cmd/goimports@latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit_test_mysql84.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ jobs:
sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk

mkdir -p dist bin
curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist
mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/

go mod download
go install golang.org/x/tools/cmd/goimports@latest
Expand Down
2 changes: 1 addition & 1 deletion build.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export VTDATAROOT="${VTDATAROOT:-${VTROOT}/vtdataroot}"
export PATH="$PWD/bin:$PATH"
export PROTOC_VER=21.3
export ZK_VER=${ZK_VERSION:-3.8.0}
export ETCD_VER=v3.5.17
export ETCD_VER=v3.5.25
export CONSUL_VER=1.11.4
export TOXIPROXY_VER=v2.7.0

Expand Down
2 changes: 1 addition & 1 deletion docker/mini/install_mini_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
set -euo pipefail

# Install etcd
ETCD_VER=v3.5.17
ETCD_VER=v3.5.25
DOWNLOAD_URL=https://storage.googleapis.com/etcd

curl -k -L ${DOWNLOAD_URL}/${ETCD_VER}/etcd-${ETCD_VER}-linux-amd64.tar.gz -o /tmp/etcd-${ETCD_VER}-linux-amd64.tar.gz
Expand Down
8 changes: 4 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ require (
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82
github.com/z-division/go-zookeeper v1.0.0
go.etcd.io/etcd/api/v3 v3.5.19
go.etcd.io/etcd/client/pkg/v3 v3.5.19
go.etcd.io/etcd/client/v3 v3.5.19
go.etcd.io/etcd/api/v3 v3.5.25
go.etcd.io/etcd/client/pkg/v3 v3.5.25
go.etcd.io/etcd/client/v3 v3.5.25
go.uber.org/mock v0.5.0
golang.org/x/crypto v0.36.0 // indirect
golang.org/x/mod v0.24.0 // indirect
Expand All @@ -77,7 +77,7 @@ require (
golang.org/x/tools v0.31.0
google.golang.org/api v0.226.0
google.golang.org/genproto v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
google.golang.org/grpc v1.71.0
google.golang.org/grpc v1.71.1
Copy link
Contributor

@timvaillancourt timvaillancourt Dec 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

go mod tidy is insisting on this and when I revert it, it puts it back. Let me know if this is a concern

google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
google.golang.org/grpc/examples v0.0.0-20250204041003-947e2a4be2ba
google.golang.org/protobuf v1.36.5
Expand Down
16 changes: 8 additions & 8 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,12 +558,12 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/z-division/go-zookeeper v1.0.0 h1:ULsCj0nP6+U1liDFWe+2oEF6o4amixoDcDlwEUghVUY=
github.com/z-division/go-zookeeper v1.0.0/go.mod h1:6X4UioQXpvyezJJl4J9NHAJKsoffCwy5wCaaTktXjOA=
go.etcd.io/etcd/api/v3 v3.5.19 h1:w3L6sQZGsWPuBxRQ4m6pPP3bVUtV8rjW033EGwlr0jw=
go.etcd.io/etcd/api/v3 v3.5.19/go.mod h1:QqKGViq4KTgOG43dr/uH0vmGWIaoJY3ggFi6ZH0TH/U=
go.etcd.io/etcd/client/pkg/v3 v3.5.19 h1:9VsyGhg0WQGjDWWlDI4VuaS9PZJGNbPkaHEIuLwtixk=
go.etcd.io/etcd/client/pkg/v3 v3.5.19/go.mod h1:qaOi1k4ZA9lVLejXNvyPABrVEe7VymMF2433yyRQ7O0=
go.etcd.io/etcd/client/v3 v3.5.19 h1:+4byIz6ti3QC28W0zB0cEZWwhpVHXdrKovyycJh1KNo=
go.etcd.io/etcd/client/v3 v3.5.19/go.mod h1:FNzyinmMIl0oVsty1zA3hFeUrxXI/JpEnz4sG+POzjU=
go.etcd.io/etcd/api/v3 v3.5.25 h1:8w6i1wcFJhW6eWiEr9yJeptEiv42vyR/ArIX7PF8580=
go.etcd.io/etcd/api/v3 v3.5.25/go.mod h1:ZIZh7LPgjzvjycAVgMJnx9WGkAMERMR8VOP+u9Ov2SY=
go.etcd.io/etcd/client/pkg/v3 v3.5.25 h1:MtOZRHk3GAUAPc9Sfpj+s7bWGgbjJ6hjiwMjQ2DSMUY=
go.etcd.io/etcd/client/pkg/v3 v3.5.25/go.mod h1:WTiGlZqg2WSdqjF8xRycqyHZTx2YmyqGcdTwKgQtJBk=
go.etcd.io/etcd/client/v3 v3.5.25 h1:Secqbl/DeksaY8Tg+984FDdRR8XWnxgXksjPrSFm5Lc=
go.etcd.io/etcd/client/v3 v3.5.25/go.mod h1:6QqI2Y9iqtIaUTS55285OyZqpF1QLCghATMEx1mhS0I=
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
go.opentelemetry.io/contrib/detectors/gcp v1.35.0 h1:bGvFt68+KTiAKFlacHW6AhA56GF2rS0bdD3aJYEnmzA=
Expand Down Expand Up @@ -741,8 +741,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
google.golang.org/grpc v1.71.0 h1:kF77BGdPTQ4/JZWMlb9VpJ5pa25aqvVqogsxNHHdeBg=
google.golang.org/grpc v1.71.0/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
google.golang.org/grpc v1.71.1 h1:ffsFWr7ygTUscGPI0KKK6TLrGz0476KUvvsbqWK0rPI=
google.golang.org/grpc v1.71.1/go.mod h1:H0GRtasmQOh9LkFoCPDu3ZrwUtD1YGE+b2vYBYd/8Ec=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 h1:F29+wU6Ee6qgu9TddPgooOdaqsxTMunOoj8KA5yuS5A=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1/go.mod h1:5KF+wpkbTSbGcR9zteSqZV6fqFOWBl4Yde8En8MryZA=
google.golang.org/grpc/examples v0.0.0-20250204041003-947e2a4be2ba h1:w92RAwwmP8PEc4O6JrGzSoUrL/eE53n2wIG7NAcedM8=
Expand Down
4 changes: 2 additions & 2 deletions test/templates/unit_test.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ jobs:
sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk

mkdir -p dist bin
curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist
mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/

go mod download
go install golang.org/x/tools/cmd/goimports@latest
Expand Down
Loading