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

Migrate release-blocking ingress jobs to k8s-infra-prow-build #18734

Merged
merged 2 commits into from
Aug 7, 2020
Merged

Migrate release-blocking ingress jobs to k8s-infra-prow-build #18734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54f1ced
Migrate release-blocking ingress jobs to k8s-infra-prow-build
spiffxp Aug 7, 2020
eaa75cf
Raise static resource limits in jobs test
spiffxp Aug 7, 2020
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
8 changes: 4 additions & 4 deletions config/jobs/kubernetes/generated/generated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1642,7 +1642,6 @@ periodics:
- --gcp-zone=us-west1-b
- --gcp-node-image=gci
- --extract=ci/latest-1.19
- --gcp-project-type=ingress-project
- --timeout=150m
- --test_args=--ginkgo.focus=\[Feature:Ingress\] --minStartupPods=8
env:
Expand All @@ -1654,6 +1653,7 @@ periodics:
limits:
cpu: 1000m
memory: 3Gi
cluster: k8s-infra-prow-build
annotations:
testgrid-tab-name: gce-cos-k8sbeta-ingress
testgrid-dashboards: sig-release-1.19-blocking
Expand Down Expand Up @@ -1866,7 +1866,6 @@ periodics:
- --gcp-zone=us-west1-b
- --gcp-node-image=gci
- --extract=ci/latest-1.18
- --gcp-project-type=ingress-project
- --timeout=150m
- --test_args=--ginkgo.focus=\[Feature:Ingress\] --minStartupPods=8
env:
Expand All @@ -1878,6 +1877,7 @@ periodics:
limits:
cpu: 1000m
memory: 3Gi
cluster: k8s-infra-prow-build
annotations:
testgrid-tab-name: gce-cos-k8sstable1-ingress
testgrid-dashboards: sig-release-1.18-blocking
Expand Down Expand Up @@ -2090,7 +2090,6 @@ periodics:
- --gcp-zone=us-west1-b
- --gcp-node-image=gci
- --extract=ci/latest-1.17
- --gcp-project-type=ingress-project
- --timeout=150m
- --test_args=--ginkgo.focus=\[Feature:Ingress\] --minStartupPods=8
env:
Expand All @@ -2102,6 +2101,7 @@ periodics:
limits:
cpu: 1000m
memory: 3Gi
cluster: k8s-infra-prow-build
annotations:
testgrid-tab-name: gce-cos-k8sstable2-ingress
testgrid-dashboards: sig-release-1.17-blocking
Expand Down Expand Up @@ -2278,7 +2278,6 @@ periodics:
- --gcp-zone=us-west1-b
- --gcp-node-image=gci
- --extract=ci/latest-1.16
- --gcp-project-type=ingress-project
- --timeout=150m
- --test_args=--ginkgo.focus=\[Feature:Ingress\] --minStartupPods=8
env:
Expand All @@ -2290,6 +2289,7 @@ periodics:
limits:
cpu: 1000m
memory: 3Gi
cluster: k8s-infra-prow-build
annotations:
testgrid-tab-name: gce-cos-k8sstable3-ingress
testgrid-dashboards: sig-release-1.16-blocking
Expand Down
3 changes: 1 addition & 2 deletions config/jobs/kubernetes/sig-network/sig-network-misc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ periodics:

- interval: 30m
name: ci-kubernetes-e2e-gci-gce-ingress
cluster: k8s-infra-prow-build
labels:
preset-service-account: "true"
preset-k8s-ssh: "true"
Expand All @@ -263,7 +264,6 @@ periodics:
- --env=KUBE_GCE_ENABLE_IP_ALIASES=true
- --extract=ci/latest-fast
- --gcp-node-image=gci
- --gcp-project-type=ingress-project
- --gcp-zone=asia-southeast1-a
- --provider=gce
- --test_args=--ginkgo.focus=\[Feature:Ingress\]|\[Feature:NEG\]
Expand Down Expand Up @@ -300,7 +300,6 @@ periodics:
- --env=KUBE_GCE_ENABLE_IP_ALIASES=true
- --extract=ci/latest-fast
- --gcp-node-image=gci
- --gcp-project=k8s-infra-e2e-ingress-project
- --gcp-zone=asia-southeast1-a
- --provider=gce
- --test_args=--ginkgo.focus=\[Feature:Ingress\]|\[Feature:NEG\]
Expand Down
4 changes: 2 additions & 2 deletions config/tests/jobs/jobs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1108,8 +1108,8 @@ func TestK8sInfraProwBuildJobsMustHavePodQOSGuaranteed(t *testing.T) {
func TestK8sInfraProwBuildJobsMustNotExceedTotalCapacity(t *testing.T) {
// k8s-infra-prow-build pool1 is 3-zonal 6-30 n1-highmem-8's
maxLimit := coreapi.ResourceList{
coreapi.ResourceCPU: resource.MustParse("288000m"), // 3 * 12 * 8 CPUs per n1-highmem-8
coreapi.ResourceMemory: resource.MustParse("1872Gi"), // 3 * 12 * 52 Gi per n1-highmem-8
coreapi.ResourceCPU: resource.MustParse("432"), // 3 * 18 * 8 CPUs per n1-highmem-8
coreapi.ResourceMemory: resource.MustParse("2808Gi"), // 3 * 18 * 52 Gi per n1-highmem-8
}
resourceNames := []coreapi.ResourceName{
coreapi.ResourceCPU,
Expand Down
2 changes: 1 addition & 1 deletion releng/test_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,9 +566,9 @@ testSuites:
cluster: k8s-infra-prow-build
ingress:
args:
- --gcp-project-type=ingress-project
- --timeout=150m
- --test_args=--ginkgo.focus=\[Feature:Ingress\] --minStartupPods=8
cluster: k8s-infra-prow-build
reboot:
args:
- --timeout=180m
Expand Down