fix test-cmd kubeadm build

Author: pacoxu

Makefile

@@ -101,16 +101,10 @@ format-all-patch:
 test:
 	./hack/test.sh
 
-# before v1.25
 .PHONY: test-cmd
 test-cmd:
 	./hack/test_cmd.sh
 
-# after v1.26
-.PHONY: test-cmd-2
-test-cmd-2:
-	./hack/test_cmd_2.sh
-
 .PHONY: test-integration
 test-integration:
 	./hack/test_integration.sh

hack/test_cmd.sh

@@ -5,13 +5,19 @@ set -o nounset
 set -o pipefail
 
 source "kit/helper.sh"
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 cd "${WORKDIR}"
 
 # Kubeadm was added for testing in 1.19 and later
 for n in {1..5}; do
     echo "+++ Test retry ${n}"
     ./build/shell.sh -c '
+
+# before v1.25
 make generated_files kubeadm
+# after v1.26
+make all -C "${KUBE_ROOT}" WHAT=cmd/kubeadm
+
 mkdir -p _output/local/go/bin/ && cp _output/dockerized/bin/linux/amd64/kubeadm _output/local/go/bin/
 ./hack/install-etcd.sh
 PATH=$(pwd)/third_party/etcd:${PATH} make test-cmd

hack/test_cmd_2.sh

@@ -65,7 +65,7 @@ releases:
       - nokmem.1.20
 
   - name: v1.18.20-lts.2
-    base_release: v1.18.20
+    base_release: v1.18.20-ci
     must: true
     patches:
       - CVE-2020-8554.1.18