github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #74761 from dims/better-detection-of-binaries-for-conformance-image 

Better detection of binaries for conformance image
pull/564/head
Kubernetes Prow Robot 2019-03-01 14:09:08 -08:00 committed by GitHub
parent fc30b38021 9d7d682760
commit 4bafef2234
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cluster/images/conformance/Makefile
View File

@ -21,12 +21,13 @@ REGISTRY?=k8s.gcr.io
ARCH?=amd64 ARCH?=amd64
OUT_DIR?=_output OUT_DIR?=_output
OUTPUT_PATH=$(shell pwd)/../../../$(OUT_DIR) LOCAL_OUTPUT_PATH=$(shell pwd)/../../../$(OUT_DIR)/local/bin/linux/$(ARCH)
BINARY_PATH=$(shell test -d $(OUTPUT_PATH)/local && echo $(OUTPUT_PATH)/local || echo $(OUTPUT_PATH)/dockerized) DOCKERIZED_OUTPUT_PATH=$(shell pwd)/../../../$(OUT_DIR)/dockerized/bin/linux/$(ARCH)
GINKGO_BIN?=$(shell test -f $(LOCAL_OUTPUT_PATH)/ginkgo && echo $(LOCAL_OUTPUT_PATH)/ginkgo || echo $(DOCKERIZED_OUTPUT_PATH)/ginkgo)
KUBECTL_BIN?=$(shell test -f $(LOCAL_OUTPUT_PATH)/kubectl && echo $(LOCAL_OUTPUT_PATH)/kubectl || echo $(DOCKERIZED_OUTPUT_PATH)/kubectl)
E2E_TEST_BIN?=$(shell test -f $(LOCAL_OUTPUT_PATH)/e2e.test && echo $(LOCAL_OUTPUT_PATH)/e2e.test || echo $(DOCKERIZED_OUTPUT_PATH)/e2e.test)
GINKGO_BIN?=$(BINARY_PATH)/bin/linux/$(ARCH)/ginkgo
KUBECTL_BIN?=$(BINARY_PATH)/bin/linux/$(ARCH)/kubectl
E2E_TEST_BIN?=$(BINARY_PATH)/bin/linux/$(ARCH)/e2e.test
CLUSTER_DIR?=$(shell pwd)/../../../cluster/ CLUSTER_DIR?=$(shell pwd)/../../../cluster/
BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.12.1 BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.12.1