Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump GCI to gci-stable-56-9000-84-2 on release-1.5 #41828

Merged
merged 1 commit into from Feb 23, 2017
Merged

Bump GCI to gci-stable-56-9000-84-2 on release-1.5 #41828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cluster/gce/config-default.sh
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@ NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-debian
# 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=${CVM_VERSION:-container-vm-v20170214}
GCI_VERSION=${KUBE_GCI_VERSION:-gci-dev-56-8977-0-0}
GCI_VERSION=${KUBE_GCI_VERSION:-gci-stable-56-9000-84-2}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}
Expand Down
2 changes: 1 addition & 1 deletion cluster/gce/config-test.sh
View file
Open in desktop
Expand Up @@ -45,7 +45,7 @@ NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-${KUBE_OS_DISTRIBUTION:-debian
# 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=${CVM_VERSION:-container-vm-v20170214}
GCI_VERSION=${KUBE_GCI_VERSION:-gci-dev-56-8977-0-0}
GCI_VERSION=${KUBE_GCI_VERSION:-gci-stable-56-9000-84-2}
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}
Expand Down
6 changes: 3 additions & 3 deletions test/e2e_node/jenkins/benchmark/benchmark-config.yaml
View file
Open in desktop
Expand Up @@ -49,21 +49,21 @@ images:
tests:
- 'resource tracking for 105 pods per node \[Benchmark\]'
gci-resource1:
image: gci-dev-56-8977-0-0
image: gci-stable-56-9000-84-2
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-56-8977-0-0
image: gci-stable-56-9000-84-2
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-56-8977-0-0
image: gci-stable-56-9000-84-2
project: google-containers
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
Expand Down
16 changes: 8 additions & 8 deletions test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
View file
Open in desktop
@@ -1,56 +1,56 @@
---
images:
gci-density1:
image: gci-dev-56-8977-0-0
image: gci-stable-56-9000-84-2
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-56-8977-0-0
image: gci-stable-56-9000-84-2
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-56-8977-0-0
image: gci-stable-56-9000-84-2
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-56-8977-0-0
image: gci-stable-56-9000-84-2
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-56-8977-0-0
image: gci-stable-56-9000-84-2
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-56-8977-0-0
image: gci-stable-56-9000-84-2
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-56-8977-0-0
image: gci-stable-56-9000-84-2
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-56-8977-0-0
image: gci-stable-56-9000-84-2
project: google-containers
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e_node/jenkins/cri_validation/image-config.yaml
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ images:
image: e2e-node-containervm-v20160604-image
project: kubernetes-node-e2e-images
gci-family:
image_regex: gci-dev-56-8977-0-0
image_regex: gci-stable-56-9000-84-2
project: google-containers
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"
ubuntu-docker12:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e_node/jenkins/image-config.yaml
View file
Open in desktop
Expand Up @@ -16,6 +16,6 @@ images:
image: e2e-node-containervm-v20160604-image
project: kubernetes-node-e2e-images
gci-family:
image_regex: gci-dev-56-8977-0-0
image_regex: gci-stable-56-9000-84-2
project: google-containers
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml"