From 05951caa44826bfb93f6c198b5e44e09b9a438b1 Mon Sep 17 00:00:00 2001 From: Yifan Gu Date: Fri, 29 Apr 2016 18:24:55 -0700 Subject: [PATCH 1/2] Revert "Disable coreos nodes from node e2e due to issues with ssh on coreos." This reverts commit 33a46e0ed6b625b1b774b4b699368c22f9c98021. --- test/e2e_node/jenkins/jenkins-ci.properties | 3 +-- test/e2e_node/jenkins/jenkins-pull.properties | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/test/e2e_node/jenkins/jenkins-ci.properties b/test/e2e_node/jenkins/jenkins-ci.properties index 4c3f58b9b1f..223254f683b 100644 --- a/test/e2e_node/jenkins/jenkins-ci.properties +++ b/test/e2e_node/jenkins/jenkins-ci.properties @@ -3,8 +3,7 @@ GCE_HOSTS= # To copy an image between projects: # `gcloud compute --project disks create --image=https://www.googleapis.com/compute/v1/projects//global/images/` # `gcloud compute --project images create --source-disk=` -# Disabled `e2e-node-coreos-stable20160218-image` due to #24423. -GCE_IMAGES=e2e-node-ubuntu-trusty-docker10-image,e2e-node-ubuntu-trusty-docker9-image,e2e-node-ubuntu-trusty-docker8-image,e2e-node-containervm-20160217-image +GCE_IMAGES=e2e-node-ubuntu-trusty-docker10-image,e2e-node-ubuntu-trusty-docker9-image,e2e-node-ubuntu-trusty-docker8-image,e2e-node-coreos-stable20160218-image,e2e-node-containervm-20160217-image GCE_ZONE=us-central1-f GCE_PROJECT=kubernetes-jenkins INSTALL_GODEP=true diff --git a/test/e2e_node/jenkins/jenkins-pull.properties b/test/e2e_node/jenkins/jenkins-pull.properties index 89c1b83d784..54417642e07 100644 --- a/test/e2e_node/jenkins/jenkins-pull.properties +++ b/test/e2e_node/jenkins/jenkins-pull.properties @@ -3,8 +3,7 @@ GCE_HOSTS= # To copy an image between projects: # `gcloud compute --project disks create --image=https://www.googleapis.com/compute/v1/projects//global/images/` # `gcloud compute --project images create --source-disk=` -# Disabled `e2e-node-coreos-stable20160218-image` due to #24423. -GCE_IMAGES=e2e-node-ubuntu-trusty-docker10-image,e2e-node-ubuntu-trusty-docker9-image,e2e-node-ubuntu-trusty-docker8-image,e2e-node-containervm-20160217-image +GCE_IMAGES=e2e-node-ubuntu-trusty-docker10-image,e2e-node-ubuntu-trusty-docker9-image,e2e-node-ubuntu-trusty-docker8-image,e2e-node-coreos-stable20160218-image,e2e-node-containervm-20160217-image GCE_ZONE=us-central1-f GCE_PROJECT=kubernetes-jenkins-pull INSTALL_GODEP=true From d705cc5cf84d4385256ededd0797270c93382ecd Mon Sep 17 00:00:00 2001 From: Yifan Gu Date: Fri, 29 Apr 2016 18:25:10 -0700 Subject: [PATCH 2/2] e2e_node: Disable auto restart on CoreOS. --- test/e2e_node/e2e_node_suite_test.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/test/e2e_node/e2e_node_suite_test.go b/test/e2e_node/e2e_node_suite_test.go index aa462398176..b09b33111ed 100644 --- a/test/e2e_node/e2e_node_suite_test.go +++ b/test/e2e_node/e2e_node_suite_test.go @@ -22,6 +22,7 @@ import ( "bytes" "flag" "fmt" + "io/ioutil" "math/rand" "os/exec" "strings" @@ -65,6 +66,11 @@ var _ = BeforeSuite(func() { *nodeName = strings.TrimSpace(fmt.Sprintf("%s", output)) } + // TODO(yifan): Temporary workaround to disable coreos from auto restart + // by masking the locksmithd. + // We should mask locksmithd when provisioning the machine. + maskLocksmithdOnCoreos() + if *startServices { e2es = newE2eService(*nodeName) if err := e2es.start(); err != nil { @@ -118,3 +124,16 @@ func (lr *LogReporter) SpecSuiteDidEnd(summary *types.SuiteSummary) { b.WriteString("******************************************************\n") glog.Infof(b.String()) } + +func maskLocksmithdOnCoreos() { + data, err := ioutil.ReadFile("/etc/os-release") + if err != nil { + glog.Fatalf("Could not read /etc/os-release: %v", err) + } + if bytes.Contains(data, []byte("ID=coreos")) { + if output, err := exec.Command("sudo", "systemctl", "mask", "--now", "locksmithd").CombinedOutput(); err != nil { + glog.Fatalf("Could not mask locksmithd: %v, output: %q", err, string(output)) + } + } + glog.Infof("Locksmithd is masked successfully") +}