Fix ci (#141)

Author: wzshiming

hack/test_cmd.sh

@@ -10,5 +10,10 @@ 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 '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
+    ./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

@@ -11,7 +11,10 @@ TMPFILE="${TMPDIR}/test-integration.log"
 
 # 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'
+    ./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

releases.yml

@@ -189,13 +189,19 @@ releases:
       - fix-run-docker.1.23
       - no-delete-images.1.23
       - fix-etcd-put-key.1.23
+    test_failures_tolerated:
+      - k8s.io/kubernetes/pkg/kubelet/volumemanager/reconciler
+      - k8s.io/kubernetes/pkg/volume/csi
 
   - name: v1.20.2-ci
     base_release: v1.20.2
     patches:
       - fix-run-docker.1.23
       - no-delete-images.1.23
       - fix-etcd-put-key.1.23
+    test_failures_tolerated:
+      - k8s.io/kubernetes/pkg/kubelet/volumemanager/reconciler
+      - k8s.io/kubernetes/pkg/volume/csi
 
   - name: v1.19.16-ci
     base_release: v1.19.16