github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #25004 from yifan-gu/mask_locksmithd 

e2e_node: Disable auto restart on CoreOS.
pull/6/head
Robert Bailey 2016-05-06 14:15:43 -07:00
parent 2493a9de62 d705cc5cf8
commit 8bebc448cb
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/e2e_node/e2e_node_suite_test.go
View File

@ -22,6 +22,7 @@ import (
"bytes"
"flag"
"fmt"
"io/ioutil"
"math/rand"
"os/exec"
"strings"
@ -58,6 +59,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 {
@ -111,3 +117,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")
}

3
test/e2e_node/jenkins/jenkins-ci.properties
View File

@ -3,8 +3,7 @@ GCE_HOSTS=
# To copy an image between projects:
# `gcloud compute --project <to-project> disks create <image name> --image=https://www.googleapis.com/compute/v1/projects/<from-project>/global/images/<image-name>`
# `gcloud compute --project <to-project> images create <image-name> --source-disk=<image-name>`
# 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

3
test/e2e_node/jenkins/jenkins-pull.properties
View File

@ -3,8 +3,7 @@ GCE_HOSTS=
# To copy an image between projects:
# `gcloud compute --project <to-project> disks create <image name> --image=https://www.googleapis.com/compute/v1/projects/<from-project>/global/images/<image-name>`
# `gcloud compute --project <to-project> images create <image-name> --source-disk=<image-name>`
# 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