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

Merge pull request #88702 from dims/patch-2

Browse Source 
Move conformance image to debian:stretch-slim
This commit is contained in:
Kubernetes Prow Robot 2020-03-02 14:50:40 -08:00 committed by GitHub
commit d04219bc8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/images/conformance/Makefile
View File

@ -31,7 +31,7 @@ E2E_GO_RUNNER_BIN?=$(shell test -f $(LOCAL_OUTPUT_PATH)/go-runner && echo $(LOCA
CLUSTER_DIR?=$(shell pwd)/../../../cluster/
BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.12.1
BASEIMAGE=debian:stretch-slim
TEMP_DIR:=$(shell mktemp -d -t conformanceXXXXXX)
all: build

4
cluster/images/conformance/conformance-e2e.sh
View File

@ -27,7 +27,9 @@ while true; do
break
elif [[ "$STATUS" == "Failed" ]]; then
echo "$timestamp Failed."
break
kubectl -n conformance describe pods e2e-conformance-test || true
kubectl -n conformance logs e2e-conformance-test || true
exit 1
else
sleep 5
fi