github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

hack: make test-e2e-node: remove old project refs

Browse Source 
This commit cleans up references to the old kubernetes-node-e2e-images
project. In the process it removes the `LIST_IMAGES` mode as listing
large numbers of public cloud projects is not particularly useful, and
has been somewhat broken for a long period of time - as we defaulted
launching a VM to a different project than listing.
This commit is contained in:
Danielle Lancashire 2022-04-22 00:56:52 +02:00
parent f173d01c01
commit f1f45df2c1
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/root/Makefile
View File

@ -223,8 +223,6 @@ define TEST_E2E_NODE_HELP_INFO
# ARTIFACTS: Local directory to scp test artifacts into from the remote hosts # ARTIFACTS: Local directory to scp test artifacts into from the remote hosts
# for REMOTE=true. Local directory to write juntil xml results into for REMOTE=false. # for REMOTE=true. Local directory to write juntil xml results into for REMOTE=false.
# Defaults to "/tmp/_artifacts/$$(date +%y%m%dT%H%M%S)". # Defaults to "/tmp/_artifacts/$$(date +%y%m%dT%H%M%S)".
# LIST_IMAGES: For REMOTE=true only. If true, don't run tests. Just output the
# list of available images for testing. Defaults to false.
# TIMEOUT: For REMOTE=true only. How long (in golang duration format) to wait # TIMEOUT: For REMOTE=true only. How long (in golang duration format) to wait
# for ginkgo tests to complete. Defaults to 45m. # for ginkgo tests to complete. Defaults to 45m.
# PARALLELISM: The number of ginkgo nodes to run. Defaults to 8. # PARALLELISM: The number of ginkgo nodes to run. Defaults to 8.
@ -250,7 +248,7 @@ define TEST_E2E_NODE_HELP_INFO
# CLEANUP: For REMOTE=true only. If false, do not stop processes or delete # CLEANUP: For REMOTE=true only. If false, do not stop processes or delete
# test files on remote hosts. Defaults to true. # test files on remote hosts. Defaults to true.
# IMAGE_PROJECT: For REMOTE=true only. Project containing images provided to # IMAGE_PROJECT: For REMOTE=true only. Project containing images provided to
# $$IMAGES. Defaults to "kubernetes-node-e2e-images". # $$IMAGES. Defaults to "cos-cloud".
# INSTANCE_PREFIX: For REMOTE=true only. Instances created from images will # INSTANCE_PREFIX: For REMOTE=true only. Instances created from images will
# have the name "$${INSTANCE_PREFIX}-$${IMAGE_NAME}". Defaults to "test". # have the name "$${INSTANCE_PREFIX}-$${IMAGE_NAME}". Defaults to "test".
# INSTANCE_METADATA: For REMOTE=true and running on GCE only. # INSTANCE_METADATA: For REMOTE=true and running on GCE only.

8
hack/make-rules/test-e2e-node.sh
View File

@ -89,19 +89,13 @@ if [ "${remote}" = true ] && [ "${remote_mode}" = gce ] ; then
# The following options are only valid in remote GCE run. # The following options are only valid in remote GCE run.
images=${IMAGES:-""} images=${IMAGES:-""}
hosts=${HOSTS:-""} hosts=${HOSTS:-""}
image_project=${IMAGE_PROJECT:-"kubernetes-node-e2e-images"} image_project=${IMAGE_PROJECT:-"cos-cloud"}
metadata=${INSTANCE_METADATA:-""} metadata=${INSTANCE_METADATA:-""}
list_images=${LIST_IMAGES:-false}
if [[ ${list_images} == "true" ]]; then
gcloud compute images list --project="${image_project}" | grep "e2e-node"
exit 0
fi
gubernator=${GUBERNATOR:-"false"} gubernator=${GUBERNATOR:-"false"}
image_config_file=${IMAGE_CONFIG_FILE:-""} image_config_file=${IMAGE_CONFIG_FILE:-""}
image_config_dir=${IMAGE_CONFIG_DIR:-""} image_config_dir=${IMAGE_CONFIG_DIR:-""}
runtime_config=${RUNTIME_CONFIG:-""} runtime_config=${RUNTIME_CONFIG:-""}
if [[ ${hosts} == "" && ${images} == "" && ${image_config_file} == "" ]]; then if [[ ${hosts} == "" && ${images} == "" && ${image_config_file} == "" ]]; then
image_project="${IMAGE_PROJECT:-"cos-cloud"}"
gci_image=$(gcloud compute images list --project "${image_project}" \ gci_image=$(gcloud compute images list --project "${image_project}" \
--no-standard-images --filter="name ~ 'cos-beta.*'" --format="table[no-heading](name)") --no-standard-images --filter="name ~ 'cos-beta.*'" --format="table[no-heading](name)")
images=${gci_image} images=${gci_image}