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

Updating the GCI image to gci-dev-55-8872-18-0.

Browse Source
This commit is contained in:
Maisem Ali 2016-10-20 15:59:08 -07:00
parent 8b510f3ef4
commit d3163c93f4
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/config-default.sh
View File

@ -44,7 +44,7 @@ NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}}
# variable. Also please update corresponding image for node e2e at: # variable. Also please update corresponding image for node e2e at:
# https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml # https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml
CVM_VERSION=container-v1-3-v20160604 CVM_VERSION=container-v1-3-v20160604
GCI_VERSION="gci-dev-55-8866-0-0" GCI_VERSION="gci-dev-55-8872-18-0"
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}

2
cluster/gce/config-test.sh
View File

@ -45,7 +45,7 @@ NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}}
# variable. Also please update corresponding image for node e2e at: # variable. Also please update corresponding image for node e2e at:
# https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml # https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml
CVM_VERSION=container-v1-3-v20160604 CVM_VERSION=container-v1-3-v20160604
GCI_VERSION="gci-dev-55-8866-0-0" GCI_VERSION="gci-dev-55-8872-18-0"
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-} MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers} MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}} NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}

16
test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
View File

@ -1,56 +1,56 @@
--- ---
images: images:
containervm-density1: containervm-density1:
image: gci-dev-55-8820-0-0 image: gci-dev-55-8872-18-0
project: google-containers project: google-containers
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
tests: tests:
- 'create 35 pods with 0s? interval \[Benchmark\]' - 'create 35 pods with 0s? interval \[Benchmark\]'
containervm-density2: containervm-density2:
image: gci-dev-55-8820-0-0 image: gci-dev-55-8872-18-0
project: google-containers project: google-containers
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
tests: tests:
- 'create 105 pods with 0s? interval \[Benchmark\]' - 'create 105 pods with 0s? interval \[Benchmark\]'
containervm-density2-qps60: containervm-density2-qps60:
image: gci-dev-55-8820-0-0 image: gci-dev-55-8872-18-0
project: google-containers project: google-containers
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
tests: tests:
- 'create 105 pods with 0s? interval \(QPS 60\) \[Benchmark\]' - 'create 105 pods with 0s? interval \(QPS 60\) \[Benchmark\]'
containervm-density3: containervm-density3:
image: gci-dev-55-8820-0-0 image: gci-dev-55-8872-18-0
project: google-containers project: google-containers
machine: n1-standard-2 machine: n1-standard-2
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
tests: tests:
- 'create 105 pods with 0s? interval \[Benchmark\]' - 'create 105 pods with 0s? interval \[Benchmark\]'
containervm-density4: containervm-density4:
image: gci-dev-55-8820-0-0 image: gci-dev-55-8872-18-0
project: google-containers project: google-containers
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
tests: tests:
- 'create 105 pods with 100ms interval \[Benchmark\]' - 'create 105 pods with 100ms interval \[Benchmark\]'
containervm-resource1: containervm-resource1:
image: gci-dev-55-8820-0-0 image: gci-dev-55-8872-18-0
project: google-containers project: google-containers
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
tests: tests:
- 'resource tracking for 0 pods per node \[Benchmark\]' - 'resource tracking for 0 pods per node \[Benchmark\]'
containervm-resource2: containervm-resource2:
image: gci-dev-55-8820-0-0 image: gci-dev-55-8872-18-0
project: google-containers project: google-containers
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
tests: tests:
- 'resource tracking for 35 pods per node \[Benchmark\]' - 'resource tracking for 35 pods per node \[Benchmark\]'
containervm-resource3: containervm-resource3:
image: gci-dev-55-8820-0-0 image: gci-dev-55-8872-18-0
project: google-containers project: google-containers
machine: n1-standard-1 machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"

2
test/e2e_node/jenkins/cri_validation/jenkins-pull.properties
View File

@ -1,6 +1,6 @@
GCI_CLOUD_INIT=test/e2e_node/jenkins/gci-init.yaml GCI_CLOUD_INIT=test/e2e_node/jenkins/gci-init.yaml
GCE_HOSTS= GCE_HOSTS=
GCE_IMAGES=gci-dev-55-8820-0-0 GCE_IMAGES=gci-dev-55-8872-18-0
GCE_IMAGE_PROJECT=google-containers GCE_IMAGE_PROJECT=google-containers
GCE_ZONE=us-central1-f GCE_ZONE=us-central1-f
GCE_PROJECT=k8s-jkns-pr-node-e2e GCE_PROJECT=k8s-jkns-pr-node-e2e

2
test/e2e_node/jenkins/cri_validation/jenkins-serial.properties
View File

@ -1,6 +1,6 @@
GCI_CLOUD_INIT=test/e2e_node/jenkins/gci-init.yaml GCI_CLOUD_INIT=test/e2e_node/jenkins/gci-init.yaml
GCE_HOSTS= GCE_HOSTS=
GCE_IMAGES=gci-dev-55-8820-0-0 GCE_IMAGES=gci-dev-55-8872-18-0
GCE_IMAGE_PROJECT=google-containers GCE_IMAGE_PROJECT=google-containers
GCE_ZONE=us-central1-f GCE_ZONE=us-central1-f
GCE_PROJECT=k8s-jkns-ci-node-e2e GCE_PROJECT=k8s-jkns-ci-node-e2e

2
test/e2e_node/jenkins/cri_validation/jenkins-validation.properties
View File

@ -1,6 +1,6 @@
GCI_CLOUD_INIT=test/e2e_node/jenkins/gci-init.yaml GCI_CLOUD_INIT=test/e2e_node/jenkins/gci-init.yaml
GCE_HOSTS= GCE_HOSTS=
GCE_IMAGES=gci-dev-55-8820-0-0 GCE_IMAGES=gci-dev-55-8872-18-0
GCE_IMAGE_PROJECT=google-containers GCE_IMAGE_PROJECT=google-containers
GCE_ZONE=us-central1-f GCE_ZONE=us-central1-f
GCE_PROJECT=k8s-jkns-ci-node-e2e GCE_PROJECT=k8s-jkns-ci-node-e2e

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

@ -16,6 +16,6 @@ images:
image: e2e-node-containervm-v20160604-image image: e2e-node-containervm-v20160604-image
project: kubernetes-node-e2e-images project: kubernetes-node-e2e-images
gci-family: gci-family:
image_regex: gci-dev-55-8866-0-0 image_regex: gci-dev-55-8872-18-0
project: google-containers project: google-containers
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml" metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"