Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.0:Update
kubectl
make-e2e_node-run-over-distro-bins.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File make-e2e_node-run-over-distro-bins.patch of Package kubectl
diff -up -r kubernetes-1.10.0+fc32d2f3698e36b93322a3465f63a14e9f0eaead.orig/hack/lib/init.sh kubernetes-1.10.0+fc32d2f3698e36b93322a3465f63a14e9f0eaead/hack/lib/init.sh --- kubernetes-1.10.0+fc32d2f3698e36b93322a3465f63a14e9f0eaead.orig/hack/lib/init.sh 2018-05-07 15:14:56.576243294 +0200 +++ kubernetes-1.10.0+fc32d2f3698e36b93322a3465f63a14e9f0eaead/hack/lib/init.sh 2018-05-07 15:17:48.433124996 +0200 @@ -49,7 +49,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 -up -r kubernetes-1.10.0+fc32d2f3698e36b93322a3465f63a14e9f0eaead.orig/hack/make-rules/test-e2e-node.sh kubernetes-1.10.0+fc32d2f3698e36b93322a3465f63a14e9f0eaead/hack/make-rules/test-e2e-node.sh --- kubernetes-1.10.0+fc32d2f3698e36b93322a3465f63a14e9f0eaead.orig/hack/make-rules/test-e2e-node.sh 2018-05-07 15:14:56.580243315 +0200 +++ kubernetes-1.10.0+fc32d2f3698e36b93322a3465f63a14e9f0eaead/hack/make-rules/test-e2e-node.sh 2018-05-07 15:18:29.289334360 +0200 @@ -172,6 +172,6 @@ else --system-spec-name="$system_spec_name" --ginkgo-flags="$ginkgoflags" \ --test-flags="--container-runtime=${runtime} \ --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 -up -r kubernetes-1.10.0+fc32d2f3698e36b93322a3465f63a14e9f0eaead.orig/test/e2e_node/builder/build.go kubernetes-1.10.0+fc32d2f3698e36b93322a3465f63a14e9f0eaead/test/e2e_node/builder/build.go --- kubernetes-1.10.0+fc32d2f3698e36b93322a3465f63a14e9f0eaead.orig/test/e2e_node/builder/build.go 2018-05-07 15:14:55.128235858 +0200 +++ kubernetes-1.10.0+fc32d2f3698e36b93322a3465f63a14e9f0eaead/test/e2e_node/builder/build.go 2018-05-07 15:20:58.666099050 +0200 @@ -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", "cluster/gce/gci/mounter", @@ -54,6 +54,10 @@ func BuildGo() error { return nil } +func GetK8sBinDir() string { + return *k8sBinDir +} + func getK8sBin(bin string) (string, error) { // Use commandline specified path if *k8sBinDir != "" { diff -up -r kubernetes-1.10.0+fc32d2f3698e36b93322a3465f63a14e9f0eaead.orig/test/e2e_node/services/services.go kubernetes-1.10.0+fc32d2f3698e36b93322a3465f63a14e9f0eaead/test/e2e_node/services/services.go --- kubernetes-1.10.0+fc32d2f3698e36b93322a3465f63a14e9f0eaead.orig/test/e2e_node/services/services.go 2018-05-07 15:14:55.120235818 +0200 +++ kubernetes-1.10.0+fc32d2f3698e36b93322a3465f63a14e9f0eaead/test/e2e_node/services/services.go 2018-05-07 15:22:11.918473607 +0200 @@ -130,6 +130,11 @@ func (e *E2EServices) startInternalServi } // Pass all flags into the child process, so that it will see the same flag set. startCmd := exec.Command(testBin, append([]string{"--run-services-mode"}, os.Args[1:]...)...) + + if build.GetK8sBinDir() != "" { + startCmd.Args = append(startCmd.Args, fmt.Sprintf("--k8s-bin-dir=%v", build.GetK8sBinDir())) + } + server := newServer("services", startCmd, nil, nil, getServicesHealthCheckURLs(), servicesLogFile, e.monitorParent, false) return server, server.start() }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor