Skip to content

Commit

Permalink
Merge pull request #7547 from shyamjvs/scalability-presubmits-run-on-…
Browse files Browse the repository at this point in the history
…every-pr

Start running scalability presubmits against all PRs
  • Loading branch information
k8s-ci-robot authored Apr 4, 2018
2 parents d39a423 + b1e9f54 commit b0034b4
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
2 changes: 2 additions & 0 deletions gubernator/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@ jobs:
- pull-kubernetes-bazel-build
- pull-kubernetes-bazel-test
- pull-kubernetes-e2e-gce
- pull-kubernetes-e2e-gce-100-performance
- pull-kubernetes-e2e-gce-device-plugin-gpu
- pull-kubernetes-e2e-kops-aws
- pull-kubernetes-integration
- pull-kubernetes-kubemark-e2e-gce
- pull-kubernetes-kubemark-e2e-gce-big
- pull-kubernetes-node-e2e
- pull-kubernetes-typecheck
- pull-kubernetes-verify
Expand Down
4 changes: 2 additions & 2 deletions jobs/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -12593,7 +12593,7 @@
"--env-file=jobs/platform/gce.env",
"--env-file=jobs/env/ci-kubernetes-e2e-gci-gce-scalability.env",
"--extract=local",
"--gcp-project=kubemark-scalability-testing",
"--gcp-project=k8s-presubmit-scale",
"--gcp-zone=us-east1-b",
"--provider=gce",
"--stage=gs://kubernetes-release-pull/ci/pull-kubernetes-e2e-gce-100-performance",
Expand Down Expand Up @@ -12807,7 +12807,7 @@
"--env-file=jobs/platform/gce.env",
"--env-file=jobs/env/ci-kubernetes-kubemark-500-gce.env",
"--extract=local",
"--gcp-project=kubemark-scalability-testing",
"--gcp-project=k8s-presubmit-scale",
"--gcp-zone=us-east1-b",
"--kubemark",
"--kubemark-nodes=500",
Expand Down
16 changes: 8 additions & 8 deletions prow/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1771,8 +1771,8 @@ presubmits:
agent: kubernetes
context: pull-kubernetes-e2e-gce-100-performance
rerun_command: "/test pull-kubernetes-e2e-gce-100-performance"
trigger: "(?m)^/test pull-kubernetes-e2e-gce-100-performance,?(\\s+|$)"
always_run: false
trigger: "(?m)^/test (all|pull-kubernetes-e2e-gce-100-performance),?(\\s+|$)"
always_run: true
max_concurrency: 12
branches:
- master
Expand Down Expand Up @@ -2428,15 +2428,15 @@ presubmits:

- name: pull-kubernetes-kubemark-e2e-gce-big
agent: kubernetes
always_run: false
always_run: true
max_concurrency: 12
skip_branches:
- release-1.6 # not supported
- release-1.7 # per-release image
- release-1.8 # per-release image
context: pull-kubernetes-kubemark-e2e-gce-big
rerun_command: "/test pull-kubernetes-kubemark-e2e-gce-big"
trigger: "(?m)^/test pull-kubernetes-kubemark-e2e-gce-big,?(\\s+|$)"
trigger: "(?m)^/test (all|pull-kubernetes-kubemark-e2e-gce-big),?(\\s+|$)"
labels:
preset-service-account: true
preset-k8s-ssh: true
Expand Down Expand Up @@ -3919,7 +3919,7 @@ presubmits:
secretName: ssh-security
trigger: (?m)^/test (all|pull-security-kubernetes-e2e-gce),?(\s+|$)
- agent: kubernetes
always_run: false
always_run: true
branches:
- master
cluster: security
Expand Down Expand Up @@ -3959,7 +3959,7 @@ presubmits:
secret:
defaultMode: 256
secretName: ssh-security
trigger: (?m)^/test pull-security-kubernetes-e2e-gce-100-performance,?(\s+|$)
trigger: (?m)^/test (all|pull-security-kubernetes-e2e-gce-100-performance),?(\s+|$)
- agent: kubernetes
always_run: false
branches:
Expand Down Expand Up @@ -4823,7 +4823,7 @@ presubmits:
name: auto-generated-docker-graph-volume-mount
trigger: (?m)^/test( all| pull-security-kubernetes-kubemark-e2e-gce),?(\s+|$)
- agent: kubernetes
always_run: false
always_run: true
cluster: security
context: pull-security-kubernetes-kubemark-e2e-gce-big
labels:
Expand Down Expand Up @@ -4874,7 +4874,7 @@ presubmits:
secretName: ssh-security
- emptyDir: {}
name: auto-generated-docker-graph-volume-mount
trigger: (?m)^/test pull-security-kubernetes-kubemark-e2e-gce-big,?(\s+|$)
trigger: (?m)^/test (all|pull-security-kubernetes-kubemark-e2e-gce-big),?(\s+|$)
- agent: kubernetes
always_run: false
branches:
Expand Down

0 comments on commit b0034b4

Please sign in to comment.