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 COS image to latest version #17770

Merged
merged 1 commit into from
Jun 1, 2020
Merged

Bump COS image to latest version #17770

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions jobs/e2e_node/benchmark-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
---
images:
cosstable2-resource1:
image: cos-77-12371-251-0
image: cos-77-12371-274-0
project: cos-cloud
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests:
- 'resource tracking for 0 pods per node \[Benchmark\]'
cosstable2-resource2:
image: cos-77-12371-251-0
image: cos-77-12371-274-0
project: cos-cloud
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests:
- 'resource tracking for 35 pods per node \[Benchmark\]'
cosstable2-resource3:
image: cos-77-12371-251-0
image: cos-77-12371-274-0
project: cos-cloud
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests:
- 'resource tracking for 105 pods per node \[Benchmark\]'

cosstable2-density1:
image: cos-77-12371-251-0
image: cos-77-12371-274-0
project: cos-cloud
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests:
- 'create 35 pods with 0s? interval \[Benchmark\]'
cosstable2-density2:
image: cos-77-12371-251-0
image: cos-77-12371-274-0
project: cos-cloud
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests:
- 'create 105 pods with 0s? interval \[Benchmark\]'
cosstable2-density2-qps60:
image: cos-77-12371-251-0
image: cos-77-12371-274-0
project: cos-cloud
machine: n1-standard-1
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests:
- 'create 105 pods with 0s? interval \(QPS 60\) \[Benchmark\]'
cosstable2-density3:
image: cos-77-12371-251-0
image: cos-77-12371-274-0
project: cos-cloud
machine: n1-standard-2
metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
tests:
- 'create 105 pods with 0s? interval \[Benchmark\]'
cosstable2-density4:
image: cos-77-12371-251-0
image: cos-77-12371-274-0
project: cos-cloud
machine: n1-standard-1
tests:
Expand Down
2 changes: 1 addition & 1 deletion jobs/e2e_node/containerd/containerd-master/image-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ images:
project: ubuntu-os-gke-cloud
metadata: "user-data</go/src/github.com/containerd/cri/test/e2e_node/init.yaml,containerd-configure-sh</go/src/github.com/containerd/cri/cluster/gce/configure.sh,containerd-env</workspace/test-infra/jobs/e2e_node/containerd/containerd-master/env"
cos-stable:
image_regex: cos-stable-73-11647-510-0
image: cos-77-12371-274-0
project: cos-cloud
metadata: "user-data</go/src/github.com/containerd/cri/test/e2e_node/init.yaml,containerd-configure-sh</go/src/github.com/containerd/cri/cluster/gce/configure.sh,containerd-extra-init-sh</go/src/github.com/containerd/cri/test/e2e_node/gci-init.sh,containerd-env</workspace/test-infra/jobs/e2e_node/containerd/containerd-master/env,gci-update-strategy=update_disabled"
2 changes: 1 addition & 1 deletion jobs/e2e_node/containerd/containerd-release-1.2/image-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ images:
project: ubuntu-os-gke-cloud
metadata: "user-data</go/src/github.com/containerd/cri/test/e2e_node/init.yaml,containerd-configure-sh</go/src/github.com/containerd/cri/cluster/gce/configure.sh,containerd-env</workspace/test-infra/jobs/e2e_node/containerd/containerd-release-1.2/env"
cos-stable:
image_regex: cos-stable-73-11647-510-0
image: cos-77-12371-274-0
project: cos-cloud
metadata: "user-data</go/src/github.com/containerd/cri/test/e2e_node/init.yaml,containerd-configure-sh</go/src/github.com/containerd/cri/cluster/gce/configure.sh,containerd-extra-init-sh</go/src/github.com/containerd/cri/test/e2e_node/gci-init.sh,containerd-env</workspace/test-infra/jobs/e2e_node/containerd/containerd-release-1.2/env,gci-update-strategy=update_disabled"
2 changes: 1 addition & 1 deletion jobs/e2e_node/containerd/containerd-release-1.3/image-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ images:
project: ubuntu-os-gke-cloud
metadata: "user-data</go/src/github.com/containerd/cri/test/e2e_node/init.yaml,containerd-configure-sh</go/src/github.com/containerd/cri/cluster/gce/configure.sh,containerd-env</workspace/test-infra/jobs/e2e_node/containerd/containerd-release-1.3/env"
cos-stable:
image_regex: cos-stable-73-11647-510-0
image: cos-77-12371-274-0
project: cos-cloud
metadata: "user-data</go/src/github.com/containerd/cri/test/e2e_node/init.yaml,containerd-configure-sh</go/src/github.com/containerd/cri/cluster/gce/configure.sh,containerd-extra-init-sh</go/src/github.com/containerd/cri/test/e2e_node/gci-init.sh,containerd-env</workspace/test-infra/jobs/e2e_node/containerd/containerd-release-1.3/env,gci-update-strategy=update_disabled"
16 changes: 8 additions & 8 deletions jobs/e2e_node/containerd/cri-master/benchmark-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
---
images:
cosstable2-resource1:
image: cos-77-12371-251-0
image: cos-77-12371-274-0
project: cos-cloud
machine: n1-standard-1
metadata: "user-data</go/src/github.com/containerd/cri/test/e2e_node/init.yaml,containerd-configure-sh</go/src/github.com/containerd/cri/cluster/gce/configure.sh,containerd-extra-init-sh</go/src/github.com/containerd/cri/test/e2e_node/gci-init.sh,containerd-env</workspace/test-infra/jobs/e2e_node/containerd/cri-master/env,gci-update-strategy=update_disabled"
tests:
- 'resource tracking for 0 pods per node \[Benchmark\]'
cosstable2-resource2:
image: cos-77-12371-251-0
image: cos-77-12371-274-0
project: cos-cloud
machine: n1-standard-1
metadata: "user-data</go/src/github.com/containerd/cri/test/e2e_node/init.yaml,containerd-configure-sh</go/src/github.com/containerd/cri/cluster/gce/configure.sh,containerd-extra-init-sh</go/src/github.com/containerd/cri/test/e2e_node/gci-init.sh,containerd-env</workspace/test-infra/jobs/e2e_node/containerd/cri-master/env,gci-update-strategy=update_disabled"
tests:
- 'resource tracking for 35 pods per node \[Benchmark\]'
cosstable2-resource3:
image: cos-77-12371-251-0
image: cos-77-12371-274-0
project: cos-cloud
machine: n1-standard-1
metadata: "user-data</go/src/github.com/containerd/cri/test/e2e_node/init.yaml,containerd-configure-sh</go/src/github.com/containerd/cri/cluster/gce/configure.sh,containerd-extra-init-sh</go/src/github.com/containerd/cri/test/e2e_node/gci-init.sh,containerd-env</workspace/test-infra/jobs/e2e_node/containerd/cri-master/env,gci-update-strategy=update_disabled"
tests:
- 'resource tracking for 105 pods per node \[Benchmark\]'

