Skip to content

Commit

Permalink
Fix obtaining UPGRADE_VER in test.sh
Browse files Browse the repository at this point in the history
Obtain tags from git ls-remote to avoid reliance on local repository state.

Signed-off-by: James Blair <mail@jamesblair.net>
  • Loading branch information
jmhbnz committed Jul 18, 2023
1 parent 2f65f56 commit 3ff0128
Showing 1 changed file with 24 additions and 2 deletions.
26 changes: 24 additions & 2 deletions scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -559,8 +559,30 @@ 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.5.*" | head -1 | cut -d- -f1)

# Work out the previous 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))

# Handle the edge case where we go to a new major version
# When this happens we obtain latest minor release of previous major
if [ "${binary_minor}" -eq 0 ]; then
binary_major=$((binary_major - 1))
previous_minor=$(git ls-remote --tags https://github.com/etcd-io/etcd.git \
| grep --only-matching --perl-regexp "(?<=v)${binary_major}.\d.[\d]+?(?=[\^])" \
| sort --numeric-sort --key 1.3 | tail -1 | cut -d '.' -f 2)
fi

# 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
Expand Down

0 comments on commit 3ff0128

Please sign in to comment.