mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
Backport fix to e2e release version identifcation.
Signed-off-by: James Blair <mail@jamesblair.net>
This commit is contained in:
parent
679820aa0e
commit
f9ae5f8023
2
.github/workflows/e2e.yaml
vendored
2
.github/workflows/e2e.yaml
vendored
@ -25,7 +25,7 @@ jobs:
|
||||
echo "${TARGET}"
|
||||
case "${TARGET}" in
|
||||
linux-amd64-e2e)
|
||||
PASSES='build release e2e' MANUAL_VER=v3.4.7 CPU='4' EXPECT_DEBUG='true' COVER='false' RACE='true' ./test.sh
|
||||
PASSES='build release e2e' CPU='4' EXPECT_DEBUG='true' COVER='false' RACE='true' ./test.sh
|
||||
;;
|
||||
linux-386-e2e)
|
||||
GOARCH=386 PASSES='build e2e' CPU='4' EXPECT_DEBUG='true' COVER='false' RACE='true' ./test.sh
|
||||
|
17
test.sh
17
test.sh
@ -635,8 +635,21 @@ function dep_pass {
|
||||
|
||||
function release_pass {
|
||||
rm -f ./bin/etcd-last-release
|
||||
# to grab latest patch release; bump this up for every minor release
|
||||
UPGRADE_VER=$(git tag -l --sort=-version:refname "v3.4.*" | head -1)
|
||||
|
||||
# Work out the previous minor release based on the version reported by etcd binary
|
||||
binary_version=$(./bin/etcd --version | grep --only-matching --perl-regexp '(?<=etcd Version: )\d+\.\d+')
|
||||
binary_major=$(echo "${binary_version}" | cut -d '.' -f 1)
|
||||
binary_minor=$(echo "${binary_version}" | cut -d '.' -f 2)
|
||||
previous_minor=$((binary_minor - 1))
|
||||
|
||||
# This gets a list of all remote tags for the release branch in regex
|
||||
# Sort key is used to sort numerically by patch version
|
||||
# Latest version is then stored for use below
|
||||
UPGRADE_VER=$(git ls-remote --tags https://github.com/etcd-io/etcd.git \
|
||||
| grep --only-matching --perl-regexp "(?<=v)${binary_major}.${previous_minor}.[\d]+?(?=[\^])" \
|
||||
| sort --numeric-sort --key 1.5 | tail -1 | sed 's/^/v/')
|
||||
log_callout "Found latest release: ${UPGRADE_VER}."
|
||||
|
||||
if [ -n "${MANUAL_VER:-}" ]; then
|
||||
# in case, we need to test against different version
|
||||
UPGRADE_VER=$MANUAL_VER
|
||||
|
Loading…
x
Reference in New Issue
Block a user