cosstable2-density1:
image: cos-77-12371-251-0
image: cos-77-12371-274-0
project: cos-cloud
machine: n1-standard-1
metadata: "user-data</go/src/github.com/containerd/cri/test/e2e_node/init.yaml,containerd-configure-sh</go/src/github.com/containerd/cri/cluster/gce/configure.sh,containerd-extra-init-sh</go/src/github.com/containerd/cri/test/e2e_node/gci-init.sh,containerd-env</workspace/test-infra/jobs/e2e_node/containerd/cri-master/env,gci-update-strategy=update_disabled"
tests:
- 'create 35 pods with 0s? interval \[Benchmark\]'
cosstable2-density2:
image: cos-77-12371-251-0
image: cos-77-12371-274-0
project: cos-cloud
machine: n1-standard-1
metadata: "user-data</go/src/github.com/containerd/cri/test/e2e_node/init.yaml,containerd-configure-sh</go/src/github.com/containerd/cri/cluster/gce/configure.sh,containerd-extra-init-sh</go/src/github.com/containerd/cri/test/e2e_node/gci-init.sh,containerd-env</workspace/test-infra/jobs/e2e_node/containerd/cri-master/env,gci-update-strategy=update_disabled"
tests:
- 'create 105 pods with 0s? interval \[Benchmark\]'
cosstable2-density2-qps60:
image: cos-77-12371-251-0
image: cos-77-12371-274-0
project: cos-cloud
machine: n1-standard-1
metadata: "user-data</go/src/github.com/containerd/cri/test/e2e_node/init.yaml,containerd-configure-sh</go/src/github.com/containerd/cri/cluster/gce/configure.sh,containerd-extra-init-sh</go/src/github.com/containerd/cri/test/e2e_node/gci-init.sh,containerd-env</workspace/test-infra/jobs/e2e_node/containerd/cri-master/env,gci-update-strategy=update_disabled"
tests:
- 'create 105 pods with 0s? interval \(QPS 60\) \[Benchmark\]'
cosstable2-density3:
image: cos-77-12371-251-0
image: cos-77-12371-274-0
project: cos-cloud
machine: n1-standard-2
metadata: "user-data</go/src/github.com/containerd/cri/test/e2e_node/init.yaml,containerd-configure-sh</go/src/github.com/containerd/cri/cluster/gce/configure.sh,containerd-extra-init-sh</go/src/github.com/containerd/cri/test/e2e_node/gci-init.sh,containerd-env</workspace/test-infra/jobs/e2e_node/containerd/cri-master/env,gci-update-strategy=update_disabled"
tests:
- 'create 105 pods with 0s? interval \[Benchmark\]'
cosstable2-density4:
image: cos-77-12371-251-0
image: cos-77-12371-274-0
project: cos-cloud
machine: n1-standard-1
metadata: "user-data</go/src/github.com/containerd/cri/test/e2e_node/init.yaml,containerd-configure-sh</go/src/github.com/containerd/cri/cluster/gce/configure.sh,containerd-extra-init-sh</go/src/github.com/containerd/cri/test/e2e_node/gci-init.sh,containerd-env</workspace/test-infra/jobs/e2e_node/containerd/cri-master/env,gci-update-strategy=update_disabled"
Expand Down
2 changes: 1 addition & 1 deletion jobs/e2e_node/containerd/cri-master/image-config-pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ images:
project: ubuntu-os-gke-cloud
metadata: "user-data</home/prow/go/src/github.com/containerd/cri/test/e2e_node/init.yaml,containerd-configure-sh</home/prow/go/src/github.com/containerd/cri/cluster/gce/configure.sh,containerd-env</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/cri-master/env"
cos-stable:
image_regex: cos-stable-73-11647-510-0
image: cos-77-12371-274-0
project: cos-cloud
metadata: "user-data</home/prow/go/src/github.com/containerd/cri/test/e2e_node/init.yaml,containerd-configure-sh</home/prow/go/src/github.com/containerd/cri/cluster/gce/configure.sh,containerd-extra-init-sh</home/prow/go/src/github.com/containerd/cri/test/e2e_node/gci-init.sh,containerd-env</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/cri-master/env,gci-update-strategy=update_disabled"
2 changes: 1 addition & 1 deletion jobs/e2e_node/containerd/cri-master/image-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ images:
project: ubuntu-os-gke-cloud
metadata: "user-data</go/src/github.com/containerd/cri/test/e2e_node/init.yaml,containerd-configure-sh</go/src/github.com/containerd/cri/cluster/gce/configure.sh,containerd-env</workspace/test-infra/jobs/e2e_node/containerd/cri-master/env"
cos-stable:
image_regex: cos-stable-73-11647-510-0
image:cos-77-12371-274-0
project: cos-cloud
metadata: "user-data</go/src/github.com/containerd/cri/test/e2e_node/init.yaml,containerd-configure-sh</go/src/github.com/containerd/cri/cluster/gce/configure.sh,containerd-extra-init-sh</go/src/github.com/containerd/cri/test/e2e_node/gci-init.sh,containerd-env</workspace/test-infra/jobs/e2e_node/containerd/cri-master/env,gci-update-strategy=update_disabled"
2 changes: 1 addition & 1 deletion jobs/e2e_node/image-config-serial-cpu-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ images:
# Using `n1-standard-4` to enable CPU manager node e2e tests.
machine: n1-standard-4
cos-stable1:
image_regex: cos-stable-73-11647-510-0 # docker v18.09.7, deprecated after 2020-06-19
image: cos-77-12371-274-0 # docker v19.03.1, deprecated after 2020-12-17
project: cos-cloud
metadata: "user-data<test/e2e_node/jenkins/cos-init-live-restore.yaml,gci-update-strategy=update_disabled"
# Using `n1-standard-4` to enable CPU manager node e2e tests.
Expand Down
4 changes: 2 additions & 2 deletions jobs/e2e_node/image-config-serial.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ images:
image: ubuntu-gke-1804-1-16-v20200330 # docker 17.03
project: ubuntu-os-gke-cloud
cos-stable2:
image_regex: cos-stable-73-11647-510-0 # docker v18.09.7, deprecated after 2020-06-19
image: cos-77-12371-274-0 # docker v19.03.1, deprecated after 2020-12-17
project: cos-cloud
metadata: "user-data<test/e2e_node/jenkins/gci-init-gpu.yaml,gci-update-strategy=update_disabled"
resources:
accelerators:
- type: nvidia-tesla-k80
count: 2
cos-stable1:
image_regex: cos-stable-77-12371-227-0 # docker v19.03.1, deprecated after 2020-12-17
image: cos-81-12871-119-0 # docker v19.03.6, deprecated after 2020-12-17
project: cos-cloud
metadata: "user-data<test/e2e_node/jenkins/cos-init-live-restore.yaml,gci-update-strategy=update_disabled"
4 changes: 2 additions & 2 deletions jobs/e2e_node/image-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ images:
image: ubuntu-gke-1804-1-16-v20200330 # docker 17.03
project: ubuntu-os-gke-cloud
cos-stable1:
image_regex: cos-stable-81-12871-103-0 # docker v19.03.6
image: cos-81-12871-119-0 # docker v19.03.6
project: cos-cloud
metadata: "user-data<test/e2e_node/jenkins/cos-init-live-restore.yaml,gci-update-strategy=update_disabled"
cos-stable2:
image_regex: cos-stable-77-12371-227-0 # docker v19.03.1, deprecated after 2020-12-17
image: cos-77-12371-274-0 # docker v19.03.1, deprecated after 2020-12-17
project: cos-cloud
metadata: "user-data<test/e2e_node/jenkins/cos-init-live-restore.yaml,gci-update-strategy=update_disabled"