github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

fix shellcheck failures in ./hack/jenkins/...

Browse Source
This commit is contained in:
aaa 2019-03-21 05:30:11 -04:00
parent aad83d1e49
commit 64f8f30c07
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/.shellcheck_failures
View File

@ -29,11 +29,8 @@
./hack/godep-restore.sh ./hack/godep-restore.sh
./hack/godep-save.sh ./hack/godep-save.sh
./hack/grab-profiles.sh ./hack/grab-profiles.sh
./hack/jenkins/benchmark-dockerized.sh
./hack/jenkins/build.sh
./hack/jenkins/test-dockerized.sh ./hack/jenkins/test-dockerized.sh
./hack/jenkins/upload-to-gcs.sh ./hack/jenkins/upload-to-gcs.sh
./hack/jenkins/verify-dockerized.sh
./hack/lib/init.sh ./hack/lib/init.sh
./hack/lib/logging.sh ./hack/lib/logging.sh
./hack/lib/protoc.sh ./hack/lib/protoc.sh

11
hack/jenkins/benchmark-dockerized.sh
View File

@ -21,7 +21,12 @@ set -o xtrace
retry() { retry() {
for i in {1..5}; do for i in {1..5}; do
"$@" && return 0 || sleep "${i}" if "$@"
then
return 0
else
sleep "${i}"
fi
done done
"$@" "$@"
} }
@ -51,5 +56,5 @@ cd /go/src/k8s.io/kubernetes
# Run the benchmark tests and pretty-print the results into a separate file. # Run the benchmark tests and pretty-print the results into a separate file.
make test-integration WHAT="$*" KUBE_TEST_ARGS="-run='XXX' -bench=. -benchmem" \ make test-integration WHAT="$*" KUBE_TEST_ARGS="-run='XXX' -bench=. -benchmem" \
| tee \ | tee \
>(prettybench -no-passthrough > ${ARTIFACTS}/BenchmarkResults.txt) \ >(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) >(go run test/integration/benchmark/jsonify/main.go "${ARTIFACTS}"/BenchmarkResults_benchmark_"$(date -u +%Y-%m-%dT%H:%M:%SZ)".json || cat > /dev/null)

8
hack/jenkins/build.sh
View File

@ -35,7 +35,7 @@ export PATH=${PATH}:/usr/local/go/bin
# Skip gcloud update checking # Skip gcloud update checking
export CLOUDSDK_COMPONENT_MANAGER_DISABLE_UPDATE_CHECK=true export CLOUDSDK_COMPONENT_MANAGER_DISABLE_UPDATE_CHECK=true
: ${KUBE_RELEASE_RUN_TESTS:="n"} : "${KUBE_RELEASE_RUN_TESTS:="n"}"
export KUBE_RELEASE_RUN_TESTS export KUBE_RELEASE_RUN_TESTS
# Clean stuff out. Assume the last build left the tree in an odd # 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..." echo "Not pushed to GCS..."
else else
readonly release_infra_clone="${WORKSPACE}/_tmp/release.git" readonly release_infra_clone="${WORKSPACE}/_tmp/release.git"
mkdir -p ${WORKSPACE}/_tmp mkdir -p "${WORKSPACE}/_tmp"
git clone https://github.com/kubernetes/release ${release_infra_clone} git clone https://github.com/kubernetes/release "${release_infra_clone}"
push_build=${release_infra_clone}/push-build.sh push_build=${release_infra_clone}/push-build.sh
@ -67,7 +67,7 @@ else
&& bucket_flag="--bucket=${KUBE_GCS_RELEASE_BUCKET-}" && bucket_flag="--bucket=${KUBE_GCS_RELEASE_BUCKET-}"
[[ -n "${KUBE_GCS_RELEASE_SUFFIX-}" ]] \ [[ -n "${KUBE_GCS_RELEASE_SUFFIX-}" ]] \
&& gcs_suffix_flag="--gcs-suffix=${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 --nomock --verbose --ci
fi fi

7
hack/jenkins/verify-dockerized.sh
View File

@ -21,7 +21,12 @@ set -o xtrace
retry() { retry() {
for i in {1..5}; do for i in {1..5}; do
"$@" && return 0 || sleep "${i}" if "$@"
then
return 0
else
sleep "${i}"
fi
done done
"$@" "$@"
} }