alexlebens/external-snapshotter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix version_gt to work with kubernetes prefix

Browse Source 
Signed-off-by: Grant Griffiths <grant@portworx.com>
This commit is contained in:
Grant Griffiths
2019-12-20 16:30:25 -08:00
parent 9f1f3dd842
commit fc80975954
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
prow.sh
View File

@@ -1013,6 +1013,7 @@ make_test_to_junit () {
# The follow substrings are stripped before version comparison: # The follow substrings are stripped before version comparison:
# - "v" # - "v"
# - "release-" # - "release-"
# - "kubernetes-"
# #
# Usage: # Usage:
# version_gt release-1.3 v1.2.0 (returns true) # version_gt release-1.3 v1.2.0 (returns true)
@@ -1022,8 +1023,9 @@ make_test_to_junit () {
# version_gt 1.1.1 release-1.2.0 (returns false) # version_gt 1.1.1 release-1.2.0 (returns false)
# version_gt 1.2.0 1.2.2 (returns false) # version_gt 1.2.0 1.2.2 (returns false)
function version_gt() { function version_gt() {
versions=$(for ver in "$@"; do ver=${ver#release-}; echo "${ver#v}"; done) versions=$(for ver in "$@"; do ver=${ver#release-}; ver=${ver#kubernetes-}; echo "${ver#v}"; done)
greaterVersion=${1#"release-"}; greaterVersion=${1#"release-"};
greaterVersion=${greaterVersion#"kubernetes-"};
greaterVersion=${greaterVersion#"v"}; greaterVersion=${greaterVersion#"v"};
test "$(printf '%s' "$versions" | sort -V | head -n 1)" != "$greaterVersion" test "$(printf '%s' "$versions" | sort -V | head -n 1)" != "$greaterVersion"
} }