From e4b40fca9a68974ba3e546fc8c52c51de2221264 Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Thu, 19 May 2016 14:37:11 -0700 Subject: [PATCH] Update node e2e containervm image to not start kubelet as part of init. Update the node e2e host setup.sh to also do this when creating new images. --- test/e2e_node/environment/setup_host.sh | 11 ++++++++--- test/e2e_node/jenkins/jenkins-ci.properties | 2 +- test/e2e_node/jenkins/jenkins-pull.properties | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/test/e2e_node/environment/setup_host.sh b/test/e2e_node/environment/setup_host.sh index 662bc1b30e..ebbfd5d4e4 100755 --- a/test/e2e_node/environment/setup_host.sh +++ b/test/e2e_node/environment/setup_host.sh @@ -25,9 +25,6 @@ # - centos 7 # - debian jessie -set -e -set -x - # Fixup sudoers require tty sudo grep -q "# Defaults requiretty" /etc/sudoers if [ $? -ne 0 ] ; then @@ -52,6 +49,9 @@ if [ $? -ne 0 ]; then sudo systemctl enable docker.service fi +# Allow jenkins access to docker +sudo usermod -a -G docker jenkins + # install lxc cat /etc/*-release | grep "ID=debian" if [ $? -ne 0 ]; then @@ -60,3 +60,8 @@ if [ $? -ne 0 ]; then sudo sed -i 's/GRUB_CMDLINE_LINUX="\(.*\)"/GRUB_CMDLINE_LINUX="\1 cgroup_enable=memory"/' /etc/default/grub sudo update-grub fi + +# delete init kubelet from containervm so that is doesn't startup +if [ -f /etc/init.d/kubelet ]; then + sudo rm /etc/init.d/kubelet +fi \ No newline at end of file diff --git a/test/e2e_node/jenkins/jenkins-ci.properties b/test/e2e_node/jenkins/jenkins-ci.properties index 223254f683..4bcf7c2007 100644 --- a/test/e2e_node/jenkins/jenkins-ci.properties +++ b/test/e2e_node/jenkins/jenkins-ci.properties @@ -3,7 +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=` -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_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-v20160321-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 54417642e0..f798c8f9c5 100644 --- a/test/e2e_node/jenkins/jenkins-pull.properties +++ b/test/e2e_node/jenkins/jenkins-pull.properties @@ -3,7 +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=` -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_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-v20160321-image GCE_ZONE=us-central1-f GCE_PROJECT=kubernetes-jenkins-pull INSTALL_GODEP=true