Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16230 from jmhbnz/align-arm64-commands

Browse Source 
Ensure release is run for arm64 e2e nightly tests
This commit is contained in:
Benjamin Wang 2023-07-18 12:04:33 +01:00 committed by GitHub
commit 35628b9c78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/e2e-arm64-nightly.yaml vendored
View File

@ -16,4 +16,4 @@ jobs:
uses: ./.github/workflows/e2e-arm64-template.yaml
with:
etcdBranch: release-3.5
e2eTestCmd: PASSES='build e2e' COVER='false' ./test.sh
e2eTestCmd: PASSES='build release e2e' COVER='false' ./test.sh

26
scripts/test.sh
View File

@ -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