From 247298a20d56096f9ef6f975a7624993fc0c259c Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Fri, 3 Dec 2021 14:53:01 -0800 Subject: [PATCH] Fix previous channel detection This failed if the build metadata contained a period, as in v1.23.0-rc.0 Signed-off-by: Brad Davidson --- scripts/test-run-compat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test-run-compat b/scripts/test-run-compat index 1a26375411..29830c9cc4 100755 --- a/scripts/test-run-compat +++ b/scripts/test-run-compat @@ -28,7 +28,7 @@ export -f test-post-hook REPO=${REPO:-rancher} IMAGE_NAME=${IMAGE_NAME:-k3s} -PREVIOUS_CHANNEL=$(grep 'k8s.io/kubernetes v' go.mod | head -n1 | awk '{print $2}' | awk -F. '{print "v1." ($(NF - 1) - 1)}') +PREVIOUS_CHANNEL=$(grep 'k8s.io/kubernetes v' go.mod | head -n1 | awk '{print $2}' | awk -F. '{print "v1." ($2 - 1)}') PREVIOUS_VERSION=$(curl -s https://update.k3s.io/v1-release/channels/${PREVIOUS_CHANNEL} -o /dev/null -w '%{redirect_url}' | awk -F/ '{print gensub(/\+/, "-", "g", $NF)}') STABLE_VERSION=$(curl -s https://update.k3s.io/v1-release/channels/stable -o /dev/null -w '%{redirect_url}' | awk -F/ '{print gensub(/\+/, "-", "g", $NF)}') LATEST_VERSION=$(curl -s https://update.k3s.io/v1-release/channels/latest -o /dev/null -w '%{redirect_url}' | awk -F/ '{print gensub(/\+/, "-", "g", $NF)}')