github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-12 21:40:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26671 from vishh/node-e2e-images

Browse Source 
Automatic merge from submit-queue

Support images and instances to exist in different GCP projects for node

Forked off from #26314
This commit is contained in:
k8s-merge-robot
2016-06-03 13:38:02 -07:00
parent a00dbea133 60ed27783e
commit 69e45dc30d
10 changed files with 46 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e_node/e2e_remote.go
View File

@@ -124,9 +124,19 @@ func CreateTestArchive() string {
return filepath.Join(dir, archiveName)
}
// RunRemote copies the archive file to a /tmp file on host, unpacks it, and runs the e2e_node.test
// Returns the command output, whether the exit was ok, and any errors
func RunRemote(archive string, host string, cleanup bool, junitFileNumber int) (string, bool, error) {
func RunRemote(archive string, host string, cleanup bool, junitFileNumber int, setupNode bool) (string, bool, error) {
if setupNode {
uname, err := user.Current()
if err != nil {
return "", false, fmt.Errorf("could not find username: %v", err)
}
output, err := RunSshCommand("ssh", host, "--", "sudo", "usermod", "-a", "-G", "docker", uname.Username)
if err != nil {
return "", false, fmt.Errorf("Instance %s not running docker daemon - Command failed: %s", host, output)
}
}
// Create the temp staging directory
glog.Infof("Staging test binaries on %s", host)
tmp := fmt.Sprintf("/tmp/gcloud-e2e-%d", rand.Int31())