github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

pull/6/head
Michael Taufen 2016-11-11 15:31:49 -08:00
parent 0f774de8ff
commit a38c61395e
5 changed files with 15 additions and 15 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:
# https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml
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_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
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:
# https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml
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_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}

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

@ -5,7 +5,7 @@ images:
project: kubernetes-node-e2e-images
machine: n1-standard-1
tests:
- 'create 35 pods with 0s? interval \[Benchmark\]'
- 'create 35 pods with 0s? interval \[Benchmark\]'
containervm-density2:
image: e2e-node-containervm-v20160604-image
project: kubernetes-node-e2e-images
@ -49,21 +49,21 @@ images:
tests:
- 'resource tracking for 105 pods per node \[Benchmark\]'
gci-resource1:
image: gci-dev-55-8872-18-0
image: gci-dev-56-8977-0-0
project: google-containers
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
tests:
- 'resource tracking for 0 pods per node \[Benchmark\]'
gci-resource2:
image: gci-dev-55-8872-18-0
image: gci-dev-56-8977-0-0
project: google-containers
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
tests:
- 'resource tracking for 35 pods per node \[Benchmark\]'
gci-resource3:
image: gci-dev-55-8872-18-0
image: gci-dev-56-8977-0-0
project: google-containers
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"

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

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

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

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