diff --git a/cluster/images/conformance/Makefile b/cluster/images/conformance/Makefile index 0a5e4cd532d..00307960210 100644 --- a/cluster/images/conformance/Makefile +++ b/cluster/images/conformance/Makefile @@ -22,7 +22,7 @@ ARCH?=amd64 OUT_DIR?=_output OUTPUT_PATH=$(shell pwd)/../../../$(OUT_DIR) -BINARY_PATH=$(shell test -d $(OUTPUT_PATH)/dockerized && echo $(OUTPUT_PATH)/dockerized || echo $(OUTPUT_PATH)/local) +BINARY_PATH=$(shell test -d $(OUTPUT_PATH)/local && echo $(OUTPUT_PATH)/local || echo $(OUTPUT_PATH)/dockerized) GINKGO_BIN?=$(BINARY_PATH)/bin/linux/$(ARCH)/ginkgo KUBECTL_BIN?=$(BINARY_PATH)/bin/linux/$(ARCH)/kubectl diff --git a/cluster/images/conformance/conformance-e2e.sh b/cluster/images/conformance/conformance-e2e.sh new file mode 100755 index 00000000000..45d86a258ef --- /dev/null +++ b/cluster/images/conformance/conformance-e2e.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +# Copyright 2018 The Kubernetes Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -o errexit +set -o nounset +set -o pipefail + +kubectl create -f conformance-e2e.yaml +while true; do + STATUS=$(kubectl -n conformance get pods e2e-conformance-test -o jsonpath="{.status.phase}") + timestamp=$(date +"[%H:%M:%S]") + echo "$timestamp Pod status is: ${STATUS}" + if [[ "$STATUS" == "Succeeded" ]]; then + echo "$timestamp Done." + break + else + sleep 5 + fi +done +echo "Please use 'kubectl logs -n conformance e2e-conformance-test' to view the results"