mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Fix cos image project to cos-cloud.
This commit is contained in:
parent
f8815c96e0
commit
82f588b483
@ -73,9 +73,9 @@ if [ $remote = true ] ; then
|
|||||||
gubernator=${GUBERNATOR:-"false"}
|
gubernator=${GUBERNATOR:-"false"}
|
||||||
image_config_file=${IMAGE_CONFIG_FILE:-""}
|
image_config_file=${IMAGE_CONFIG_FILE:-""}
|
||||||
if [[ $hosts == "" && $images == "" && $image_config_file == "" ]]; then
|
if [[ $hosts == "" && $images == "" && $image_config_file == "" ]]; then
|
||||||
image_project=${IMAGE_PROJECT:-"google-containers"}
|
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 --regexp="gci-dev.*" --format="table[no-heading](name)")
|
--no-standard-images --regexp="cos-beta.*" --format="table[no-heading](name)")
|
||||||
images=$gci_image
|
images=$gci_image
|
||||||
metadata="user-data<${KUBE_ROOT}/test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
|
metadata="user-data<${KUBE_ROOT}/test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
|
||||||
fi
|
fi
|
||||||
|
@ -50,21 +50,21 @@ images:
|
|||||||
- 'resource tracking for 105 pods per node \[Benchmark\]'
|
- 'resource tracking for 105 pods per node \[Benchmark\]'
|
||||||
gci-resource1:
|
gci-resource1:
|
||||||
image: cos-beta-59-9460-20-0
|
image: cos-beta-59-9460-20-0
|
||||||
project: google-containers
|
project: cos-cloud
|
||||||
machine: n1-standard-1
|
machine: n1-standard-1
|
||||||
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
|
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
|
||||||
tests:
|
tests:
|
||||||
- 'resource tracking for 0 pods per node \[Benchmark\]'
|
- 'resource tracking for 0 pods per node \[Benchmark\]'
|
||||||
gci-resource2:
|
gci-resource2:
|
||||||
image: cos-beta-59-9460-20-0
|
image: cos-beta-59-9460-20-0
|
||||||
project: google-containers
|
project: cos-cloud
|
||||||
machine: n1-standard-1
|
machine: n1-standard-1
|
||||||
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
|
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
|
||||||
tests:
|
tests:
|
||||||
- 'resource tracking for 35 pods per node \[Benchmark\]'
|
- 'resource tracking for 35 pods per node \[Benchmark\]'
|
||||||
gci-resource3:
|
gci-resource3:
|
||||||
image: cos-beta-59-9460-20-0
|
image: cos-beta-59-9460-20-0
|
||||||
project: google-containers
|
project: cos-cloud
|
||||||
machine: n1-standard-1
|
machine: n1-standard-1
|
||||||
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
|
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
|
||||||
tests:
|
tests:
|
||||||
|
@ -17,5 +17,5 @@ images:
|
|||||||
project: kubernetes-node-e2e-images
|
project: kubernetes-node-e2e-images
|
||||||
gci:
|
gci:
|
||||||
image_regex: cos-beta-59-9460-20-0 # docker 1.11.2
|
image_regex: cos-beta-59-9460-20-0 # docker 1.11.2
|
||||||
project: google-containers
|
project: cos-cloud
|
||||||
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
|
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
|
||||||
|
Loading…
Reference in New Issue
Block a user