From 05951caa44826bfb93f6c198b5e44e09b9a438b1 Mon Sep 17 00:00:00 2001 From: Yifan Gu Date: Fri, 29 Apr 2016 18:24:55 -0700 Subject: [PATCH] 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