mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16280 from jmhbnz/backport-e2e-release-fix

Browse Source 
Backport fix to e2e release version identifcation
This commit is contained in:
Marek Siarkowicz 2023-07-24 12:04:55 +02:00 committed by GitHub
commit 7ba4addd87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/e2e.yaml vendored
View File

@ -25,7 +25,7 @@ jobs:
echo "${TARGET}" echo "${TARGET}"
case "${TARGET}" in case "${TARGET}" in
linux-amd64-e2e) 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) linux-386-e2e)
GOARCH=386 PASSES='build e2e' CPU='4' EXPECT_DEBUG='true' COVER='false' RACE='true' ./test.sh GOARCH=386 PASSES='build e2e' CPU='4' EXPECT_DEBUG='true' COVER='false' RACE='true' ./test.sh

17
test.sh
View File

@ -635,8 +635,21 @@ function dep_pass {
function release_pass { function release_pass {
rm -f ./bin/etcd-last-release 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 if [ -n "${MANUAL_VER:-}" ]; then
# in case, we need to test against different version # in case, we need to test against different version
UPGRADE_VER=$MANUAL_VER UPGRADE_VER=$MANUAL_VER