From f24402c59aee6fcdd4383258e544135f2c19039b Mon Sep 17 00:00:00 2001
From: Francesco Colista <fcolista@alpinelinux.org>
Date: Thu, 12 Jan 2017 16:26:46 +0000
Subject: testing/kubernetes: moved from unmaintained, fixed build, upgrade to
 1.5.2

---
 .../make-e2e_node-run-over-distro-bins.patch       | 51 ++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 testing/kubernetes/make-e2e_node-run-over-distro-bins.patch

(limited to 'testing/kubernetes/make-e2e_node-run-over-distro-bins.patch')

diff --git a/testing/kubernetes/make-e2e_node-run-over-distro-bins.patch b/testing/kubernetes/make-e2e_node-run-over-distro-bins.patch
new file mode 100644
index 0000000000..05d6d431b6
--- /dev/null
+++ b/testing/kubernetes/make-e2e_node-run-over-distro-bins.patch
@@ -0,0 +1,51 @@
+From 43f9b66744362240332241788d9811f863366f4e Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup@redhat.com>
+Date: Thu, 5 Jan 2017 10:01:34 +0100
+Subject: [PATCH] make e2e_node run over distro bins
+
+---
+ src/k8s.io/kubernetes/hack/lib/init.sh                   | 2 +-
+ src/k8s.io/kubernetes/hack/make-rules/test-e2e-node.sh   | 2 +-
+ src/k8s.io/kubernetes/test/e2e_node/builder/build.go     | 6 +++++-
+ src/k8s.io/kubernetes/test/e2e_node/services/services.go | 5 +++++
+ 4 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/hack/lib/init.sh b/hack/lib/init.sh
+index ae50779..0a601ac 100644
+--- a/hack/lib/init.sh
++++ b/hack/lib/init.sh
+@@ -42,7 +42,7 @@ source "${KUBE_ROOT}/hack/lib/version.sh"
+ source "${KUBE_ROOT}/hack/lib/golang.sh"
+ source "${KUBE_ROOT}/hack/lib/etcd.sh"
+ 
+-KUBE_OUTPUT_HOSTBIN="${KUBE_OUTPUT_BINPATH}/$(kube::util::host_platform)"
++KUBE_OUTPUT_HOSTBIN="/usr/bin"
+ 
+ # list of all available group versions.  This should be used when generated code
+ # or when starting an API server that you want to have everything.
+diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh
+index e98842d..3d51a06 100755
+--- a/hack/make-rules/test-e2e-node.sh
++++ b/hack/make-rules/test-e2e-node.sh
+@@ -148,6 +148,6 @@ else
+   # Provided for backwards compatibility
+   go run test/e2e_node/runner/local/run_local.go --ginkgo-flags="$ginkgoflags" \
+     --test-flags="--alsologtostderr --v 4 --report-dir=${artifacts} --node-name $(hostname) \
+-    $test_args" --build-dependencies=true 2>&1 | tee -i "${artifacts}/build-log.txt"
++    $test_args --k8s-bin-dir /usr/bin" --build-dependencies=true 2>&1 | tee -i "${artifacts}/build-log.txt"
+   exit $?
+ fi
+diff --git a/test/e2e_node/builder/build.go b/test/e2e_node/builder/build.go
+index f22232a..c49c35f 100644
+--- a/test/e2e_node/builder/build.go
++++ b/test/e2e_node/builder/build.go
+@@ -31,7 +31,7 @@ import (
+ var k8sBinDir = flag.String("k8s-bin-dir", "", "Directory containing k8s kubelet binaries.")
+ 
+ var buildTargets = []string{
+-	"cmd/kubelet",
++	//"cmd/kubelet",
+ 	"test/e2e_node/e2e_node.test",
+ 	"vendor/github.com/onsi/ginkgo/ginkgo",
+ }
+
-- 
cgit v1.2.3