mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Simpler make commands for ginkgo/kubectl/e2e.test
Change-Id: I78cff10231eabd53b1fc7bdd1526c861179e135a
This commit is contained in:
parent
c5242f0368
commit
069eeb541b
@ -20,9 +20,13 @@
|
|||||||
REGISTRY?=staging-k8s.gcr.io
|
REGISTRY?=staging-k8s.gcr.io
|
||||||
ARCH?=amd64
|
ARCH?=amd64
|
||||||
OUT_DIR?=_output
|
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
|
OUTPUT_PATH=$(shell pwd)/../../../$(OUT_DIR)
|
||||||
E2E_TEST_BIN?=$(shell pwd)/../../../$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/e2e.test
|
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/
|
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
|
||||||
|
@ -6,8 +6,8 @@
|
|||||||
#### How to release by hand
|
#### How to release by hand
|
||||||
|
|
||||||
```console
|
```console
|
||||||
# First, build the binaries
|
# First, build the binaries by running make from the root directory
|
||||||
$ build/run.sh make cross
|
$ make WHAT="test/e2e/e2e.test vendor/github.com/onsi/ginkgo/ginkgo cmd/kubectl"
|
||||||
|
|
||||||
# Build for linux/amd64 (default)
|
# Build for linux/amd64 (default)
|
||||||
# export REGISTRY=$HOST/$ORG to switch from staging-k8s.gcr.io
|
# export REGISTRY=$HOST/$ORG to switch from staging-k8s.gcr.io
|
||||||
@ -48,7 +48,6 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: conformance-container
|
- name: conformance-container
|
||||||
image: gcr.io/heptio-images/kube-conformance:latest
|
|
||||||
image: staging-k8s.gcr.io/conformance-amd64:v1.12.1
|
image: staging-k8s.gcr.io/conformance-amd64:v1.12.1
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
env:
|
env:
|
||||||
|
Loading…
Reference in New Issue
Block a user