-
Notifications
You must be signed in to change notification settings - Fork 40.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #21622 from pwittrock/nodee2essh
Auto commit by PR queue bot
- Loading branch information
Showing
13 changed files
with
623 additions
and
370 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Copyright 2016 The Kubernetes Authors All rights reserved. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| # Provided for backwards compatibility | ||
| sudo -v | ||
| ginkgo "$(dirname $0)/../test/e2e_node/" -- --alsologtostderr --v 2 --node-name $(hostname) --build-services=true --start-services=true --stop-services=true | ||
|
|
||
| exit $? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| /* | ||
| Copyright 2016 The Kubernetes Authors All rights reserved. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package e2e_node | ||
|
|
||
| import ( | ||
| "flag" | ||
| "fmt" | ||
| "os" | ||
| "os/exec" | ||
| "path/filepath" | ||
| "runtime" | ||
| "strings" | ||
|
|
||
| "github.com/golang/glog" | ||
| ) | ||
|
|
||
| var k8sBinDir = flag.String("k8s-bin-dir", "", "Directory containing k8s kubelet and kube-apiserver binaries.") | ||
|
|
||
| func buildGo() { | ||
| glog.Infof("Building k8s binaries...") | ||
| k8sRoot, err := getK8sRootDir() | ||
| if err != nil { | ||
| glog.Fatalf("Failed to locate kubernetes root directory %v.", err) | ||
| } | ||
| out, err := exec.Command(filepath.Join(k8sRoot, "hack/build-go.sh")).CombinedOutput() | ||
| if err != nil { | ||
| glog.Fatalf("Failed to build go packages %v. Output:\n%s", err, out) | ||
| } | ||
| } | ||
|
|
||
| func getK8sBin(bin string) (string, error) { | ||
| // Use commandline specified path | ||
| if *k8sBinDir != "" { | ||
| absPath, err := filepath.Abs(*k8sBinDir) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| if _, err := os.Stat(filepath.Join(*k8sBinDir, bin)); err != nil { | ||
| return "", fmt.Errorf("Could not find kube-apiserver under directory %s.", absPath) | ||
| } | ||
| return filepath.Join(absPath, bin), nil | ||
| } | ||
|
|
||
| path, err := filepath.Abs(filepath.Dir(os.Args[0])) | ||
| if err != nil { | ||
| return "", fmt.Errorf("Could not find absolute path of directory containing the tests %s.", filepath.Dir(os.Args[0])) | ||
| } | ||
| if _, err := os.Stat(filepath.Join(path, bin)); err == nil { | ||
| return filepath.Join(path, bin), nil | ||
| } | ||
|
|
||
| buildOutputDir, err := getK8sBuildOutputDir() | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| if _, err := os.Stat(filepath.Join(buildOutputDir, bin)); err == nil { | ||
| return filepath.Join(buildOutputDir, bin), nil | ||
| } | ||
|
|
||
| // Give up with error | ||
| return "", fmt.Errorf("Unable to locate %s. Can be defined using --k8s-path.", bin) | ||
| } | ||
|
|
||
| // TODO: Dedup / merge this with comparable utilities in e2e/util.go | ||
| func getK8sRootDir() (string, error) { | ||
| // Get the directory of the current executable | ||
| _, testExec, _, _ := runtime.Caller(0) | ||
| path := filepath.Dir(testExec) | ||
|
|
||
| // Look for the kubernetes source root directory | ||
| if strings.Contains(path, "k8s.io/kubernetes") { | ||
| splitPath := strings.Split(path, "k8s.io/kubernetes") | ||
| return filepath.Join(splitPath[0], "k8s.io/kubernetes/"), nil | ||
| } | ||
|
|
||
| return "", fmt.Errorf("Could not find kubernetes source root directory.") | ||
| } | ||
|
|
||
| func getK8sBuildOutputDir() (string, error) { | ||
| k8sRoot, err := getK8sRootDir() | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| buildOutputDir := filepath.Join(k8sRoot, "_output/local/go/bin") | ||
| if _, err := os.Stat(buildOutputDir); err != nil { | ||
| return "", err | ||
| } | ||
| return buildOutputDir, nil | ||
| } | ||
|
|
||
| func getK8sNodeTestDir() (string, error) { | ||
| k8sRoot, err := getK8sRootDir() | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| buildOutputDir := filepath.Join(k8sRoot, "test/e2e_node") | ||
| if _, err := os.Stat(buildOutputDir); err != nil { | ||
| return "", err | ||
| } | ||
| return buildOutputDir, nil | ||
| } | ||
|
|
||
| func getKubeletServerBin() string { | ||
| bin, err := getK8sBin("kubelet") | ||
| if err != nil { | ||
| panic(fmt.Sprintf("Could not locate kubelet binary.")) | ||
| } | ||
| return bin | ||
| } | ||
|
|
||
| func getApiServerBin() string { | ||
| bin, err := getK8sBin("kube-apiserver") | ||
| if err != nil { | ||
| panic(fmt.Sprintf("Could not locate kube-apiserver binary.")) | ||
| } | ||
| return bin | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.