Fix ci

Author: wzshiming

.github/workflows/verify.yml

@@ -24,9 +24,6 @@ jobs:
       - name: Install dependent
         run: |
           make dependent
-      - name: Verify releases
-        run: |
-          make verify-releases
       - name: Verify patch
         run: |
           make verify-patch
@@ -289,7 +286,7 @@ jobs:
         run: |
           make test-integration
 
-  Test-v1-20-16-lts-1:
+  Test-v1-20-15-lts-1:
     needs: Patch
     runs-on: ubuntu-latest
     steps:
@@ -301,23 +298,23 @@ jobs:
         with:
           path: |
             src
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-20-16-lts-1
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-20-15-lts-1
           restore-keys: |
             ${{ runner.os }}-build-${{ env.cache-name }}
       - name: Install dependent
         run: |
           make dependent
-      - name: Checkout to v1.20.16-lts.1
+      - name: Checkout to v1.20.15-lts.1
         run: |
-          make v1.20.16-lts.1
+          make v1.20.15-lts.1
       - name: Install etcd
         run: |
           make install-etcd
       - name: Test
         run: |
           make test
 
-  Test-Cmd-v1-20-16-lts-1:
+  Test-Cmd-v1-20-15-lts-1:
     needs: Patch
     runs-on: ubuntu-latest
     steps:
@@ -329,23 +326,23 @@ jobs:
         with:
           path: |
             src
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-20-16-lts-1
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-20-15-lts-1
           restore-keys: |
             ${{ runner.os }}-build-${{ env.cache-name }}
       - name: Install dependent
         run: |
           make dependent
-      - name: Checkout to v1.20.16-lts.1
+      - name: Checkout to v1.20.15-lts.1
         run: |
-          make v1.20.16-lts.1
+          make v1.20.15-lts.1
       - name: Install etcd
         run: |
           make install-etcd
       - name: Test cmd
         run: |
           make test-cmd
 
-  Test-Integration-v1-20-16-lts-1:
+  Test-Integration-v1-20-15-lts-1:
     needs: Patch
     runs-on: ubuntu-latest
     steps:
@@ -358,15 +355,15 @@ jobs:
           path: |
             src
             /tmp/kubernetes-lts/
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-20-16-lts-1
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-20-15-lts-1
           restore-keys: |
             ${{ runner.os }}-build-${{ env.cache-name }}
       - name: Install dependent
         run: |
           make dependent
-      - name: Checkout to v1.20.16-lts.1
+      - name: Checkout to v1.20.15-lts.1
         run: |
-          make v1.20.16-lts.1
+          make v1.20.15-lts.1
       - name: Install etcd
         run: |
           make install-etcd

hack/test_cmd.sh

@@ -7,7 +7,8 @@ set -o pipefail
 source "kit/helper.sh"
 cd "${WORKDIR}"
 
+# Kubeadm was added for testing in 1.19 and later
 for n in {1..5}; do
     echo "+++ Test retry ${n}"
-    ./build/run.sh make test-cmd 2>&1 | grep -v -E '^I\w+ ' && exit 0
+    ./build/shell.sh -c 'make generated_files 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' 2>&1 | grep -v -E '^I\w+ ' && exit 0
 done

hack/test_integration.sh

@@ -9,7 +9,12 @@ cd "${WORKDIR}"
 
 TMPFILE="${TMPDIR}/test-integration.log"
 
-./build/run.sh make test-integration 2>&1 | tee "${TMPFILE}" | grep -v -E '^I\w+ ' && exit 0
+# Etcd was added for testing in 1.21 and later
+function test-integration() {
+    ./build/shell.sh -c './hack/install-etcd.sh && PATH=$(pwd)/third_party/etcd:${PATH} make test-integration'
+}
+
+test-integration 2>&1 | tee "${TMPFILE}" | grep -v -E '^I\w+ ' && exit 0
 
 RETRY_CASES=$(cat "${TMPFILE}" | grep -E '^FAIL\s+k8s.io/kubernetes' | awk '{print $2}' || echo "")
 
@@ -35,7 +40,7 @@ for n in {1..5}; do
     echo "+++ Test retry ${n}, the case is as follows:"
     echo "${RETRY_CASES}"
     want=$(echo ${RETRY_CASES})
-    ./build/run.sh make test-integration WHAT="${want}" 2>&1 | tee "${TMPFILE}" | grep -v -E '^I\w+ ' && exit 0
+    test-integration WHAT="${want}" 2>&1 | tee "${TMPFILE}" | grep -v -E '^I\w+ ' && exit 0
     RETRY_CASES=$(cat "${TMPFILE}" | grep -E '^FAIL\s+k8s.io/kubernetes' | awk '{print $2}' || echo "")
 done