Skip to content

Commit 1274b05

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-sigs#687 from chewong/fix-log-dump-bug
🐛 do not use 'source' to call log dump script & fix 1.17 test failure
2 parents 85ad9d4 + 649a5c6 commit 1274b05

File tree

6 files changed

+37
-20
lines changed

6 files changed

+37
-20
lines changed

‎hack/ensure-kind.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ verify_kind_version() {
4040
fi
4141

4242
local kind_version
43-
kind_version=$(kind version)
44-
if ! [[ "${kind_version}" =~ ${MINIMUM_KIND_VERSION} ]]; then
43+
IFS=" " read -ra kind_version <<< "$(kind version)"
44+
if [[ "${MINIMUM_KIND_VERSION}" != $(echo -e "${MINIMUM_KIND_VERSION}\n${kind_version[1]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) ]]; then
4545
cat <<EOF
4646
Detected kind version: ${kind_version}.
4747
Requires ${MINIMUM_KIND_VERSION} or greater.
@@ -51,4 +51,4 @@ EOF
5151
fi
5252
}
5353

54-
verify_kind_version
54+
verify_kind_version

‎scripts/ci-entrypoint.sh‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ source "${REPO_ROOT}/hack/ensure-kustomize.sh"
3636
# shellcheck source=../hack/parse-prow-creds.sh
3737
source "${REPO_ROOT}/hack/parse-prow-creds.sh"
3838

39-
random-string() {
40-
cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w ${1:-32} | head -n 1
41-
}
42-
4339
# build Kubernetes E2E binaries
4440
build_k8s() {
4541
# possibly enable bazel build caching before building kubernetes
@@ -138,18 +134,15 @@ run_upstream_e2e_tests() {
138134

139135
# cleanup all resources we use
140136
cleanup() {
141-
timeout 600 kubectl \
142-
delete cluster "${CLUSTER_NAME}" || true
143-
timeout 600 kubectl \
144-
wait --for=delete cluster/"${CLUSTER_NAME}" || true
137+
timeout 1800 kubectl delete cluster "${CLUSTER_NAME}" || true
145138
make kind-reset || true
146139
# clean up e2e.test symlink
147140
(cd "$(go env GOPATH)/src/k8s.io/kubernetes" && rm -f _output/bin/e2e.test) || true
148141
}
149142

150143
on_exit() {
151144
unset KUBECONFIG
152-
source "${REPO_ROOT}/hack/log/log-dump.sh"
145+
${REPO_ROOT}/hack/log/log-dump.sh || true
153146
# cleanup
154147
if [[ -z "${SKIP_CLEANUP:-}" ]]; then
155148
cleanup

‎templates/test/cluster-template-prow-ci-version.yaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,10 @@ spec:
113113
DEBIAN_FRONTEND=noninteractive apt-get install -y $$CI_PACKAGE=$$PACKAGE_VERSION
114114
done
115115
else
116-
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION-bazel/bin/linux/amd64"
116+
CI_URL="gs://kubernetes-release-dev/ci-periodic/$$CI_VERSION-bazel/bin/linux/amd64"
117+
if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then
118+
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION-bazel/bin/linux/amd64"
119+
fi
117120
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
118121
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
119122
$${GSUTIL} cp "$$CI_URL/$$CI_PACKAGE" "$$CI_DIR/$$CI_PACKAGE"
@@ -305,7 +308,10 @@ spec:
305308
DEBIAN_FRONTEND=noninteractive apt-get install -y $$CI_PACKAGE=$$PACKAGE_VERSION
306309
done
307310
else
308-
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION-bazel/bin/linux/amd64"
311+
CI_URL="gs://kubernetes-release-dev/ci-periodic/$$CI_VERSION-bazel/bin/linux/amd64"
312+
if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then
313+
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION-bazel/bin/linux/amd64"
314+
fi
309315
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
310316
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
311317
$${GSUTIL} cp "$$CI_URL/$$CI_PACKAGE" "$$CI_DIR/$$CI_PACKAGE"

‎templates/test/cluster-template-prow-machine-pool-ci-version.yaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,10 @@ spec:
113113
DEBIAN_FRONTEND=noninteractive apt-get install -y $$CI_PACKAGE=$$PACKAGE_VERSION
114114
done
115115
else
116-
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION-bazel/bin/linux/amd64"
116+
CI_URL="gs://kubernetes-release-dev/ci-periodic/$$CI_VERSION-bazel/bin/linux/amd64"
117+
if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then
118+
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION-bazel/bin/linux/amd64"
119+
fi
117120
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
118121
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
119122
$${GSUTIL} cp "$$CI_URL/$$CI_PACKAGE" "$$CI_DIR/$$CI_PACKAGE"
@@ -300,7 +303,10 @@ spec:
300303
DEBIAN_FRONTEND=noninteractive apt-get install -y $$CI_PACKAGE=$$PACKAGE_VERSION
301304
done
302305
else
303-
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION-bazel/bin/linux/amd64"
306+
CI_URL="gs://kubernetes-release-dev/ci-periodic/$$CI_VERSION-bazel/bin/linux/amd64"
307+
if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then
308+
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION-bazel/bin/linux/amd64"
309+
fi
304310
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
305311
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
306312
$${GSUTIL} cp "$$CI_URL/$$CI_PACKAGE" "$$CI_DIR/$$CI_PACKAGE"

‎templates/test/prow-ci-version/patches/machine-deployment-ci-version.yaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ spec:
5858
DEBIAN_FRONTEND=noninteractive apt-get install -y $$CI_PACKAGE=$$PACKAGE_VERSION
5959
done
6060
else
61-
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION-bazel/bin/linux/amd64"
61+
CI_URL="gs://kubernetes-release-dev/ci-periodic/$$CI_VERSION-bazel/bin/linux/amd64"
62+
if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then
63+
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION-bazel/bin/linux/amd64"
64+
fi
6265
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
6366
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
6467
$${GSUTIL} cp "$$CI_URL/$$CI_PACKAGE" "$$CI_DIR/$$CI_PACKAGE"
@@ -164,7 +167,10 @@ spec:
164167
DEBIAN_FRONTEND=noninteractive apt-get install -y $$CI_PACKAGE=$$PACKAGE_VERSION
165168
done
166169
else
167-
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION-bazel/bin/linux/amd64"
170+
CI_URL="gs://kubernetes-release-dev/ci-periodic/$$CI_VERSION-bazel/bin/linux/amd64"
171+
if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then
172+
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION-bazel/bin/linux/amd64"
173+
fi
168174
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
169175
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
170176
$${GSUTIL} cp "$$CI_URL/$$CI_PACKAGE" "$$CI_DIR/$$CI_PACKAGE"

‎templates/test/prow-machine-pool-ci-version/patches/machine-pool-ci-version.yaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ spec:
5858
DEBIAN_FRONTEND=noninteractive apt-get install -y $$CI_PACKAGE=$$PACKAGE_VERSION
5959
done
6060
else
61-
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION-bazel/bin/linux/amd64"
61+
CI_URL="gs://kubernetes-release-dev/ci-periodic/$$CI_VERSION-bazel/bin/linux/amd64"
62+
if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then
63+
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION-bazel/bin/linux/amd64"
64+
fi
6265
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
6366
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
6467
$${GSUTIL} cp "$$CI_URL/$$CI_PACKAGE" "$$CI_DIR/$$CI_PACKAGE"
@@ -162,7 +165,10 @@ spec:
162165
DEBIAN_FRONTEND=noninteractive apt-get install -y $$CI_PACKAGE=$$PACKAGE_VERSION
163166
done
164167
else
165-
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION-bazel/bin/linux/amd64"
168+
CI_URL="gs://kubernetes-release-dev/ci-periodic/$$CI_VERSION-bazel/bin/linux/amd64"
169+
if ! $${GSUTIL} ls "$${CI_URL}" > /dev/null; then
170+
CI_URL="gs://kubernetes-release-dev/ci/$$CI_VERSION-bazel/bin/linux/amd64"
171+
fi
166172
for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do
167173
echo "* downloading binary: $$CI_URL/$$CI_PACKAGE"
168174
$${GSUTIL} cp "$$CI_URL/$$CI_PACKAGE" "$$CI_DIR/$$CI_PACKAGE"

0 commit comments

Comments
 (0)