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.

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

Revert "Revert "Add boskos pool for scalability jobs. Move scalabilit… #9567

Merged
merged 1 commit into from
Sep 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion boskos/janitor/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ spec:
args:
- --boskos-url=http://boskos.test-pods.svc.cluster.local.
- --service-account=/etc/service-account/service-account.json
- --resource-type=gce-project,gpu-project,ingress-project,istio-project
- --resource-type=gce-project,gpu-project,ingress-project,istio-project,scalability-project
- --pool-size=20
volumeMounts:
- mountPath: /etc/service-account
Expand Down
2 changes: 1 addition & 1 deletion boskos/metrics/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
- name: metrics
image: gcr.io/k8s-testimages/metrics:v20180604-ea866c2e8
args:
- --resource-type=gce-project,gke-project,gpu-project,ingress-project,istio-project
- --resource-type=gce-project,gke-project,gpu-project,ingress-project,istio-project,scalability-project
ports:
- containerPort: 8080
protocol: TCP
2 changes: 1 addition & 1 deletion boskos/reaper/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ spec:
image: gcr.io/k8s-testimages/reaper:v20180402-43203f868
args:
- --boskos-url=http://boskos.test-pods.svc.cluster.local.
- --resource-type=gce-project,gke-project,gpu-project,ingress-project,istio-project
- --resource-type=gce-project,gke-project,gpu-project,ingress-project,istio-project,scalability-project
11 changes: 11 additions & 0 deletions boskos/resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -510,3 +510,14 @@ resources:
- istio-gke-addon-prow-e2e-test
state: dirty
type: istio-project
- names:
- k8s-e2e-gce-scalability-1-1
- k8s-e2e-gce-scalability-1-2
- k8s-e2e-gci-gce-scale-1-4
- k8s-e2e-gci-gce-scale-1-5
- k8s-jenkins-gci-scalability
- k8s-jenkins-gci-scalability-2
- k8s-jenkins-kubemark
- k8s-jenkins-scalability-2
state: dirty
type: scalability-project
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ periodics:
- --extract=ci/latest
- --gcp-node-image=gci
- --gcp-nodes=100
- --gcp-project=k8s-jenkins-gci-scalability
- --gcp-zone=us-central1-f
- --gcp-project-type=scalability-project
- --gcp-zone=us-east1-b
- --provider=gce
- --test_args=--ginkgo.focus=\[Feature:Performance\] --gather-resource-usage=true --gather-metrics-at-teardown=true --minStartupPods=8
- --timeout=120m
Expand Down Expand Up @@ -51,7 +51,7 @@ periodics:
- --extract=ci/k8s-beta
- --gcp-node-image=gci
- --gcp-nodes=100
- --gcp-project=k8s-e2e-gce-scalability-1-1
- --gcp-project-type=scalability-project
- --gcp-zone=us-east1-b
- --provider=gce
- --test_args=--ginkgo.focus=\[Feature:Performance\] --gather-resource-usage=true --gather-metrics-at-teardown=true --minStartupPods=8
Expand Down Expand Up @@ -81,7 +81,7 @@ periodics:
- --extract=ci/k8s-stable1
- --gcp-node-image=gci
- --gcp-nodes=100
- --gcp-project=k8s-e2e-gci-gce-scale-1-4
- --gcp-project-type=scalability-project
- --gcp-zone=us-east1-b
- --provider=gce
- --test_args=--ginkgo.focus=\[Feature:Performance\] --gather-resource-usage=true --gather-metrics-at-teardown=true --minStartupPods=8
Expand Down Expand Up @@ -111,7 +111,7 @@ periodics:
- --extract=ci/k8s-stable2
- --gcp-node-image=gci
- --gcp-nodes=100
- --gcp-project=k8s-e2e-gci-gce-scale-1-4
- --gcp-project-type=scalability-project
- --gcp-zone=us-east1-b
- --provider=gce
- --test_args=--ginkgo.focus=\[Feature:Performance\] --gather-resource-usage=true --gather-metrics-at-teardown=true --minStartupPods=8
Expand Down Expand Up @@ -391,8 +391,8 @@ periodics:
- --gcp-node-image=gci
- --gcp-node-size=n1-standard-4
- --gcp-nodes=3
- --gcp-project=k8s-jenkins-kubemark
- --gcp-zone=us-central1-f
- --gcp-project-type=scalability-project
- --gcp-zone=us-east1-b
- --kubemark
- --kubemark-nodes=100
- --provider=gce
Expand Down Expand Up @@ -422,8 +422,8 @@ periodics:
- --extract=ci/latest-1.9
- --gcp-node-size=n1-standard-2
- --gcp-nodes=1
- --gcp-project=k8s-jenkins-kubemark
- --gcp-zone=us-central1-f
- --gcp-project-type=scalability-project
- --gcp-zone=us-east1-b
- --kubemark
- --kubemark-nodes=5
- --provider=gce
Expand Down
4 changes: 2 additions & 2 deletions config/jobs/kubernetes/sig-testing/kubetest-canaries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ periodics:
- --env-file=jobs/env/ci-kubernetes-e2e-gci-gce-scalability.env
- --extract=ci/latest
- --gcp-nodes=100
- --gcp-project=google.com:k8s-jenkins-scalability
- --gcp-zone=us-central1-f
- --gcp-project-type=scalability-project
- --gcp-zone=us-east1-b
- --provider=gce
- --test_args=--ginkgo.focus=\[Feature:Performance\] --gather-resource-usage=true --gather-metrics-at-teardown=true --gather-logs-sizes=true --minStartupPods=8
- --timeout=120m
Expand Down