Skip to content

Commit

Permalink
Downgrade jobs with blocking presubmit coverage to non-blocking
Browse files Browse the repository at this point in the history
  • Loading branch information
fejta committed Apr 24, 2017
1 parent bf99d80 commit 6605c98
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 27 deletions.
20 changes: 10 additions & 10 deletions mungegithub/submit-queue/deployment/kubernetes/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@ data:
submit-queue.nonblocking-jenkins-jobs: "\
ci-kubernetes-bazel-build,\
ci-kubernetes-bazel-test,\
ci-kubernetes-build,\
ci-kubernetes-cross-build,\
ci-kubernetes-e2e-garbage-gci,\
ci-kubernetes-e2e-gce-etcd3,\
ci-kubernetes-e2e-gce-examples,\
ci-kubernetes-e2e-gce-federation,\
ci-kubernetes-e2e-gce-multizone,\
Expand All @@ -46,14 +48,14 @@ data:
ci-kubernetes-e2e-gci-gce-autoscaling,\
ci-kubernetes-e2e-gci-gce-autoscaling-migs,\
ci-kubernetes-e2e-gci-gce-es-logging,\
ci-kubernetes-e2e-gci-gce-sd-logging,\
ci-kubernetes-e2e-gci-gce-etcd3,\
ci-kubernetes-e2e-gci-gce-examples,\
ci-kubernetes-e2e-gci-gce-ingress,\
ci-kubernetes-e2e-gci-gce-kubenet,\
ci-kubernetes-e2e-gci-gce-proto,\
ci-kubernetes-e2e-gci-gce-reboot,\
ci-kubernetes-e2e-gci-gce-scalability,\
ci-kubernetes-e2e-gci-gce-sd-logging,\
ci-kubernetes-e2e-gci-gce-serial,\
ci-kubernetes-e2e-gci-gce-slow,\
ci-kubernetes-e2e-gci-gce-statefulset,\
Expand All @@ -79,30 +81,28 @@ data:
ci-kubernetes-e2e-gke-staging,\
ci-kubernetes-e2e-gke-staging-parallel,\
ci-kubernetes-e2e-gke-test,\
ci-kubernetes-e2e-kops-aws,\
ci-kubernetes-e2e-kops-aws-release-1.5,\
ci-kubernetes-e2e-kops-aws-release-1.6,\
ci-kubernetes-e2e-kops-aws-serial,\
ci-kubernetes-e2e-kops-aws-slow,\
ci-kubernetes-e2e-kops-aws-updown,\
ci-kubernetes-kubemark-5-gce,\
ci-kubernetes-kubemark-500-gce,\
ci-kubernetes-node-kubelet,\
ci-kubernetes-node-kubelet-serial,\
ci-kubernetes-soak-gce-deploy,\
ci-kubernetes-verify-master,\
ci-kubernetes-soak-gce-test,\
ci-kubernetes-soak-gke-deploy,\
ci-kubernetes-soak-gke-gci-deploy,\
ci-kubernetes-soak-gke-gci-test,\
ci-kubernetes-soak-gke-test"
ci-kubernetes-soak-gke-test,\
ci-kubernetes-test-go"
# SQ-Blocking Jobs
# Please also update sq-blocking dashboard in testgrid config for test-infra presubmit to pass (@krzyzacy)
# https://github.com/kubernetes/test-infra/blob/master/testgrid/config/config.yaml
submit-queue.jenkins-jobs: "\
ci-kubernetes-build,\
ci-kubernetes-e2e-gce-etcd3,\
ci-kubernetes-e2e-kops-aws,\
ci-kubernetes-kubemark-500-gce,\
ci-kubernetes-node-kubelet,\
ci-kubernetes-test-go,\
ci-kubernetes-verify-master"
submit-queue.jenkins-jobs: "\"\""
submit-queue.presubmit-jobs: "\
kubernetes-pull-build-test-e2e-gce,\
kubernetes-pull-build-test-e2e-gke,\
Expand Down
17 changes: 0 additions & 17 deletions testgrid/config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2048,23 +2048,6 @@ dashboards:
code_search_url_template:
url: https://github.com/kubernetes/test-infra/compare/<start-custom-0>...<end-custom-0>

- name: sq-blocking
dashboard_tab:
- name: build
test_group_name: ci-kubernetes-build
- name: gce-etcd3
test_group_name: ci-kubernetes-e2e-gce-etcd3
- name: kops-aws
test_group_name: ci-kubernetes-e2e-kops-aws
- name: kubemark-500-gce
test_group_name: ci-kubernetes-kubemark-500-gce
- name: node-kubelet
test_group_name: ci-kubernetes-node-kubelet
- name: test-go
test_group_name: ci-kubernetes-test-go
- name: verify
test_group_name: ci-kubernetes-verify-master

- name: google-non-cri
dashboard_tab:
- name: gce
Expand Down
3 changes: 3 additions & 0 deletions testgrid/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,9 @@ func TestConfig(t *testing.T) {

sqJobs := strings.Split(sqData.Data["submit-queue.jenkins-jobs"], ",")
for _, sqJob := range sqJobs {
if sqJob == "\"\"" { // ignore empty list of jobs
continue
}
found := false
for i, job := range sqJobPool {
if sqJob == job {
Expand Down

0 comments on commit 6605c98

Please sign in to comment.