Skip to content

Commit f6c74b3

Browse files
authored
Merge pull request kubernetes-csi#57 from ggriffiths/version_gt_kubernetes_fix
Fix version_gt to work with Kubernetes prefix
2 parents 9f1f3dd + fc80975 commit f6c74b3

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

prow.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -1013,6 +1013,7 @@ make_test_to_junit () {
10131013
# The follow substrings are stripped before version comparison:
10141014
# - "v"
10151015
# - "release-"
1016+
# - "kubernetes-"
10161017
#
10171018
# Usage:
10181019
# version_gt release-1.3 v1.2.0 (returns true)
@@ -1022,8 +1023,9 @@ make_test_to_junit () {
10221023
# version_gt 1.1.1 release-1.2.0 (returns false)
10231024
# version_gt 1.2.0 1.2.2 (returns false)
10241025
function version_gt() {
1025-
versions=$(for ver in "$@"; do ver=${ver#release-}; echo "${ver#v}"; done)
1026+
versions=$(for ver in "$@"; do ver=${ver#release-}; ver=${ver#kubernetes-}; echo "${ver#v}"; done)
10261027
greaterVersion=${1#"release-"};
1028+
greaterVersion=${greaterVersion#"kubernetes-"};
10271029
greaterVersion=${greaterVersion#"v"};
10281030
test "$(printf '%s' "$versions" | sort -V | head -n 1)" != "$greaterVersion"
10291031
}

0 commit comments

Comments
 (0)