Skip to content

K
k3s
Unverified Commit 4bafef22 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

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

Better detection of binaries for conformance image
parents fc30b380 9d7d6827
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
cluster/images/conformance/Makefile
View file @ 4bafef22
...@@ -21,12 +21,13 @@ REGISTRY?=k8s.gcr.io ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment