-
Notifications
You must be signed in to change notification settings - Fork 38.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
node_e2e: configure gce images via config file #28708
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
# 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>` | ||
images: | ||
ubuntu-docker9: | ||
image: e2e-node-ubuntu-trusty-docker9-v1-image | ||
project: kubernetes-node-e2e-images | ||
ubuntu-docker10: | ||
image: e2e-node-ubuntu-trusty-docker10-v1-image | ||
project: kubernetes-node-e2e-images | ||
coreos-stable: | ||
image: e2e-node-coreos-alpha-1068-20160707-image | ||
project: kubernetes-node-e2e-images | ||
containervm: | ||
image: e2e-node-containervm-v20160321-image | ||
project: kubernetes-node-e2e-images |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,7 @@ | ||
GCE_HOSTS= | ||
# Keep GCE_IMAGES consistent with those in jenkins-ci.properties | ||
# 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>` | ||
GCE_IMAGES=e2e-node-ubuntu-trusty-docker9-v1-image,e2e-node-ubuntu-trusty-docker10-v1-image,e2e-node-coreos-alpha-1068-20160707-image,e2e-node-containervm-v20160321-image | ||
GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/image-config.yaml | ||
GCE_ZONE=us-central1-f | ||
GCE_PROJECT=kubernetes-jenkins-pull | ||
GCE_IMAGE_PROJECT=kubernetes-node-e2e-images | ||
CLEANUP=true | ||
GINKGO_FLAGS=--skip=FLAKY | ||
SETUP_NODE=false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,19 @@ | ||
# Copy this file to your home directory and modify | ||
# Names of gce hosts to test against (must be resolvable) or empty (one or more of GCE_IMAGES, GCE_HOSTS is required) | ||
# Path to a yaml or json file describing images to run or empty | ||
GCE_IMAGE_CONFIG_PATH= | ||
# Names of gce hosts to test against (must be resolvable) or empty | ||
GCE_HOSTS= | ||
# Names of gce images to test or empty (one or more of GCE_IMAGES, GCE_HOSTS is required) | ||
# Comma-separated names of gce images to test or empty (one or more of GCE_IMAGE_CONFIG_PATH, GCE_IMAGES, GCE_HOSTS is required) | ||
GCE_IMAGES= | ||
# Gce zone to use - required when using GCE_IMAGES | ||
GCE_ZONE= | ||
# Gce project to use for creating instances | ||
# required when using GCE_IMAGES | ||
# Gce project to use for creating instances | ||
# required when using GCE_IMAGES or GCE_IMAGE_CONFIG_PATH | ||
GCE_PROJECT= | ||
# Gce project to use for GCE_IMAGES | ||
# required when using GCE_IMAGES | ||
GCE_IMAGE_PROJECT= | ||
# If true, delete instances created from GCE_IMAGES and files copied to GCE_HOSTS | ||
# If true, delete instances created from GCE_IMAGES/GCE_IMAGE_CONFIG_PATH and files copied to GCE_HOSTS | ||
CLEANUP=true | ||
# If true, current user will be added to the docker group on test node | ||
SETUP_NODE=false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: Should this be marked deprecated?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe, but right now the make workflow for local testing relies on it and there might be room for both.
We can perhaps mark it deprecated when we remove the uses of it, but otoh I'd rather set an
--images
flag than write out a yaml config for thee2e-node-test.sh
script.Expressive files make sense for config that's checked in, but for make options / local testing, flags make more sense.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Makes sense.