From 64f8f30c07d8aad18fd4918625682e2dca56e4e0 Mon Sep 17 00:00:00 2001
From: aaa <1693291525@qq.com>
Date: Thu, 21 Mar 2019 05:30:11 -0400
Subject: [PATCH] fix shellcheck failures in ./hack/jenkins/...

---
 hack/.shellcheck_failures            |  3 ---
 hack/jenkins/benchmark-dockerized.sh | 11 ++++++++---
 hack/jenkins/build.sh                |  8 ++++----
 hack/jenkins/verify-dockerized.sh    |  7 ++++++-
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures
index 1fb425df707..f6c392aed03 100644
--- a/hack/.shellcheck_failures
+++ b/hack/.shellcheck_failures
@@ -29,11 +29,8 @@
 ./hack/godep-restore.sh
 ./hack/godep-save.sh
 ./hack/grab-profiles.sh
-./hack/jenkins/benchmark-dockerized.sh
-./hack/jenkins/build.sh
 ./hack/jenkins/test-dockerized.sh
 ./hack/jenkins/upload-to-gcs.sh
-./hack/jenkins/verify-dockerized.sh
 ./hack/lib/init.sh
 ./hack/lib/logging.sh
 ./hack/lib/protoc.sh
diff --git a/hack/jenkins/benchmark-dockerized.sh b/hack/jenkins/benchmark-dockerized.sh
index 22627ebd20e..8943f04b418 100755
--- a/hack/jenkins/benchmark-dockerized.sh
+++ b/hack/jenkins/benchmark-dockerized.sh
@@ -21,7 +21,12 @@ set -o xtrace
 
 retry() {
   for i in {1..5}; do
-    "$@" && return 0 || sleep "${i}"
+    if "$@"
+    then      
+      return 0
+    else
+      sleep "${i}"
+    fi
   done
   "$@"
 }
@@ -51,5 +56,5 @@ cd /go/src/k8s.io/kubernetes
 # Run the benchmark tests and pretty-print the results into a separate file.
 make test-integration WHAT="$*" KUBE_TEST_ARGS="-run='XXX' -bench=. -benchmem" \
   | tee \
-   >(prettybench -no-passthrough > ${ARTIFACTS}/BenchmarkResults.txt) \
-   >(go run test/integration/benchmark/jsonify/main.go ${ARTIFACTS}/BenchmarkResults_benchmark_$(date -u +%Y-%m-%dT%H:%M:%SZ).json || cat > /dev/null)
+   >(prettybench -no-passthrough > "${ARTIFACTS}/BenchmarkResults.txt") \
+   >(go run test/integration/benchmark/jsonify/main.go "${ARTIFACTS}"/BenchmarkResults_benchmark_"$(date -u +%Y-%m-%dT%H:%M:%SZ)".json || cat > /dev/null)
diff --git a/hack/jenkins/build.sh b/hack/jenkins/build.sh
index 132fe7fdc6b..ddd4d14c674 100755
--- a/hack/jenkins/build.sh
+++ b/hack/jenkins/build.sh
@@ -35,7 +35,7 @@ export PATH=${PATH}:/usr/local/go/bin
 # Skip gcloud update checking
 export CLOUDSDK_COMPONENT_MANAGER_DISABLE_UPDATE_CHECK=true
 
-: ${KUBE_RELEASE_RUN_TESTS:="n"}
+: "${KUBE_RELEASE_RUN_TESTS:="n"}"
 export KUBE_RELEASE_RUN_TESTS
 
 # Clean stuff out. Assume the last build left the tree in an odd
@@ -58,8 +58,8 @@ if [[ ${KUBE_SKIP_PUSH_GCS:-} =~ ^[yY]$ ]]; then
   echo "Not pushed to GCS..."
 else
   readonly release_infra_clone="${WORKSPACE}/_tmp/release.git"
-  mkdir -p ${WORKSPACE}/_tmp
-  git clone https://github.com/kubernetes/release ${release_infra_clone}
+  mkdir -p "${WORKSPACE}/_tmp"
+  git clone https://github.com/kubernetes/release "${release_infra_clone}"
 
   push_build=${release_infra_clone}/push-build.sh
 
@@ -67,7 +67,7 @@ else
     && bucket_flag="--bucket=${KUBE_GCS_RELEASE_BUCKET-}"
   [[ -n "${KUBE_GCS_RELEASE_SUFFIX-}" ]] \
     && gcs_suffix_flag="--gcs-suffix=${KUBE_GCS_RELEASE_SUFFIX-}"
-  ${push_build} ${bucket_flag-} ${gcs_suffix_flag-} \
+  "${push_build}" "${bucket_flag-}" "${gcs_suffix_flag-}" \
     --nomock --verbose --ci
 fi
 
diff --git a/hack/jenkins/verify-dockerized.sh b/hack/jenkins/verify-dockerized.sh
index dfe15171100..51a433e8f3b 100755
--- a/hack/jenkins/verify-dockerized.sh
+++ b/hack/jenkins/verify-dockerized.sh
@@ -21,7 +21,12 @@ set -o xtrace
 
 retry() {
   for i in {1..5}; do
-    "$@" && return 0 || sleep "${i}"
+    if "$@"
+    then
+      return 0
+    else
+      sleep "${i}"
+    fi
   done
   "$@"
 }