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

Merge pull request #46303 from Random-Liu/fix-cos-image-project

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 46299, 46309, 46311, 46303, 46150)

Fix cos image project to cos-cloud.

Addressed https://github.com/kubernetes/kubernetes/pull/45136#discussion_r118092211.

@vishh @yujuhong @dchen1107
This commit is contained in:
Kubernetes Submit Queue 2017-05-24 23:19:09 -07:00 committed by GitHub
commit ed8843406e
3 changed files with 6 additions and 6 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

@ -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

6
test/e2e_node/jenkins/benchmark/benchmark-config.yaml
View File

@ -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:

2
test/e2e_node/jenkins/image-config.yaml
View File

@ -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"