Skip to content

K
k3s
Commit 87148737 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #24990 from vishh/disable-coreos-node-e2e

Automatic merge from submit-queue Disable coreos nodes from node e2e due to issues with ssh on coreos. Fixes #24423
parents ad86986c 33a46e0e
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
test/e2e_node/jenkins/jenkins-ci.properties
View file @ 87148737
...@@ -3,7 +3,8 @@ GCE_HOSTS= ...@@ -3,7 +3,8 @@ GCE_HOSTS=
# To copy an image between projects: # 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> 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>` # `gcloud compute --project <to-project> images create <image-name> --source-disk=<image-name>`
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 # 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_ZONE=us-central1-f GCE_ZONE=us-central1-f
GCE_PROJECT=kubernetes-jenkins GCE_PROJECT=kubernetes-jenkins
INSTALL_GODEP=true INSTALL_GODEP=true
......
test/e2e_node/jenkins/jenkins-pull.properties
View file @ 87148737
...@@ -3,7 +3,8 @@ GCE_HOSTS= ...@@ -3,7 +3,8 @@ GCE_HOSTS=
# To copy an image between projects: # 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> 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>` # `gcloud compute --project <to-project> images create <image-name> --source-disk=<image-name>`
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 # 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_ZONE=us-central1-f GCE_ZONE=us-central1-f
GCE_PROJECT=kubernetes-jenkins-pull GCE_PROJECT=kubernetes-jenkins-pull
INSTALL_GODEP=true INSTALL_GODEP=true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment