github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Simpler make commands for ginkgo/kubectl/e2e.test

Browse Source 
Change-Id: I78cff10231eabd53b1fc7bdd1526c861179e135a
This commit is contained in:
Davanum Srinivas 2019-02-26 09:18:05 -05:00
parent c5242f0368
commit 069eeb541b
No known key found for this signature in database
GPG Key ID: 80D83A796103BF59
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/images/conformance/Makefile
View File

@ -20,9 +20,13 @@
REGISTRY?=staging-k8s.gcr.io
ARCH?=amd64
OUT_DIR?=_output
GINKGO_BIN?=$(shell pwd)/../../../$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/ginkgo
KUBECTL_BIN?=$(shell pwd)/../../../$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/kubectl
E2E_TEST_BIN?=$(shell pwd)/../../../$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/e2e.test
OUTPUT_PATH=$(shell pwd)/../../../$(OUT_DIR)
BINARY_PATH=$(shell test -d $(OUTPUT_PATH)/dockerized && echo $(OUTPUT_PATH)/dockerized || echo $(OUTPUT_PATH)/local)
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/
BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.12.1

5
cluster/images/conformance/README.md
View File

@ -6,8 +6,8 @@
#### How to release by hand
```console
# First, build the binaries
$ build/run.sh make cross
# First, build the binaries by running make from the root directory
$ make WHAT="test/e2e/e2e.test vendor/github.com/onsi/ginkgo/ginkgo cmd/kubectl"
# Build for linux/amd64 (default)
# export REGISTRY=$HOST/$ORG to switch from staging-k8s.gcr.io
@ -48,7 +48,6 @@ metadata:
spec:
containers:
- name: conformance-container
image: gcr.io/heptio-images/kube-conformance:latest
image: staging-k8s.gcr.io/conformance-amd64:v1.12.1
imagePullPolicy: IfNotPresent
env: