diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2017-07-24 13:22:58 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2017-07-24 13:24:30 +0000 |
| commit | cd0772dc1f975cce583f9001b086d9b29c413685 (patch) | |
| tree | f68e38ad35230995bbed28c20024d528c0838e25 /testing/kubernetes/make-e2e_node-run-over-distro-bins.patch | |
| parent | a599e651c9794f716fd0cef835547471b95d02e0 (diff) | |
| download | aports-cd0772dc1f975cce583f9001b086d9b29c413685.tar.bz2 aports-cd0772dc1f975cce583f9001b086d9b29c413685.tar.xz | |
testing/kubernetes: upgrade to 1.7.2
Diffstat (limited to 'testing/kubernetes/make-e2e_node-run-over-distro-bins.patch')
| -rw-r--r-- | testing/kubernetes/make-e2e_node-run-over-distro-bins.patch | 49 |
1 files changed, 5 insertions, 44 deletions
diff --git a/testing/kubernetes/make-e2e_node-run-over-distro-bins.patch b/testing/kubernetes/make-e2e_node-run-over-distro-bins.patch index 05d6d431b6..c2739d6747 100644 --- a/testing/kubernetes/make-e2e_node-run-over-distro-bins.patch +++ b/testing/kubernetes/make-e2e_node-run-over-distro-bins.patch @@ -1,51 +1,12 @@ -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 +index 54a8233..2a68768 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) \ +@@ -168,6 +168,6 @@ else + --container-runtime-endpoint=${container_runtime_endpoint} \ + --image-service-endpoint=${image_service_endpoint} \ + --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", - } - |