github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31588 from ingvagabund/make-gcloud-compute-conditional

Browse Source 
Automatic merge from submit-queue

node e2e script: call 'gcloud compute' only if necessary

**What this PR does / why we need it**:

The ``gcloud compute`` is called everytime even if it is not needed.
When runnin node e2e tests on RHEL, the test-e2e-node.sh script is run
the way in which it takes execution path without ``gcloud`` invocation.

With the current code, ``gcloud`` is called everytime.
Thus introducing additional runtime dependency.

**Special notes for your reviewer**:

First introduced here: https://github.com/kubernetes/kubernetes/pull/29815
This commit is contained in:
Kubernetes Submit Queue 2016-08-29 11:33:34 -07:00 committed by GitHub
commit 295f1786fb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,9 +33,9 @@ images=${IMAGES:-""}
hosts=${HOSTS:-""}
metadata=${INSTANCE_METADATA:-""}
gubernator=${GUBERNATOR:-"false"}
gci_image=$(gcloud compute images list --project google-containers \
--no-standard-images --regexp="gci-dev.*" --format="table[no-heading](name)")
if [[ $hosts == "" && $images == "" ]]; then
gci_image=$(gcloud compute images list --project google-containers \
--no-standard-images --regexp="gci-dev.*" --format="table[no-heading](name)")
images=$gci_image
metadata="user-data<${KUBE_ROOT}/test/e2e_node/jenkins/gci-init.yaml"
fi