Skip to content

K
k3s
Commit a38c6139 authored by Michael Taufen's avatar Michael Taufen
Browse files
Options

Bump GCI version to gci-dev-56-8977-0-0

parent 0f774de8
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
cluster/gce/config-default.sh
View file @ a38c6139
...@@ -44,7 +44,7 @@ NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}} ...@@ -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-vm-v20161025 CVM_VERSION=container-vm-v20161025
GCI_VERSION="gci-dev-56-8938-0-0" GCI_VERSION="gci-dev-56-8977-0-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}}
......
cluster/gce/config-test.sh
View file @ a38c6139
...@@ -45,7 +45,7 @@ NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-gci}} ...@@ -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-vm-v20161025 CVM_VERSION=container-vm-v20161025
GCI_VERSION="gci-dev-56-8938-0-0" GCI_VERSION="gci-dev-56-8977-0-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}}
......
test/e2e_node/jenkins/benchmark/benchmark-config.yaml
View file @ a38c6139
...@@ -49,21 +49,21 @@ images: ...@@ -49,21 +49,21 @@ images:
tests: tests:
- 'resource tracking for 105 pods per node \[Benchmark\]' - 'resource tracking for 105 pods per node \[Benchmark\]'
gci-resource1: gci-resource1:
image: gci-dev-55-8872-18-0 image: gci-dev-56-8977-0-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\]'
gci-resource2: gci-resource2:
image: gci-dev-55-8872-18-0 image: gci-dev-56-8977-0-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\]'
gci-resource3: gci-resource3:
image: gci-dev-55-8872-18-0 image: gci-dev-56-8977-0-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"
......
test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
View file @ a38c6139
--- ---
images: images:
gci-density1: gci-density1:
image: gci-dev-55-8872-18-0 image: gci-dev-56-8977-0-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\]'
gci-density2: gci-density2:
image: gci-dev-55-8872-18-0 image: gci-dev-56-8977-0-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\]'
gci-density2-qps60: gci-density2-qps60:
image: gci-dev-55-8872-18-0 image: gci-dev-56-8977-0-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\]'
gci-density3: gci-density3:
image: gci-dev-55-8872-18-0 image: gci-dev-56-8977-0-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\]'
gci-density4: gci-density4:
image: gci-dev-55-8872-18-0 image: gci-dev-56-8977-0-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\]'
gci-resource1: gci-resource1:
image: gci-dev-55-8872-18-0 image: gci-dev-56-8977-0-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\]'
gci-resource2: gci-resource2:
image: gci-dev-55-8872-18-0 image: gci-dev-56-8977-0-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\]'
gci-resource3: gci-resource3:
image: gci-dev-55-8872-18-0 image: gci-dev-56-8977-0-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"
......
test/e2e_node/jenkins/image-config.yaml
View file @ a38c6139
...@@ -16,6 +16,6 @@ images: ...@@ -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-8872-18-0 image_regex: gci-dev-56-8977-0-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"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment