From 8a1c49f7a4d428f06c46e058d140bb61503ea956 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Wed, 18 Sep 2019 10:35:53 +0200 Subject: [PATCH 1/7] kubernetes-csi: dind image bump --- config/jobs/kubernetes-csi/gen-jobs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/jobs/kubernetes-csi/gen-jobs.sh b/config/jobs/kubernetes-csi/gen-jobs.sh index 4fa150a812c6..e5dcd53acd5f 100755 --- a/config/jobs/kubernetes-csi/gen-jobs.sh +++ b/config/jobs/kubernetes-csi/gen-jobs.sh @@ -25,7 +25,7 @@ latest_stable_k8s_version="1.15.0" latest_stable_k8s_minor_version="1.15" # We need this image because it has Docker in Docker and go. -dind_image="gcr.io/k8s-testimages/kubekins-e2e:v20190906-fc85258-master" +dind_image="gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master" # All kubernetes-csi repos which are part of the hostpath driver example. # For these repos we generate the full test matrix. From f3075e4edca560facf5447d15e051d92cc5d12cb Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Mon, 23 Sep 2019 11:05:02 +0200 Subject: [PATCH 2/7] kubernetes-csi: clean up skipped branches Some of these branches have been removed from the repos and those that remain shouldn't be the target of a pull request, so we don't need to list them. --- .../jobs/kubernetes-csi/csi-test/csi-test-config.yaml | 2 +- .../external-attacher/external-attacher-config.yaml | 8 ++++---- .../external-provisioner-config.yaml | 8 ++++---- .../external-snapshotter-config.yaml | 6 +++--- config/jobs/kubernetes-csi/gen-jobs.sh | 10 +++++----- .../livenessprobe/livenessprobe-config.yaml | 6 +++--- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml b/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml index 8b85607fdd09..e9d8fe9115a6 100644 --- a/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml +++ b/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml @@ -6,7 +6,7 @@ presubmits: always_run: true decorate: true skip_report: false - skip_branches: ["^(release-0.3|release-1.0|saad-ali-patch-1|saad-ali-patch-2|v0.1.0|v0.2.0)$"] + skip_branches: ["^(release-0.3|release-1.0|v0.1.0|v0.2.0)$"] labels: preset-service-account: "true" preset-dind-enabled: "true" diff --git a/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml b/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml index 909ba209c1f7..4adbbb11aacc 100644 --- a/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml +++ b/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml @@ -7,7 +7,7 @@ presubmits: optional: false decorate: true skip_report: false - skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|saad-ali-patch-3|v0.1.0)$"] + skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$"] labels: preset-service-account: "true" preset-dind-enabled: "true" @@ -79,7 +79,7 @@ presubmits: optional: false decorate: true skip_report: false - skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|saad-ali-patch-3|v0.1.0)$"] + skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$"] labels: preset-service-account: "true" preset-dind-enabled: "true" @@ -151,7 +151,7 @@ presubmits: optional: true decorate: true skip_report: false - skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|saad-ali-patch-3|v0.1.0)$"] + skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$"] labels: preset-service-account: "true" preset-dind-enabled: "true" @@ -222,7 +222,7 @@ presubmits: always_run: true decorate: true skip_report: false - skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|saad-ali-patch-3|v0.1.0)$"] + skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$"] labels: preset-service-account: "true" preset-dind-enabled: "true" diff --git a/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml b/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml index 2194729fde8e..bc74bcf59fe3 100644 --- a/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml +++ b/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml @@ -7,7 +7,7 @@ presubmits: optional: false decorate: true skip_report: false - skip_branches: ["^(lpabon-patch-1|release-0.2.0|release-0.3.0|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|v0.1.0)$"] + skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$"] labels: preset-service-account: "true" preset-dind-enabled: "true" @@ -79,7 +79,7 @@ presubmits: optional: false decorate: true skip_report: false - skip_branches: ["^(lpabon-patch-1|release-0.2.0|release-0.3.0|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|v0.1.0)$"] + skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$"] labels: preset-service-account: "true" preset-dind-enabled: "true" @@ -151,7 +151,7 @@ presubmits: optional: true decorate: true skip_report: false - skip_branches: ["^(lpabon-patch-1|release-0.2.0|release-0.3.0|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|v0.1.0)$"] + skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$"] labels: preset-service-account: "true" preset-dind-enabled: "true" @@ -222,7 +222,7 @@ presubmits: always_run: true decorate: true skip_report: false - skip_branches: ["^(lpabon-patch-1|release-0.2.0|release-0.3.0|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|v0.1.0)$"] + skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$"] labels: preset-service-account: "true" preset-dind-enabled: "true" diff --git a/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml b/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml index cb8781ca0851..59a228f80b99 100644 --- a/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml +++ b/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml @@ -7,7 +7,7 @@ presubmits: optional: false decorate: true skip_report: false - skip_branches: ["^(errorhandling|k8s_1.12.0-beta.1|release-0.4|release-1.0|revert-72-pvclister|saad-ali-patch-1|saad-ali-patch-2|test-yang|updateSize)$"] + skip_branches: ["^(k8s_1.12.0-beta.1|release-0.4|release-1.0)$"] labels: preset-service-account: "true" preset-dind-enabled: "true" @@ -40,7 +40,7 @@ presubmits: optional: false decorate: true skip_report: false - skip_branches: ["^(errorhandling|k8s_1.12.0-beta.1|release-0.4|release-1.0|revert-72-pvclister|saad-ali-patch-1|saad-ali-patch-2|test-yang|updateSize)$"] + skip_branches: ["^(k8s_1.12.0-beta.1|release-0.4|release-1.0)$"] labels: preset-service-account: "true" preset-dind-enabled: "true" @@ -73,7 +73,7 @@ presubmits: optional: true decorate: true skip_report: false - skip_branches: ["^(errorhandling|k8s_1.12.0-beta.1|release-0.4|release-1.0|revert-72-pvclister|saad-ali-patch-1|saad-ali-patch-2|test-yang|updateSize)$"] + skip_branches: ["^(k8s_1.12.0-beta.1|release-0.4|release-1.0)$"] labels: preset-service-account: "true" preset-dind-enabled: "true" diff --git a/config/jobs/kubernetes-csi/gen-jobs.sh b/config/jobs/kubernetes-csi/gen-jobs.sh index e5dcd53acd5f..ddbe2b3e71db 100755 --- a/config/jobs/kubernetes-csi/gen-jobs.sh +++ b/config/jobs/kubernetes-csi/gen-jobs.sh @@ -69,11 +69,11 @@ csi-proxy # changes each time a new branch gets created. skip_branches_cluster_driver_registrar='^(release-1.0)$' skip_branches_csi_lib_utils='^(release-0.1|release-0.2)$' -skip_branches_csi_test='^(release-0.3|release-1.0|saad-ali-patch-1|saad-ali-patch-2|v0.1.0|v0.2.0)$' -skip_branches_external_attacher='^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|saad-ali-patch-3|v0.1.0)$' -skip_branches_external_provisioner='^(lpabon-patch-1|release-0.2.0|release-0.3.0|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|v0.1.0)$' -skip_branches_external_snapshotter='^(errorhandling|k8s_1.12.0-beta.1|release-0.4|release-1.0|revert-72-pvclister|saad-ali-patch-1|saad-ali-patch-2|test-yang|updateSize)$' -skip_branches_livenessprobe='^(re|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|saad-ali-patch-3|saad-ali-patch-4)$' +skip_branches_csi_test='^(release-0.3|release-1.0|v0.1.0|v0.2.0)$' +skip_branches_external_attacher='^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$' +skip_branches_external_provisioner='^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$' +skip_branches_external_snapshotter='^(k8s_1.12.0-beta.1|release-0.4|release-1.0)$' +skip_branches_livenessprobe='^(release-0.4|release-1.0)$' skip_branches_node_driver_registrar='^(release-1.0)$' skip_branches () { diff --git a/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml b/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml index 7a5b7b624e54..f20a2d1b7065 100644 --- a/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml +++ b/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml @@ -7,7 +7,7 @@ presubmits: optional: false decorate: true skip_report: false - skip_branches: ["^(re|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|saad-ali-patch-3|saad-ali-patch-4)$"] + skip_branches: ["^(release-0.4|release-1.0)$"] labels: preset-service-account: "true" preset-dind-enabled: "true" @@ -40,7 +40,7 @@ presubmits: optional: false decorate: true skip_report: false - skip_branches: ["^(re|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|saad-ali-patch-3|saad-ali-patch-4)$"] + skip_branches: ["^(release-0.4|release-1.0)$"] labels: preset-service-account: "true" preset-dind-enabled: "true" @@ -73,7 +73,7 @@ presubmits: optional: true decorate: true skip_report: false - skip_branches: ["^(re|release-0.4|release-1.0|saad-ali-patch-1|saad-ali-patch-2|saad-ali-patch-3|saad-ali-patch-4)$"] + skip_branches: ["^(release-0.4|release-1.0)$"] labels: preset-service-account: "true" preset-dind-enabled: "true" From 16698a5e53ebfede197312419e9b141b9f92db63 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Mon, 23 Sep 2019 11:17:06 +0200 Subject: [PATCH 3/7] kubernetes-csi: add dashboard annotations for all pull jobs The pull jobs for repos that get tested with multiple Kubernetes versions didn't have dashboard annotations. Those are preferred over explicitly configuring the dashboard. --- .../csi-driver-flex-config.yaml | 1 - .../csi-driver-host-path-config.yaml | 21 +++++++++++++++++++ .../csi-lib-utils/csi-lib-utils-config.yaml | 1 - .../csi-proxy/csi-proxy-config.yaml | 1 - .../csi-release-tools-config.yaml | 1 - .../csi-test/csi-test-config.yaml | 1 - .../external-attacher-config.yaml | 21 +++++++++++++++++++ .../external-provisioner-config.yaml | 21 +++++++++++++++++++ .../external-resizer-config.yaml | 3 --- .../external-snapshotter-config.yaml | 3 --- config/jobs/kubernetes-csi/gen-jobs.sh | 11 ++++++++-- .../livenessprobe/livenessprobe-config.yaml | 3 --- .../node-driver-registrar-config.yaml | 21 +++++++++++++++++++ 13 files changed, 93 insertions(+), 16 deletions(-) diff --git a/config/jobs/kubernetes-csi/csi-driver-flex/csi-driver-flex-config.yaml b/config/jobs/kubernetes-csi/csi-driver-flex/csi-driver-flex-config.yaml index 033c122451c6..228ab364e5ed 100644 --- a/config/jobs/kubernetes-csi/csi-driver-flex/csi-driver-flex-config.yaml +++ b/config/jobs/kubernetes-csi/csi-driver-flex/csi-driver-flex-config.yaml @@ -13,7 +13,6 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - testgrid-tab-name: pull-kubernetes-csi-csi-driver-flex description: Kubernetes-CSI pull job on csi-driver-flex spec: containers: diff --git a/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml b/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml index 16f37fe28300..29eac2b65a83 100644 --- a/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml +++ b/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml @@ -12,6 +12,9 @@ presubmits: preset-service-account: "true" preset-dind-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in csi-driver-host-path, using deployment 1.14 on Kubernetes 1.14.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -51,6 +54,9 @@ presubmits: preset-dind-enabled: "true" preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in csi-driver-host-path, using deployment 1.14 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -84,6 +90,9 @@ presubmits: preset-service-account: "true" preset-dind-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in csi-driver-host-path, using deployment 1.15 on Kubernetes 1.15.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -123,6 +132,9 @@ presubmits: preset-dind-enabled: "true" preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in csi-driver-host-path, using deployment 1.15 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -156,6 +168,9 @@ presubmits: preset-service-account: "true" preset-dind-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull alpha job in csi-driver-host-path, using deployment 1.15 on Kubernetes 1.15.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -195,6 +210,9 @@ presubmits: preset-dind-enabled: "true" preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull alpha job in csi-driver-host-path, using deployment 1.15 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -228,6 +246,9 @@ presubmits: preset-dind-enabled: "true" preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull unit job in csi-driver-host-path spec: containers: # We need this image because it has Docker in Docker and go. diff --git a/config/jobs/kubernetes-csi/csi-lib-utils/csi-lib-utils-config.yaml b/config/jobs/kubernetes-csi/csi-lib-utils/csi-lib-utils-config.yaml index a7bcd28375ab..b2fea1bec0b0 100644 --- a/config/jobs/kubernetes-csi/csi-lib-utils/csi-lib-utils-config.yaml +++ b/config/jobs/kubernetes-csi/csi-lib-utils/csi-lib-utils-config.yaml @@ -13,7 +13,6 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - testgrid-tab-name: pull-kubernetes-csi-csi-lib-utils description: Kubernetes-CSI pull job on csi-lib-utils spec: containers: diff --git a/config/jobs/kubernetes-csi/csi-proxy/csi-proxy-config.yaml b/config/jobs/kubernetes-csi/csi-proxy/csi-proxy-config.yaml index 7b65a79f97f2..21e12ba06814 100644 --- a/config/jobs/kubernetes-csi/csi-proxy/csi-proxy-config.yaml +++ b/config/jobs/kubernetes-csi/csi-proxy/csi-proxy-config.yaml @@ -13,7 +13,6 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - testgrid-tab-name: pull-kubernetes-csi-csi-proxy description: Kubernetes-CSI pull job on csi-proxy spec: containers: diff --git a/config/jobs/kubernetes-csi/csi-release-tools/csi-release-tools-config.yaml b/config/jobs/kubernetes-csi/csi-release-tools/csi-release-tools-config.yaml index a464b0e9803f..4c2b1b202a4f 100644 --- a/config/jobs/kubernetes-csi/csi-release-tools/csi-release-tools-config.yaml +++ b/config/jobs/kubernetes-csi/csi-release-tools/csi-release-tools-config.yaml @@ -13,7 +13,6 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - testgrid-tab-name: pull-kubernetes-csi-csi-release-tools description: Kubernetes-CSI pull job on csi-release-tools spec: containers: diff --git a/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml b/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml index e9d8fe9115a6..65b548f31563 100644 --- a/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml +++ b/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml @@ -13,7 +13,6 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - testgrid-tab-name: pull-kubernetes-csi-csi-test description: Kubernetes-CSI pull job on csi-test spec: containers: diff --git a/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml b/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml index 4adbbb11aacc..c26aa64731e0 100644 --- a/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml +++ b/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml @@ -12,6 +12,9 @@ presubmits: preset-service-account: "true" preset-dind-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in external-attacher, using deployment 1.14 on Kubernetes 1.14.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -51,6 +54,9 @@ presubmits: preset-dind-enabled: "true" preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in external-attacher, using deployment 1.14 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -84,6 +90,9 @@ presubmits: preset-service-account: "true" preset-dind-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in external-attacher, using deployment 1.15 on Kubernetes 1.15.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -123,6 +132,9 @@ presubmits: preset-dind-enabled: "true" preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in external-attacher, using deployment 1.15 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -156,6 +168,9 @@ presubmits: preset-service-account: "true" preset-dind-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull alpha job in external-attacher, using deployment 1.15 on Kubernetes 1.15.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -195,6 +210,9 @@ presubmits: preset-dind-enabled: "true" preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull alpha job in external-attacher, using deployment 1.15 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -228,6 +246,9 @@ presubmits: preset-dind-enabled: "true" preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull unit job in external-attacher spec: containers: # We need this image because it has Docker in Docker and go. diff --git a/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml b/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml index bc74bcf59fe3..1d5346333652 100644 --- a/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml +++ b/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml @@ -12,6 +12,9 @@ presubmits: preset-service-account: "true" preset-dind-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in external-provisioner, using deployment 1.14 on Kubernetes 1.14.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -51,6 +54,9 @@ presubmits: preset-dind-enabled: "true" preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in external-provisioner, using deployment 1.14 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -84,6 +90,9 @@ presubmits: preset-service-account: "true" preset-dind-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in external-provisioner, using deployment 1.15 on Kubernetes 1.15.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -123,6 +132,9 @@ presubmits: preset-dind-enabled: "true" preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in external-provisioner, using deployment 1.15 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -156,6 +168,9 @@ presubmits: preset-service-account: "true" preset-dind-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull alpha job in external-provisioner, using deployment 1.15 on Kubernetes 1.15.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -195,6 +210,9 @@ presubmits: preset-dind-enabled: "true" preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull alpha job in external-provisioner, using deployment 1.15 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -228,6 +246,9 @@ presubmits: preset-dind-enabled: "true" preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull unit job in external-provisioner spec: containers: # We need this image because it has Docker in Docker and go. diff --git a/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml b/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml index b1d8a8a8eca9..2fb9aaba0764 100644 --- a/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml +++ b/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml @@ -14,7 +14,6 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - testgrid-tab-name: pull-kubernetes-csi-external-resizer description: Kubernetes-CSI pull non-alpha job in external-resizer spec: containers: @@ -47,7 +46,6 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - testgrid-tab-name: pull-kubernetes-csi-external-resizer-unit description: Kubernetes-CSI pull unit job in external-resizer spec: containers: @@ -80,7 +78,6 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - testgrid-tab-name: pull-kubernetes-csi-external-resizer-alpha description: Kubernetes-CSI pull alpha job in external-resizer spec: containers: diff --git a/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml b/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml index 59a228f80b99..56f0951f2899 100644 --- a/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml +++ b/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml @@ -14,7 +14,6 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - testgrid-tab-name: pull-kubernetes-csi-external-snapshotter description: Kubernetes-CSI pull non-alpha job in external-snapshotter spec: containers: @@ -47,7 +46,6 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - testgrid-tab-name: pull-kubernetes-csi-external-snapshotter-unit description: Kubernetes-CSI pull unit job in external-snapshotter spec: containers: @@ -80,7 +78,6 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - testgrid-tab-name: pull-kubernetes-csi-external-snapshotter-alpha description: Kubernetes-CSI pull alpha job in external-snapshotter spec: containers: diff --git a/config/jobs/kubernetes-csi/gen-jobs.sh b/config/jobs/kubernetes-csi/gen-jobs.sh index ddbe2b3e71db..ff3f992160bb 100755 --- a/config/jobs/kubernetes-csi/gen-jobs.sh +++ b/config/jobs/kubernetes-csi/gen-jobs.sh @@ -201,6 +201,9 @@ EOF preset-service-account: "true" preset-dind-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull $tests job in $repo, using deployment $deployment on Kubernetes ${kubernetes} spec: containers: # We need this image because it has Docker in Docker and go. @@ -248,6 +251,9 @@ EOF preset-dind-enabled: "true" preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull $tests job in $repo, using deployment $deployment on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -281,6 +287,9 @@ EOF preset-dind-enabled: "true" preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull unit job in $repo spec: containers: # We need this image because it has Docker in Docker and go. @@ -321,7 +330,6 @@ EOF preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - testgrid-tab-name: $(job_name "pull" "$repo" "$tests") description: Kubernetes-CSI pull $tests job in $repo spec: containers: @@ -366,7 +374,6 @@ EOF preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - testgrid-tab-name: pull-kubernetes-csi-$repo description: Kubernetes-CSI pull job on $repo spec: containers: diff --git a/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml b/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml index f20a2d1b7065..d5ae9eb0ca4b 100644 --- a/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml +++ b/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml @@ -14,7 +14,6 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - testgrid-tab-name: pull-kubernetes-csi-livenessprobe description: Kubernetes-CSI pull non-alpha job in livenessprobe spec: containers: @@ -47,7 +46,6 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - testgrid-tab-name: pull-kubernetes-csi-livenessprobe-unit description: Kubernetes-CSI pull unit job in livenessprobe spec: containers: @@ -80,7 +78,6 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - testgrid-tab-name: pull-kubernetes-csi-livenessprobe-alpha description: Kubernetes-CSI pull alpha job in livenessprobe spec: containers: diff --git a/config/jobs/kubernetes-csi/node-driver-registrar/node-driver-registrar-config.yaml b/config/jobs/kubernetes-csi/node-driver-registrar/node-driver-registrar-config.yaml index ca2a99761694..d6d88086df51 100644 --- a/config/jobs/kubernetes-csi/node-driver-registrar/node-driver-registrar-config.yaml +++ b/config/jobs/kubernetes-csi/node-driver-registrar/node-driver-registrar-config.yaml @@ -12,6 +12,9 @@ presubmits: preset-service-account: "true" preset-dind-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in node-driver-registrar, using deployment 1.14 on Kubernetes 1.14.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -51,6 +54,9 @@ presubmits: preset-dind-enabled: "true" preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in node-driver-registrar, using deployment 1.14 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -84,6 +90,9 @@ presubmits: preset-service-account: "true" preset-dind-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in node-driver-registrar, using deployment 1.15 on Kubernetes 1.15.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -123,6 +132,9 @@ presubmits: preset-dind-enabled: "true" preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in node-driver-registrar, using deployment 1.15 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -156,6 +168,9 @@ presubmits: preset-service-account: "true" preset-dind-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull alpha job in node-driver-registrar, using deployment 1.15 on Kubernetes 1.15.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -195,6 +210,9 @@ presubmits: preset-dind-enabled: "true" preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull alpha job in node-driver-registrar, using deployment 1.15 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -228,6 +246,9 @@ presubmits: preset-dind-enabled: "true" preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull unit job in node-driver-registrar spec: containers: # We need this image because it has Docker in Docker and go. From 78da628e35469cdfa4a7226893b457e82eac9a2f Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Wed, 18 Sep 2019 10:05:39 +0200 Subject: [PATCH 4/7] kubernetes-csi: avoid overriding Kubernetes version for single-Kubernetes repos The original intention was to let repos which only need to be tested against a single Kubernetes release choose that release themselves. The comment for `single_kubernetes_repos` still describes that behavior. https://github.com/kubernetes/test-infra/pull/13434 changed that so that 1.15 is used for all of these repos because of some issues with external-snapshotter. external-snapshotter now has 1.15 in its own prow.sh, so we don't need the override anymore in the test job and can revert to the original behavior. --- .../external-resizer/external-resizer-config.yaml | 6 ------ .../external-snapshotter/external-snapshotter-config.yaml | 6 ------ config/jobs/kubernetes-csi/gen-jobs.sh | 2 -- .../kubernetes-csi/livenessprobe/livenessprobe-config.yaml | 6 ------ 4 files changed, 20 deletions(-) diff --git a/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml b/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml index 2fb9aaba0764..d63c80dc0c74 100644 --- a/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml +++ b/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml @@ -24,8 +24,6 @@ presubmits: args: - ./.prow.sh env: - - name: CSI_PROW_KUBERNETES_VERSION - value: "1.15.0" - name: CSI_PROW_TESTS value: "sanity serial parallel" # docker-in-docker needs privileged mode @@ -56,8 +54,6 @@ presubmits: args: - ./.prow.sh env: - - name: CSI_PROW_KUBERNETES_VERSION - value: "1.15.0" - name: CSI_PROW_TESTS value: "unit" # docker-in-docker needs privileged mode @@ -88,8 +84,6 @@ presubmits: args: - ./.prow.sh env: - - name: CSI_PROW_KUBERNETES_VERSION - value: "1.15.0" - name: CSI_PROW_TESTS value: "serial-alpha parallel-alpha" # docker-in-docker needs privileged mode diff --git a/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml b/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml index 56f0951f2899..fed9a5601054 100644 --- a/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml +++ b/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml @@ -24,8 +24,6 @@ presubmits: args: - ./.prow.sh env: - - name: CSI_PROW_KUBERNETES_VERSION - value: "1.15.0" - name: CSI_PROW_TESTS value: "sanity serial parallel" # docker-in-docker needs privileged mode @@ -56,8 +54,6 @@ presubmits: args: - ./.prow.sh env: - - name: CSI_PROW_KUBERNETES_VERSION - value: "1.15.0" - name: CSI_PROW_TESTS value: "unit" # docker-in-docker needs privileged mode @@ -88,8 +84,6 @@ presubmits: args: - ./.prow.sh env: - - name: CSI_PROW_KUBERNETES_VERSION - value: "1.15.0" - name: CSI_PROW_TESTS value: "serial-alpha parallel-alpha" # docker-in-docker needs privileged mode diff --git a/config/jobs/kubernetes-csi/gen-jobs.sh b/config/jobs/kubernetes-csi/gen-jobs.sh index ff3f992160bb..1158928b9929 100755 --- a/config/jobs/kubernetes-csi/gen-jobs.sh +++ b/config/jobs/kubernetes-csi/gen-jobs.sh @@ -340,8 +340,6 @@ EOF args: - ./.prow.sh env: - - name: CSI_PROW_KUBERNETES_VERSION - value: "${latest_stable_k8s_version}" - name: CSI_PROW_TESTS value: "$(expand_tests "$tests")" # docker-in-docker needs privileged mode diff --git a/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml b/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml index d5ae9eb0ca4b..dcea0423fd8a 100644 --- a/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml +++ b/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml @@ -24,8 +24,6 @@ presubmits: args: - ./.prow.sh env: - - name: CSI_PROW_KUBERNETES_VERSION - value: "1.15.0" - name: CSI_PROW_TESTS value: "sanity serial parallel" # docker-in-docker needs privileged mode @@ -56,8 +54,6 @@ presubmits: args: - ./.prow.sh env: - - name: CSI_PROW_KUBERNETES_VERSION - value: "1.15.0" - name: CSI_PROW_TESTS value: "unit" # docker-in-docker needs privileged mode @@ -88,8 +84,6 @@ presubmits: args: - ./.prow.sh env: - - name: CSI_PROW_KUBERNETES_VERSION - value: "1.15.0" - name: CSI_PROW_TESTS value: "serial-alpha parallel-alpha" # docker-in-docker needs privileged mode From 8dc06c2c5f4589ee6051a59dd86a2cb9cc955b29 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Wed, 18 Sep 2019 10:15:28 +0200 Subject: [PATCH 5/7] kubernetes-csi: test snapshotter, resizer and liveness with different Kubernetes versions All are now part of all csi-driver-host-path deployments for Kubernetes 1.13 and later and their functionality may differ depending on the Kubernetes version. Therefore it makes sense to enable the full test matrix instead of testing with just one Kubernetes version. --- .../external-resizer-config.yaml | 194 +++++++++++++++++- .../external-snapshotter-config.yaml | 194 +++++++++++++++++- config/jobs/kubernetes-csi/gen-jobs.sh | 17 +- .../livenessprobe/livenessprobe-config.yaml | 194 +++++++++++++++++- 4 files changed, 568 insertions(+), 31 deletions(-) diff --git a/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml b/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml index d63c80dc0c74..900a5dd5a3f8 100644 --- a/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml +++ b/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml @@ -2,7 +2,7 @@ presubmits: kubernetes-csi/external-resizer: - - name: pull-kubernetes-csi-external-resizer + - name: pull-kubernetes-csi-external-resizer-1-14-on-kubernetes-1-14 always_run: true optional: false decorate: true @@ -14,7 +14,7 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in external-resizer + description: Kubernetes-CSI pull non-alpha job in external-resizer, using deployment 1.14 on Kubernetes 1.14.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -24,6 +24,15 @@ presubmits: args: - ./.prow.sh env: + # We pick some version for which there are pre-built images for kind. + # Update only when the newer version is known to not cause issues, + # otherwise presubmit jobs may start to fail for reasons that are + # unrelated to the PR. Testing against the latest Kubernetes is covered + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + - name: CSI_PROW_KUBERNETES_VERSION + value: "1.14.0" + - name: CSI_PROW_KUBERNETES_DEPLOYMENT + value: "1.14" - name: CSI_PROW_TESTS value: "sanity serial parallel" # docker-in-docker needs privileged mode @@ -32,7 +41,46 @@ presubmits: resources: requests: cpu: 2000m - - name: pull-kubernetes-csi-external-resizer-unit + - name: pull-kubernetes-csi-external-resizer-1-14-on-kubernetes-master + # Explicitly needs to be started with /test. + # This cannot be enabled by default because there's always the risk + # that something changes in master which breaks the pre-merge check. + always_run: false + optional: true + decorate: true + skip_report: false + labels: + preset-service-account: "true" + preset-dind-enabled: "true" + preset-bazel-remote-cache-enabled: "true" + preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in external-resizer, using deployment 1.14 on Kubernetes master + spec: + containers: + # We need this image because it has Docker in Docker and go. + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master + command: + - runner.sh + args: + - ./.prow.sh + env: + - name: CSI_PROW_KUBERNETES_VERSION + value: "latest" + - name: CSI_PROW_TESTS + value: "sanity serial parallel" + # docker-in-docker needs privileged mode + securityContext: + privileged: true + resources: + requests: + # these are both a bit below peak usage during build + # this is mostly for building kubernetes + memory: "9000Mi" + # during the tests more like 3-20m is used + cpu: 2000m + - name: pull-kubernetes-csi-external-resizer-1-15-on-kubernetes-1-15 always_run: true optional: false decorate: true @@ -44,7 +92,7 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull unit job in external-resizer + description: Kubernetes-CSI pull non-alpha job in external-resizer, using deployment 1.15 on Kubernetes 1.15.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -54,16 +102,64 @@ presubmits: args: - ./.prow.sh env: + # We pick some version for which there are pre-built images for kind. + # Update only when the newer version is known to not cause issues, + # otherwise presubmit jobs may start to fail for reasons that are + # unrelated to the PR. Testing against the latest Kubernetes is covered + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + - name: CSI_PROW_KUBERNETES_VERSION + value: "1.15.0" + - name: CSI_PROW_KUBERNETES_DEPLOYMENT + value: "1.15" - name: CSI_PROW_TESTS - value: "unit" + value: "sanity serial parallel" # docker-in-docker needs privileged mode securityContext: privileged: true resources: requests: cpu: 2000m - - name: pull-kubernetes-csi-external-resizer-alpha - always_run: true + - name: pull-kubernetes-csi-external-resizer-1-15-on-kubernetes-master + # Explicitly needs to be started with /test. + # This cannot be enabled by default because there's always the risk + # that something changes in master which breaks the pre-merge check. + always_run: false + optional: true + decorate: true + skip_report: false + labels: + preset-service-account: "true" + preset-dind-enabled: "true" + preset-bazel-remote-cache-enabled: "true" + preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in external-resizer, using deployment 1.15 on Kubernetes master + spec: + containers: + # We need this image because it has Docker in Docker and go. + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master + command: + - runner.sh + args: + - ./.prow.sh + env: + - name: CSI_PROW_KUBERNETES_VERSION + value: "latest" + - name: CSI_PROW_TESTS + value: "sanity serial parallel" + # docker-in-docker needs privileged mode + securityContext: + privileged: true + resources: + requests: + # these are both a bit below peak usage during build + # this is mostly for building kubernetes + memory: "9000Mi" + # during the tests more like 3-20m is used + cpu: 2000m + - name: pull-kubernetes-csi-external-resizer-alpha-1-15-on-kubernetes-1-15 + always_run: false optional: true decorate: true skip_report: false @@ -74,7 +170,7 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull alpha job in external-resizer + description: Kubernetes-CSI pull alpha job in external-resizer, using deployment 1.15 on Kubernetes 1.15.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -84,6 +180,15 @@ presubmits: args: - ./.prow.sh env: + # We pick some version for which there are pre-built images for kind. + # Update only when the newer version is known to not cause issues, + # otherwise presubmit jobs may start to fail for reasons that are + # unrelated to the PR. Testing against the latest Kubernetes is covered + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + - name: CSI_PROW_KUBERNETES_VERSION + value: "1.15.0" + - name: CSI_PROW_KUBERNETES_DEPLOYMENT + value: "1.15" - name: CSI_PROW_TESTS value: "serial-alpha parallel-alpha" # docker-in-docker needs privileged mode @@ -92,3 +197,76 @@ presubmits: resources: requests: cpu: 2000m + - name: pull-kubernetes-csi-external-resizer-alpha-1-15-on-kubernetes-master + # Explicitly needs to be started with /test. + # This cannot be enabled by default because there's always the risk + # that something changes in master which breaks the pre-merge check. + always_run: false + optional: true + decorate: true + skip_report: false + labels: + preset-service-account: "true" + preset-dind-enabled: "true" + preset-bazel-remote-cache-enabled: "true" + preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull alpha job in external-resizer, using deployment 1.15 on Kubernetes master + spec: + containers: + # We need this image because it has Docker in Docker and go. + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master + command: + - runner.sh + args: + - ./.prow.sh + env: + - name: CSI_PROW_KUBERNETES_VERSION + value: "latest" + - name: CSI_PROW_TESTS + value: "serial-alpha parallel-alpha" + # docker-in-docker needs privileged mode + securityContext: + privileged: true + resources: + requests: + # these are both a bit below peak usage during build + # this is mostly for building kubernetes + memory: "9000Mi" + # during the tests more like 3-20m is used + cpu: 2000m + - name: pull-kubernetes-csi-external-resizer-unit + always_run: true + decorate: true + skip_report: false + skip_branches: [] + labels: + preset-service-account: "true" + preset-dind-enabled: "true" + preset-bazel-remote-cache-enabled: "true" + preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull unit job in external-resizer + spec: + containers: + # We need this image because it has Docker in Docker and go. + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master + command: + - runner.sh + args: + - ./.prow.sh + env: + - name: CSI_PROW_TESTS + value: "unit" + # docker-in-docker needs privileged mode + securityContext: + privileged: true + resources: + requests: + # these are both a bit below peak usage during build + # this is mostly for building kubernetes + memory: "9000Mi" + # during the tests more like 3-20m is used + cpu: 2000m diff --git a/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml b/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml index fed9a5601054..45d97dd04b99 100644 --- a/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml +++ b/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml @@ -2,7 +2,7 @@ presubmits: kubernetes-csi/external-snapshotter: - - name: pull-kubernetes-csi-external-snapshotter + - name: pull-kubernetes-csi-external-snapshotter-1-14-on-kubernetes-1-14 always_run: true optional: false decorate: true @@ -14,7 +14,7 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in external-snapshotter + description: Kubernetes-CSI pull non-alpha job in external-snapshotter, using deployment 1.14 on Kubernetes 1.14.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -24,6 +24,15 @@ presubmits: args: - ./.prow.sh env: + # We pick some version for which there are pre-built images for kind. + # Update only when the newer version is known to not cause issues, + # otherwise presubmit jobs may start to fail for reasons that are + # unrelated to the PR. Testing against the latest Kubernetes is covered + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + - name: CSI_PROW_KUBERNETES_VERSION + value: "1.14.0" + - name: CSI_PROW_KUBERNETES_DEPLOYMENT + value: "1.14" - name: CSI_PROW_TESTS value: "sanity serial parallel" # docker-in-docker needs privileged mode @@ -32,7 +41,46 @@ presubmits: resources: requests: cpu: 2000m - - name: pull-kubernetes-csi-external-snapshotter-unit + - name: pull-kubernetes-csi-external-snapshotter-1-14-on-kubernetes-master + # Explicitly needs to be started with /test. + # This cannot be enabled by default because there's always the risk + # that something changes in master which breaks the pre-merge check. + always_run: false + optional: true + decorate: true + skip_report: false + labels: + preset-service-account: "true" + preset-dind-enabled: "true" + preset-bazel-remote-cache-enabled: "true" + preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in external-snapshotter, using deployment 1.14 on Kubernetes master + spec: + containers: + # We need this image because it has Docker in Docker and go. + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master + command: + - runner.sh + args: + - ./.prow.sh + env: + - name: CSI_PROW_KUBERNETES_VERSION + value: "latest" + - name: CSI_PROW_TESTS + value: "sanity serial parallel" + # docker-in-docker needs privileged mode + securityContext: + privileged: true + resources: + requests: + # these are both a bit below peak usage during build + # this is mostly for building kubernetes + memory: "9000Mi" + # during the tests more like 3-20m is used + cpu: 2000m + - name: pull-kubernetes-csi-external-snapshotter-1-15-on-kubernetes-1-15 always_run: true optional: false decorate: true @@ -44,7 +92,7 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull unit job in external-snapshotter + description: Kubernetes-CSI pull non-alpha job in external-snapshotter, using deployment 1.15 on Kubernetes 1.15.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -54,16 +102,64 @@ presubmits: args: - ./.prow.sh env: + # We pick some version for which there are pre-built images for kind. + # Update only when the newer version is known to not cause issues, + # otherwise presubmit jobs may start to fail for reasons that are + # unrelated to the PR. Testing against the latest Kubernetes is covered + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + - name: CSI_PROW_KUBERNETES_VERSION + value: "1.15.0" + - name: CSI_PROW_KUBERNETES_DEPLOYMENT + value: "1.15" - name: CSI_PROW_TESTS - value: "unit" + value: "sanity serial parallel" # docker-in-docker needs privileged mode securityContext: privileged: true resources: requests: cpu: 2000m - - name: pull-kubernetes-csi-external-snapshotter-alpha - always_run: true + - name: pull-kubernetes-csi-external-snapshotter-1-15-on-kubernetes-master + # Explicitly needs to be started with /test. + # This cannot be enabled by default because there's always the risk + # that something changes in master which breaks the pre-merge check. + always_run: false + optional: true + decorate: true + skip_report: false + labels: + preset-service-account: "true" + preset-dind-enabled: "true" + preset-bazel-remote-cache-enabled: "true" + preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in external-snapshotter, using deployment 1.15 on Kubernetes master + spec: + containers: + # We need this image because it has Docker in Docker and go. + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master + command: + - runner.sh + args: + - ./.prow.sh + env: + - name: CSI_PROW_KUBERNETES_VERSION + value: "latest" + - name: CSI_PROW_TESTS + value: "sanity serial parallel" + # docker-in-docker needs privileged mode + securityContext: + privileged: true + resources: + requests: + # these are both a bit below peak usage during build + # this is mostly for building kubernetes + memory: "9000Mi" + # during the tests more like 3-20m is used + cpu: 2000m + - name: pull-kubernetes-csi-external-snapshotter-alpha-1-15-on-kubernetes-1-15 + always_run: false optional: true decorate: true skip_report: false @@ -74,7 +170,7 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull alpha job in external-snapshotter + description: Kubernetes-CSI pull alpha job in external-snapshotter, using deployment 1.15 on Kubernetes 1.15.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -84,6 +180,15 @@ presubmits: args: - ./.prow.sh env: + # We pick some version for which there are pre-built images for kind. + # Update only when the newer version is known to not cause issues, + # otherwise presubmit jobs may start to fail for reasons that are + # unrelated to the PR. Testing against the latest Kubernetes is covered + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + - name: CSI_PROW_KUBERNETES_VERSION + value: "1.15.0" + - name: CSI_PROW_KUBERNETES_DEPLOYMENT + value: "1.15" - name: CSI_PROW_TESTS value: "serial-alpha parallel-alpha" # docker-in-docker needs privileged mode @@ -92,3 +197,76 @@ presubmits: resources: requests: cpu: 2000m + - name: pull-kubernetes-csi-external-snapshotter-alpha-1-15-on-kubernetes-master + # Explicitly needs to be started with /test. + # This cannot be enabled by default because there's always the risk + # that something changes in master which breaks the pre-merge check. + always_run: false + optional: true + decorate: true + skip_report: false + labels: + preset-service-account: "true" + preset-dind-enabled: "true" + preset-bazel-remote-cache-enabled: "true" + preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull alpha job in external-snapshotter, using deployment 1.15 on Kubernetes master + spec: + containers: + # We need this image because it has Docker in Docker and go. + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master + command: + - runner.sh + args: + - ./.prow.sh + env: + - name: CSI_PROW_KUBERNETES_VERSION + value: "latest" + - name: CSI_PROW_TESTS + value: "serial-alpha parallel-alpha" + # docker-in-docker needs privileged mode + securityContext: + privileged: true + resources: + requests: + # these are both a bit below peak usage during build + # this is mostly for building kubernetes + memory: "9000Mi" + # during the tests more like 3-20m is used + cpu: 2000m + - name: pull-kubernetes-csi-external-snapshotter-unit + always_run: true + decorate: true + skip_report: false + skip_branches: ["^(k8s_1.12.0-beta.1|release-0.4|release-1.0)$"] + labels: + preset-service-account: "true" + preset-dind-enabled: "true" + preset-bazel-remote-cache-enabled: "true" + preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull unit job in external-snapshotter + spec: + containers: + # We need this image because it has Docker in Docker and go. + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master + command: + - runner.sh + args: + - ./.prow.sh + env: + - name: CSI_PROW_TESTS + value: "unit" + # docker-in-docker needs privileged mode + securityContext: + privileged: true + resources: + requests: + # these are both a bit below peak usage during build + # this is mostly for building kubernetes + memory: "9000Mi" + # during the tests more like 3-20m is used + cpu: 2000m diff --git a/config/jobs/kubernetes-csi/gen-jobs.sh b/config/jobs/kubernetes-csi/gen-jobs.sh index 1158928b9929..66769a719d96 100755 --- a/config/jobs/kubernetes-csi/gen-jobs.sh +++ b/config/jobs/kubernetes-csi/gen-jobs.sh @@ -33,16 +33,20 @@ hostpath_example_repos=" csi-driver-host-path external-attacher external-provisioner +external-resizer +external-snapshotter +livenessprobe node-driver-registrar " -# kubernetes-csi repos which only need to be tested against a single -# Kubernetes version. We generate unit, stable and alpha jobs for these, -# without specifying a Kubernetes version. +# kubernetes-csi repos which only need to be tested against at most a +# single Kubernetes version. We generate unit, stable and alpha jobs +# for these, without specifying a Kubernetes version. What the repo +# then tests in those jobs is entirely up to the repo. +# +# This list is currently empty, but such a job might be useful again +# in the future, so the code generator code below is kept. single_kubernetes_repos=" -livenessprobe -external-snapshotter -external-resizer " # kubernetes-csi repos which only need unit testing. @@ -61,7 +65,6 @@ csi-proxy # csi-driver-nfs # csi-lib-fc # csi-lib-iscsi -# external-resizer # All branches that do *not* support Prow testing. All new branches # are expected to have that support, therefore these list should be diff --git a/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml b/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml index dcea0423fd8a..a92db3818d37 100644 --- a/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml +++ b/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml @@ -2,7 +2,7 @@ presubmits: kubernetes-csi/livenessprobe: - - name: pull-kubernetes-csi-livenessprobe + - name: pull-kubernetes-csi-livenessprobe-1-14-on-kubernetes-1-14 always_run: true optional: false decorate: true @@ -14,7 +14,7 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in livenessprobe + description: Kubernetes-CSI pull non-alpha job in livenessprobe, using deployment 1.14 on Kubernetes 1.14.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -24,6 +24,15 @@ presubmits: args: - ./.prow.sh env: + # We pick some version for which there are pre-built images for kind. + # Update only when the newer version is known to not cause issues, + # otherwise presubmit jobs may start to fail for reasons that are + # unrelated to the PR. Testing against the latest Kubernetes is covered + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + - name: CSI_PROW_KUBERNETES_VERSION + value: "1.14.0" + - name: CSI_PROW_KUBERNETES_DEPLOYMENT + value: "1.14" - name: CSI_PROW_TESTS value: "sanity serial parallel" # docker-in-docker needs privileged mode @@ -32,7 +41,46 @@ presubmits: resources: requests: cpu: 2000m - - name: pull-kubernetes-csi-livenessprobe-unit + - name: pull-kubernetes-csi-livenessprobe-1-14-on-kubernetes-master + # Explicitly needs to be started with /test. + # This cannot be enabled by default because there's always the risk + # that something changes in master which breaks the pre-merge check. + always_run: false + optional: true + decorate: true + skip_report: false + labels: + preset-service-account: "true" + preset-dind-enabled: "true" + preset-bazel-remote-cache-enabled: "true" + preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in livenessprobe, using deployment 1.14 on Kubernetes master + spec: + containers: + # We need this image because it has Docker in Docker and go. + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master + command: + - runner.sh + args: + - ./.prow.sh + env: + - name: CSI_PROW_KUBERNETES_VERSION + value: "latest" + - name: CSI_PROW_TESTS + value: "sanity serial parallel" + # docker-in-docker needs privileged mode + securityContext: + privileged: true + resources: + requests: + # these are both a bit below peak usage during build + # this is mostly for building kubernetes + memory: "9000Mi" + # during the tests more like 3-20m is used + cpu: 2000m + - name: pull-kubernetes-csi-livenessprobe-1-15-on-kubernetes-1-15 always_run: true optional: false decorate: true @@ -44,7 +92,7 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull unit job in livenessprobe + description: Kubernetes-CSI pull non-alpha job in livenessprobe, using deployment 1.15 on Kubernetes 1.15.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -54,16 +102,64 @@ presubmits: args: - ./.prow.sh env: + # We pick some version for which there are pre-built images for kind. + # Update only when the newer version is known to not cause issues, + # otherwise presubmit jobs may start to fail for reasons that are + # unrelated to the PR. Testing against the latest Kubernetes is covered + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + - name: CSI_PROW_KUBERNETES_VERSION + value: "1.15.0" + - name: CSI_PROW_KUBERNETES_DEPLOYMENT + value: "1.15" - name: CSI_PROW_TESTS - value: "unit" + value: "sanity serial parallel" # docker-in-docker needs privileged mode securityContext: privileged: true resources: requests: cpu: 2000m - - name: pull-kubernetes-csi-livenessprobe-alpha - always_run: true + - name: pull-kubernetes-csi-livenessprobe-1-15-on-kubernetes-master + # Explicitly needs to be started with /test. + # This cannot be enabled by default because there's always the risk + # that something changes in master which breaks the pre-merge check. + always_run: false + optional: true + decorate: true + skip_report: false + labels: + preset-service-account: "true" + preset-dind-enabled: "true" + preset-bazel-remote-cache-enabled: "true" + preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull non-alpha job in livenessprobe, using deployment 1.15 on Kubernetes master + spec: + containers: + # We need this image because it has Docker in Docker and go. + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master + command: + - runner.sh + args: + - ./.prow.sh + env: + - name: CSI_PROW_KUBERNETES_VERSION + value: "latest" + - name: CSI_PROW_TESTS + value: "sanity serial parallel" + # docker-in-docker needs privileged mode + securityContext: + privileged: true + resources: + requests: + # these are both a bit below peak usage during build + # this is mostly for building kubernetes + memory: "9000Mi" + # during the tests more like 3-20m is used + cpu: 2000m + - name: pull-kubernetes-csi-livenessprobe-alpha-1-15-on-kubernetes-1-15 + always_run: false optional: true decorate: true skip_report: false @@ -74,7 +170,7 @@ presubmits: preset-kind-volume-mounts: "true" annotations: testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull alpha job in livenessprobe + description: Kubernetes-CSI pull alpha job in livenessprobe, using deployment 1.15 on Kubernetes 1.15.0 spec: containers: # We need this image because it has Docker in Docker and go. @@ -84,6 +180,15 @@ presubmits: args: - ./.prow.sh env: + # We pick some version for which there are pre-built images for kind. + # Update only when the newer version is known to not cause issues, + # otherwise presubmit jobs may start to fail for reasons that are + # unrelated to the PR. Testing against the latest Kubernetes is covered + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + - name: CSI_PROW_KUBERNETES_VERSION + value: "1.15.0" + - name: CSI_PROW_KUBERNETES_DEPLOYMENT + value: "1.15" - name: CSI_PROW_TESTS value: "serial-alpha parallel-alpha" # docker-in-docker needs privileged mode @@ -92,3 +197,76 @@ presubmits: resources: requests: cpu: 2000m + - name: pull-kubernetes-csi-livenessprobe-alpha-1-15-on-kubernetes-master + # Explicitly needs to be started with /test. + # This cannot be enabled by default because there's always the risk + # that something changes in master which breaks the pre-merge check. + always_run: false + optional: true + decorate: true + skip_report: false + labels: + preset-service-account: "true" + preset-dind-enabled: "true" + preset-bazel-remote-cache-enabled: "true" + preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull alpha job in livenessprobe, using deployment 1.15 on Kubernetes master + spec: + containers: + # We need this image because it has Docker in Docker and go. + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master + command: + - runner.sh + args: + - ./.prow.sh + env: + - name: CSI_PROW_KUBERNETES_VERSION + value: "latest" + - name: CSI_PROW_TESTS + value: "serial-alpha parallel-alpha" + # docker-in-docker needs privileged mode + securityContext: + privileged: true + resources: + requests: + # these are both a bit below peak usage during build + # this is mostly for building kubernetes + memory: "9000Mi" + # during the tests more like 3-20m is used + cpu: 2000m + - name: pull-kubernetes-csi-livenessprobe-unit + always_run: true + decorate: true + skip_report: false + skip_branches: ["^(release-0.4|release-1.0)$"] + labels: + preset-service-account: "true" + preset-dind-enabled: "true" + preset-bazel-remote-cache-enabled: "true" + preset-kind-volume-mounts: "true" + annotations: + testgrid-dashboards: sig-storage-csi + description: Kubernetes-CSI pull unit job in livenessprobe + spec: + containers: + # We need this image because it has Docker in Docker and go. + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master + command: + - runner.sh + args: + - ./.prow.sh + env: + - name: CSI_PROW_TESTS + value: "unit" + # docker-in-docker needs privileged mode + securityContext: + privileged: true + resources: + requests: + # these are both a bit below peak usage during build + # this is mostly for building kubernetes + memory: "9000Mi" + # during the tests more like 3-20m is used + cpu: 2000m From 56b4e0d82f2777adef28383ffba58306ef07b2c0 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Tue, 1 Oct 2019 09:47:28 +0200 Subject: [PATCH 6/7] testgrid: remove whitelisting of kubernetes-csi repos All of them are in testgrid now. --- config/tests/testgrids/config_test.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/tests/testgrids/config_test.go b/config/tests/testgrids/config_test.go index cf7792fef336..fd78e9e0abd4 100644 --- a/config/tests/testgrids/config_test.go +++ b/config/tests/testgrids/config_test.go @@ -338,10 +338,6 @@ var noPresubmitsInTestgridPrefixes = []string{ "containerd/cri", "GoogleCloudPlatform/k8s-multicluster-ingress", "kubeflow/pipelines", - "kubernetes-csi/csi-driver-host-path", - "kubernetes-csi/external-attacher", - "kubernetes-csi/external-provisioner", - "kubernetes-csi/node-driver-registrar", "kubernetes-sigs/gcp-compute-persistent-disk-csi-driver", "kubernetes-sigs/gcp-filestore-csi-driver", "kubernetes-sigs/kind", From 7ecd68a52bf3e48ec22ce0b95653fcc4bebb70f4 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Tue, 1 Oct 2019 10:58:07 +0200 Subject: [PATCH 7/7] kubernetes-csi: reorder testgrid 72 jobs in a single testgrid are too much. We now distinguish between periodic CI jobs and pull jobs. Testgrids with just a single job are avoided, instead those jobs are in "sig-storage-csi-other". --- .../csi-driver-flex-config.yaml | 5 +- .../csi-driver-host-path-config.yaml | 85 +++++++------ .../csi-lib-utils/csi-lib-utils-config.yaml | 5 +- .../csi-proxy/csi-proxy-config.yaml | 5 +- .../csi-release-tools-config.yaml | 5 +- .../csi-test/csi-test-config.yaml | 5 +- .../external-attacher-config.yaml | 41 ++++--- .../external-provisioner-config.yaml | 41 ++++--- .../external-resizer-config.yaml | 41 ++++--- .../external-snapshotter-config.yaml | 41 ++++--- config/jobs/kubernetes-csi/gen-jobs.sh | 112 ++++++++++++------ .../livenessprobe/livenessprobe-config.yaml | 41 ++++--- .../node-driver-registrar-config.yaml | 41 ++++--- .../kubernetes/sig-storage/config.yaml | 20 +++- 14 files changed, 302 insertions(+), 186 deletions(-) diff --git a/config/jobs/kubernetes-csi/csi-driver-flex/csi-driver-flex-config.yaml b/config/jobs/kubernetes-csi/csi-driver-flex/csi-driver-flex-config.yaml index 228ab364e5ed..2c489887e9c3 100644 --- a/config/jobs/kubernetes-csi/csi-driver-flex/csi-driver-flex-config.yaml +++ b/config/jobs/kubernetes-csi/csi-driver-flex/csi-driver-flex-config.yaml @@ -12,8 +12,9 @@ presubmits: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull job on csi-driver-flex + testgrid-dashboards: sig-storage-csi-other + testgrid-tab-name: pull-kubernetes-csi-csi-driver-flex + description: Kubernetes-CSI pull job in repo csi-driver-flex spec: containers: # We need this image because it has Docker in Docker and go. diff --git a/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml b/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml index 29eac2b65a83..b782b561de0c 100644 --- a/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml +++ b/config/jobs/kubernetes-csi/csi-driver-host-path/csi-driver-host-path-config.yaml @@ -13,8 +13,9 @@ presubmits: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in csi-driver-host-path, using deployment 1.14 on Kubernetes 1.14.0 + testgrid-dashboards: sig-storage-csi-csi-driver-host-path + testgrid-tab-name: 1-14-on-kubernetes-1-14 + description: Kubernetes-CSI pull job in repo csi-driver-host-path for non-alpha tests, using deployment 1.14 on Kubernetes 1.14 spec: containers: # We need this image because it has Docker in Docker and go. @@ -28,7 +29,7 @@ presubmits: # Update only when the newer version is known to not cause issues, # otherwise presubmit jobs may start to fail for reasons that are # unrelated to the PR. Testing against the latest Kubernetes is covered - # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary). - name: CSI_PROW_KUBERNETES_VERSION value: "1.14.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT @@ -55,8 +56,9 @@ presubmits: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in csi-driver-host-path, using deployment 1.14 on Kubernetes master + testgrid-dashboards: sig-storage-csi-csi-driver-host-path + testgrid-tab-name: 1-14-on-kubernetes-master + description: Kubernetes-CSI pull job in repo csi-driver-host-path for non-alpha tests, using deployment 1.14 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -91,8 +93,9 @@ presubmits: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in csi-driver-host-path, using deployment 1.15 on Kubernetes 1.15.0 + testgrid-dashboards: sig-storage-csi-csi-driver-host-path + testgrid-tab-name: 1-15-on-kubernetes-1-15 + description: Kubernetes-CSI pull job in repo csi-driver-host-path for non-alpha tests, using deployment 1.15 on Kubernetes 1.15 spec: containers: # We need this image because it has Docker in Docker and go. @@ -106,7 +109,7 @@ presubmits: # Update only when the newer version is known to not cause issues, # otherwise presubmit jobs may start to fail for reasons that are # unrelated to the PR. Testing against the latest Kubernetes is covered - # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary). - name: CSI_PROW_KUBERNETES_VERSION value: "1.15.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT @@ -133,8 +136,9 @@ presubmits: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in csi-driver-host-path, using deployment 1.15 on Kubernetes master + testgrid-dashboards: sig-storage-csi-csi-driver-host-path + testgrid-tab-name: 1-15-on-kubernetes-master + description: Kubernetes-CSI pull job in repo csi-driver-host-path for non-alpha tests, using deployment 1.15 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -169,8 +173,9 @@ presubmits: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull alpha job in csi-driver-host-path, using deployment 1.15 on Kubernetes 1.15.0 + testgrid-dashboards: sig-storage-csi-csi-driver-host-path + testgrid-tab-name: alpha-1-15-on-kubernetes-1-15 + description: Kubernetes-CSI pull job in repo csi-driver-host-path for alpha tests, using deployment 1.15 on Kubernetes 1.15 spec: containers: # We need this image because it has Docker in Docker and go. @@ -184,7 +189,7 @@ presubmits: # Update only when the newer version is known to not cause issues, # otherwise presubmit jobs may start to fail for reasons that are # unrelated to the PR. Testing against the latest Kubernetes is covered - # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary). - name: CSI_PROW_KUBERNETES_VERSION value: "1.15.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT @@ -211,8 +216,9 @@ presubmits: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull alpha job in csi-driver-host-path, using deployment 1.15 on Kubernetes master + testgrid-dashboards: sig-storage-csi-csi-driver-host-path + testgrid-tab-name: alpha-1-15-on-kubernetes-master + description: Kubernetes-CSI pull job in repo csi-driver-host-path for alpha tests, using deployment 1.15 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -247,8 +253,9 @@ presubmits: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull unit job in csi-driver-host-path + testgrid-dashboards: sig-storage-csi-csi-driver-host-path + testgrid-tab-name: unit + description: Kubernetes-CSI pull job in repo csi-driver-host-path for unit tests spec: containers: # We need this image because it has Docker in Docker and go. @@ -285,10 +292,10 @@ periodics: preset-bazel-remote-cache-enabled: "false" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi + testgrid-dashboards: sig-storage-csi-ci testgrid-tab-name: 1.14-on-1.14 testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com - description: Kubernetes-CSI non-alpha tests with Kubernetes 1.14 and 1.14 sidecars + description: periodic Kubernetes-CSI job for non-alpha tests, using deployment 1.14 on Kubernetes 1.14 spec: containers: # We need this image because it has Docker in Docker and go. @@ -325,10 +332,10 @@ periodics: preset-bazel-remote-cache-enabled: "false" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi + testgrid-dashboards: sig-storage-csi-ci testgrid-tab-name: 1.14-on-1.15 testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com - description: Kubernetes-CSI non-alpha tests with Kubernetes 1.15 and 1.14 sidecars + description: periodic Kubernetes-CSI job for non-alpha tests, using deployment 1.14 on Kubernetes 1.15 spec: containers: # We need this image because it has Docker in Docker and go. @@ -365,10 +372,10 @@ periodics: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi + testgrid-dashboards: sig-storage-csi-ci testgrid-tab-name: 1.14-on-master testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com - description: Kubernetes-CSI non-alpha tests with Kubernetes master and 1.14 sidecars + description: periodic Kubernetes-CSI job for non-alpha tests, using deployment 1.14 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -405,10 +412,10 @@ periodics: preset-bazel-remote-cache-enabled: "false" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi + testgrid-dashboards: sig-storage-csi-ci testgrid-tab-name: 1.15-on-1.14 testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com - description: Kubernetes-CSI non-alpha tests with Kubernetes 1.14 and 1.15 sidecars + description: periodic Kubernetes-CSI job for non-alpha tests, using deployment 1.15 on Kubernetes 1.14 spec: containers: # We need this image because it has Docker in Docker and go. @@ -445,10 +452,10 @@ periodics: preset-bazel-remote-cache-enabled: "false" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi + testgrid-dashboards: sig-storage-csi-ci testgrid-tab-name: 1.15-on-1.15 testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com - description: Kubernetes-CSI non-alpha tests with Kubernetes 1.15 and 1.15 sidecars + description: periodic Kubernetes-CSI job for non-alpha tests, using deployment 1.15 on Kubernetes 1.15 spec: containers: # We need this image because it has Docker in Docker and go. @@ -485,10 +492,10 @@ periodics: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi + testgrid-dashboards: sig-storage-csi-ci testgrid-tab-name: 1.15-on-master testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com - description: Kubernetes-CSI non-alpha tests with Kubernetes master and 1.15 sidecars + description: periodic Kubernetes-CSI job for non-alpha tests, using deployment 1.15 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -525,10 +532,10 @@ periodics: preset-bazel-remote-cache-enabled: "false" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi + testgrid-dashboards: sig-storage-csi-ci testgrid-tab-name: alpha-1.15-on-1.15 testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com - description: Kubernetes-CSI alpha tests with Kubernetes 1.15 and 1.15 sidecars + description: periodic Kubernetes-CSI job for alpha tests, using deployment 1.15 on Kubernetes 1.15 spec: containers: # We need this image because it has Docker in Docker and go. @@ -565,10 +572,10 @@ periodics: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi + testgrid-dashboards: sig-storage-csi-ci testgrid-tab-name: canary-on-1.14 testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com - description: Kubernetes-CSI non-alpha tests with Kubernetes 1.14 and canary sidecars + description: periodic Kubernetes-CSI job for non-alpha tests, using deployment canary on Kubernetes 1.14 spec: containers: # We need this image because it has Docker in Docker and go. @@ -611,10 +618,10 @@ periodics: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi + testgrid-dashboards: sig-storage-csi-ci testgrid-tab-name: canary-on-1.15 testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com - description: Kubernetes-CSI non-alpha tests with Kubernetes 1.15 and canary sidecars + description: periodic Kubernetes-CSI job for non-alpha tests, using deployment canary on Kubernetes 1.15 spec: containers: # We need this image because it has Docker in Docker and go. @@ -657,10 +664,10 @@ periodics: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi + testgrid-dashboards: sig-storage-csi-ci testgrid-tab-name: canary-on-master testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com - description: Kubernetes-CSI non-alpha tests with Kubernetes master and canary sidecars + description: periodic Kubernetes-CSI job for non-alpha tests, using deployment canary on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -703,10 +710,10 @@ periodics: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi + testgrid-dashboards: sig-storage-csi-ci testgrid-tab-name: alpha-canary-on-master testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com - description: Kubernetes-CSI alpha tests with Kubernetes master and canary sidecars + description: periodic Kubernetes-CSI job for alpha tests, using deployment canary on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. diff --git a/config/jobs/kubernetes-csi/csi-lib-utils/csi-lib-utils-config.yaml b/config/jobs/kubernetes-csi/csi-lib-utils/csi-lib-utils-config.yaml index b2fea1bec0b0..f9680939e0f7 100644 --- a/config/jobs/kubernetes-csi/csi-lib-utils/csi-lib-utils-config.yaml +++ b/config/jobs/kubernetes-csi/csi-lib-utils/csi-lib-utils-config.yaml @@ -12,8 +12,9 @@ presubmits: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull job on csi-lib-utils + testgrid-dashboards: sig-storage-csi-other + testgrid-tab-name: pull-kubernetes-csi-csi-lib-utils + description: Kubernetes-CSI pull job in repo csi-lib-utils spec: containers: # We need this image because it has Docker in Docker and go. diff --git a/config/jobs/kubernetes-csi/csi-proxy/csi-proxy-config.yaml b/config/jobs/kubernetes-csi/csi-proxy/csi-proxy-config.yaml index 21e12ba06814..0a3deb084be3 100644 --- a/config/jobs/kubernetes-csi/csi-proxy/csi-proxy-config.yaml +++ b/config/jobs/kubernetes-csi/csi-proxy/csi-proxy-config.yaml @@ -12,8 +12,9 @@ presubmits: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull job on csi-proxy + testgrid-dashboards: sig-storage-csi-other + testgrid-tab-name: pull-kubernetes-csi-csi-proxy + description: Kubernetes-CSI pull job in repo csi-proxy spec: containers: # We need this image because it has Docker in Docker and go. diff --git a/config/jobs/kubernetes-csi/csi-release-tools/csi-release-tools-config.yaml b/config/jobs/kubernetes-csi/csi-release-tools/csi-release-tools-config.yaml index 4c2b1b202a4f..245a8fc4d823 100644 --- a/config/jobs/kubernetes-csi/csi-release-tools/csi-release-tools-config.yaml +++ b/config/jobs/kubernetes-csi/csi-release-tools/csi-release-tools-config.yaml @@ -12,8 +12,9 @@ presubmits: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull job on csi-release-tools + testgrid-dashboards: sig-storage-csi-other + testgrid-tab-name: pull-kubernetes-csi-csi-release-tools + description: Kubernetes-CSI pull job in repo csi-release-tools spec: containers: # We need this image because it has Docker in Docker and go. diff --git a/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml b/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml index 65b548f31563..fd23db3b0d35 100644 --- a/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml +++ b/config/jobs/kubernetes-csi/csi-test/csi-test-config.yaml @@ -12,8 +12,9 @@ presubmits: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull job on csi-test + testgrid-dashboards: sig-storage-csi-other + testgrid-tab-name: pull-kubernetes-csi-csi-test + description: Kubernetes-CSI pull job in repo csi-test spec: containers: # We need this image because it has Docker in Docker and go. diff --git a/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml b/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml index c26aa64731e0..e66bb86b40cc 100644 --- a/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml +++ b/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml @@ -13,8 +13,9 @@ presubmits: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in external-attacher, using deployment 1.14 on Kubernetes 1.14.0 + testgrid-dashboards: sig-storage-csi-external-attacher + testgrid-tab-name: 1-14-on-kubernetes-1-14 + description: Kubernetes-CSI pull job in repo external-attacher for non-alpha tests, using deployment 1.14 on Kubernetes 1.14 spec: containers: # We need this image because it has Docker in Docker and go. @@ -28,7 +29,7 @@ presubmits: # Update only when the newer version is known to not cause issues, # otherwise presubmit jobs may start to fail for reasons that are # unrelated to the PR. Testing against the latest Kubernetes is covered - # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary). - name: CSI_PROW_KUBERNETES_VERSION value: "1.14.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT @@ -55,8 +56,9 @@ presubmits: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in external-attacher, using deployment 1.14 on Kubernetes master + testgrid-dashboards: sig-storage-csi-external-attacher + testgrid-tab-name: 1-14-on-kubernetes-master + description: Kubernetes-CSI pull job in repo external-attacher for non-alpha tests, using deployment 1.14 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -91,8 +93,9 @@ presubmits: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in external-attacher, using deployment 1.15 on Kubernetes 1.15.0 + testgrid-dashboards: sig-storage-csi-external-attacher + testgrid-tab-name: 1-15-on-kubernetes-1-15 + description: Kubernetes-CSI pull job in repo external-attacher for non-alpha tests, using deployment 1.15 on Kubernetes 1.15 spec: containers: # We need this image because it has Docker in Docker and go. @@ -106,7 +109,7 @@ presubmits: # Update only when the newer version is known to not cause issues, # otherwise presubmit jobs may start to fail for reasons that are # unrelated to the PR. Testing against the latest Kubernetes is covered - # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary). - name: CSI_PROW_KUBERNETES_VERSION value: "1.15.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT @@ -133,8 +136,9 @@ presubmits: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in external-attacher, using deployment 1.15 on Kubernetes master + testgrid-dashboards: sig-storage-csi-external-attacher + testgrid-tab-name: 1-15-on-kubernetes-master + description: Kubernetes-CSI pull job in repo external-attacher for non-alpha tests, using deployment 1.15 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -169,8 +173,9 @@ presubmits: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull alpha job in external-attacher, using deployment 1.15 on Kubernetes 1.15.0 + testgrid-dashboards: sig-storage-csi-external-attacher + testgrid-tab-name: alpha-1-15-on-kubernetes-1-15 + description: Kubernetes-CSI pull job in repo external-attacher for alpha tests, using deployment 1.15 on Kubernetes 1.15 spec: containers: # We need this image because it has Docker in Docker and go. @@ -184,7 +189,7 @@ presubmits: # Update only when the newer version is known to not cause issues, # otherwise presubmit jobs may start to fail for reasons that are # unrelated to the PR. Testing against the latest Kubernetes is covered - # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary). - name: CSI_PROW_KUBERNETES_VERSION value: "1.15.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT @@ -211,8 +216,9 @@ presubmits: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull alpha job in external-attacher, using deployment 1.15 on Kubernetes master + testgrid-dashboards: sig-storage-csi-external-attacher + testgrid-tab-name: alpha-1-15-on-kubernetes-master + description: Kubernetes-CSI pull job in repo external-attacher for alpha tests, using deployment 1.15 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -247,8 +253,9 @@ presubmits: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull unit job in external-attacher + testgrid-dashboards: sig-storage-csi-external-attacher + testgrid-tab-name: unit + description: Kubernetes-CSI pull job in repo external-attacher for unit tests spec: containers: # We need this image because it has Docker in Docker and go. diff --git a/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml b/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml index 1d5346333652..9ff258383ff6 100644 --- a/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml +++ b/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml @@ -13,8 +13,9 @@ presubmits: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in external-provisioner, using deployment 1.14 on Kubernetes 1.14.0 + testgrid-dashboards: sig-storage-csi-external-provisioner + testgrid-tab-name: 1-14-on-kubernetes-1-14 + description: Kubernetes-CSI pull job in repo external-provisioner for non-alpha tests, using deployment 1.14 on Kubernetes 1.14 spec: containers: # We need this image because it has Docker in Docker and go. @@ -28,7 +29,7 @@ presubmits: # Update only when the newer version is known to not cause issues, # otherwise presubmit jobs may start to fail for reasons that are # unrelated to the PR. Testing against the latest Kubernetes is covered - # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary). - name: CSI_PROW_KUBERNETES_VERSION value: "1.14.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT @@ -55,8 +56,9 @@ presubmits: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in external-provisioner, using deployment 1.14 on Kubernetes master + testgrid-dashboards: sig-storage-csi-external-provisioner + testgrid-tab-name: 1-14-on-kubernetes-master + description: Kubernetes-CSI pull job in repo external-provisioner for non-alpha tests, using deployment 1.14 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -91,8 +93,9 @@ presubmits: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in external-provisioner, using deployment 1.15 on Kubernetes 1.15.0 + testgrid-dashboards: sig-storage-csi-external-provisioner + testgrid-tab-name: 1-15-on-kubernetes-1-15 + description: Kubernetes-CSI pull job in repo external-provisioner for non-alpha tests, using deployment 1.15 on Kubernetes 1.15 spec: containers: # We need this image because it has Docker in Docker and go. @@ -106,7 +109,7 @@ presubmits: # Update only when the newer version is known to not cause issues, # otherwise presubmit jobs may start to fail for reasons that are # unrelated to the PR. Testing against the latest Kubernetes is covered - # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary). - name: CSI_PROW_KUBERNETES_VERSION value: "1.15.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT @@ -133,8 +136,9 @@ presubmits: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in external-provisioner, using deployment 1.15 on Kubernetes master + testgrid-dashboards: sig-storage-csi-external-provisioner + testgrid-tab-name: 1-15-on-kubernetes-master + description: Kubernetes-CSI pull job in repo external-provisioner for non-alpha tests, using deployment 1.15 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -169,8 +173,9 @@ presubmits: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull alpha job in external-provisioner, using deployment 1.15 on Kubernetes 1.15.0 + testgrid-dashboards: sig-storage-csi-external-provisioner + testgrid-tab-name: alpha-1-15-on-kubernetes-1-15 + description: Kubernetes-CSI pull job in repo external-provisioner for alpha tests, using deployment 1.15 on Kubernetes 1.15 spec: containers: # We need this image because it has Docker in Docker and go. @@ -184,7 +189,7 @@ presubmits: # Update only when the newer version is known to not cause issues, # otherwise presubmit jobs may start to fail for reasons that are # unrelated to the PR. Testing against the latest Kubernetes is covered - # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary). - name: CSI_PROW_KUBERNETES_VERSION value: "1.15.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT @@ -211,8 +216,9 @@ presubmits: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull alpha job in external-provisioner, using deployment 1.15 on Kubernetes master + testgrid-dashboards: sig-storage-csi-external-provisioner + testgrid-tab-name: alpha-1-15-on-kubernetes-master + description: Kubernetes-CSI pull job in repo external-provisioner for alpha tests, using deployment 1.15 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -247,8 +253,9 @@ presubmits: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull unit job in external-provisioner + testgrid-dashboards: sig-storage-csi-external-provisioner + testgrid-tab-name: unit + description: Kubernetes-CSI pull job in repo external-provisioner for unit tests spec: containers: # We need this image because it has Docker in Docker and go. diff --git a/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml b/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml index 900a5dd5a3f8..83b8d5f005f4 100644 --- a/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml +++ b/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml @@ -13,8 +13,9 @@ presubmits: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in external-resizer, using deployment 1.14 on Kubernetes 1.14.0 + testgrid-dashboards: sig-storage-csi-external-resizer + testgrid-tab-name: 1-14-on-kubernetes-1-14 + description: Kubernetes-CSI pull job in repo external-resizer for non-alpha tests, using deployment 1.14 on Kubernetes 1.14 spec: containers: # We need this image because it has Docker in Docker and go. @@ -28,7 +29,7 @@ presubmits: # Update only when the newer version is known to not cause issues, # otherwise presubmit jobs may start to fail for reasons that are # unrelated to the PR. Testing against the latest Kubernetes is covered - # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary). - name: CSI_PROW_KUBERNETES_VERSION value: "1.14.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT @@ -55,8 +56,9 @@ presubmits: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in external-resizer, using deployment 1.14 on Kubernetes master + testgrid-dashboards: sig-storage-csi-external-resizer + testgrid-tab-name: 1-14-on-kubernetes-master + description: Kubernetes-CSI pull job in repo external-resizer for non-alpha tests, using deployment 1.14 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -91,8 +93,9 @@ presubmits: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in external-resizer, using deployment 1.15 on Kubernetes 1.15.0 + testgrid-dashboards: sig-storage-csi-external-resizer + testgrid-tab-name: 1-15-on-kubernetes-1-15 + description: Kubernetes-CSI pull job in repo external-resizer for non-alpha tests, using deployment 1.15 on Kubernetes 1.15 spec: containers: # We need this image because it has Docker in Docker and go. @@ -106,7 +109,7 @@ presubmits: # Update only when the newer version is known to not cause issues, # otherwise presubmit jobs may start to fail for reasons that are # unrelated to the PR. Testing against the latest Kubernetes is covered - # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary). - name: CSI_PROW_KUBERNETES_VERSION value: "1.15.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT @@ -133,8 +136,9 @@ presubmits: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in external-resizer, using deployment 1.15 on Kubernetes master + testgrid-dashboards: sig-storage-csi-external-resizer + testgrid-tab-name: 1-15-on-kubernetes-master + description: Kubernetes-CSI pull job in repo external-resizer for non-alpha tests, using deployment 1.15 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -169,8 +173,9 @@ presubmits: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull alpha job in external-resizer, using deployment 1.15 on Kubernetes 1.15.0 + testgrid-dashboards: sig-storage-csi-external-resizer + testgrid-tab-name: alpha-1-15-on-kubernetes-1-15 + description: Kubernetes-CSI pull job in repo external-resizer for alpha tests, using deployment 1.15 on Kubernetes 1.15 spec: containers: # We need this image because it has Docker in Docker and go. @@ -184,7 +189,7 @@ presubmits: # Update only when the newer version is known to not cause issues, # otherwise presubmit jobs may start to fail for reasons that are # unrelated to the PR. Testing against the latest Kubernetes is covered - # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary). - name: CSI_PROW_KUBERNETES_VERSION value: "1.15.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT @@ -211,8 +216,9 @@ presubmits: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull alpha job in external-resizer, using deployment 1.15 on Kubernetes master + testgrid-dashboards: sig-storage-csi-external-resizer + testgrid-tab-name: alpha-1-15-on-kubernetes-master + description: Kubernetes-CSI pull job in repo external-resizer for alpha tests, using deployment 1.15 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -247,8 +253,9 @@ presubmits: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull unit job in external-resizer + testgrid-dashboards: sig-storage-csi-external-resizer + testgrid-tab-name: unit + description: Kubernetes-CSI pull job in repo external-resizer for unit tests spec: containers: # We need this image because it has Docker in Docker and go. diff --git a/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml b/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml index 45d97dd04b99..26f3494fe5e8 100644 --- a/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml +++ b/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml @@ -13,8 +13,9 @@ presubmits: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in external-snapshotter, using deployment 1.14 on Kubernetes 1.14.0 + testgrid-dashboards: sig-storage-csi-external-snapshotter + testgrid-tab-name: 1-14-on-kubernetes-1-14 + description: Kubernetes-CSI pull job in repo external-snapshotter for non-alpha tests, using deployment 1.14 on Kubernetes 1.14 spec: containers: # We need this image because it has Docker in Docker and go. @@ -28,7 +29,7 @@ presubmits: # Update only when the newer version is known to not cause issues, # otherwise presubmit jobs may start to fail for reasons that are # unrelated to the PR. Testing against the latest Kubernetes is covered - # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary). - name: CSI_PROW_KUBERNETES_VERSION value: "1.14.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT @@ -55,8 +56,9 @@ presubmits: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in external-snapshotter, using deployment 1.14 on Kubernetes master + testgrid-dashboards: sig-storage-csi-external-snapshotter + testgrid-tab-name: 1-14-on-kubernetes-master + description: Kubernetes-CSI pull job in repo external-snapshotter for non-alpha tests, using deployment 1.14 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -91,8 +93,9 @@ presubmits: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in external-snapshotter, using deployment 1.15 on Kubernetes 1.15.0 + testgrid-dashboards: sig-storage-csi-external-snapshotter + testgrid-tab-name: 1-15-on-kubernetes-1-15 + description: Kubernetes-CSI pull job in repo external-snapshotter for non-alpha tests, using deployment 1.15 on Kubernetes 1.15 spec: containers: # We need this image because it has Docker in Docker and go. @@ -106,7 +109,7 @@ presubmits: # Update only when the newer version is known to not cause issues, # otherwise presubmit jobs may start to fail for reasons that are # unrelated to the PR. Testing against the latest Kubernetes is covered - # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary). - name: CSI_PROW_KUBERNETES_VERSION value: "1.15.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT @@ -133,8 +136,9 @@ presubmits: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull non-alpha job in external-snapshotter, using deployment 1.15 on Kubernetes master + testgrid-dashboards: sig-storage-csi-external-snapshotter + testgrid-tab-name: 1-15-on-kubernetes-master + description: Kubernetes-CSI pull job in repo external-snapshotter for non-alpha tests, using deployment 1.15 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -169,8 +173,9 @@ presubmits: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull alpha job in external-snapshotter, using deployment 1.15 on Kubernetes 1.15.0 + testgrid-dashboards: sig-storage-csi-external-snapshotter + testgrid-tab-name: alpha-1-15-on-kubernetes-1-15 + description: Kubernetes-CSI pull job in repo external-snapshotter for alpha tests, using deployment 1.15 on Kubernetes 1.15 spec: containers: # We need this image because it has Docker in Docker and go. @@ -184,7 +189,7 @@ presubmits: # Update only when the newer version is known to not cause issues, # otherwise presubmit jobs may start to fail for reasons that are # unrelated to the PR. Testing against the latest Kubernetes is covered - # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary). - name: CSI_PROW_KUBERNETES_VERSION value: "1.15.0" - name: CSI_PROW_KUBERNETES_DEPLOYMENT @@ -211,8 +216,9 @@ presubmits: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull alpha job in external-snapshotter, using deployment 1.15 on Kubernetes master + testgrid-dashboards: sig-storage-csi-external-snapshotter + testgrid-tab-name: alpha-1-15-on-kubernetes-master + description: Kubernetes-CSI pull job in repo external-snapshotter for alpha tests, using deployment 1.15 on Kubernetes master spec: containers: # We need this image because it has Docker in Docker and go. @@ -247,8 +253,9 @@ presubmits: preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull unit job in external-snapshotter + testgrid-dashboards: sig-storage-csi-external-snapshotter + testgrid-tab-name: unit + description: Kubernetes-CSI pull job in repo external-snapshotter for unit tests spec: containers: # We need this image because it has Docker in Docker and go. diff --git a/config/jobs/kubernetes-csi/gen-jobs.sh b/config/jobs/kubernetes-csi/gen-jobs.sh index 66769a719d96..a81946446a08 100755 --- a/config/jobs/kubernetes-csi/gen-jobs.sh +++ b/config/jobs/kubernetes-csi/gen-jobs.sh @@ -28,7 +28,9 @@ latest_stable_k8s_minor_version="1.15" dind_image="gcr.io/k8s-testimages/kubekins-e2e:v20190927-21e0205-master" # All kubernetes-csi repos which are part of the hostpath driver example. -# For these repos we generate the full test matrix. +# For these repos we generate the full test matrix. For each entry here +# we need a "sig-storage-" dashboard in +# config/testgrids/kubernetes/sig-storage/config.yaml. hostpath_example_repos=" csi-driver-host-path external-attacher @@ -131,7 +133,74 @@ job_name () { if [ "$repo" ]; then name+="-$repo" fi - if [ "$tests" != "non-alpha" ]; then + name+=$(test_name "$tests" "$deployment" "$kubernetes") + echo "$name" +} + +# Generates the testgrid annotations. "ci" jobs all land in the same +# "sig-storage-csi-ci" and send alert emails, "pull" jobs land in "sig-storage-csi-" +# and don't alert. Some repos only have a single pull job. Those +# land in "sig-storage-csi-other". +annotations () { + local indent="$1" + shift + local type="$1" + local repo="$2" + local tests="$3" + local deployment="$4" + local kubernetes="$5" + local description + + # We only care about major.minor version numbers here. + if [ "$kubernetes" != "master" ]; then + kubernetes="$(echo "${kubernetes}" | sed -e 's/\([0-9]*\)\.\([0-9]*\).*/\1\.\2/')" + fi + + echo "annotations:" + case "$type" in + ci) + echo "${indent}testgrid-dashboards: sig-storage-csi-ci" + local alpha_testgrid_prefix="$(if [ "$tests" = "alpha" ]; then echo alpha-; fi)" + echo "${indent}testgrid-tab-name: ${alpha_testgrid_prefix}${deployment}-on-${kubernetes}" + echo "${indent}testgrid-alert-email: kubernetes-sig-storage-test-failures@googlegroups.com" + description="periodic Kubernetes-CSI job" + ;; + pull) + local testgrid + local name=$(test_name "$tests" "$deployment" "$kubernetes" | sed -e 's/^-//') + if [ "$name" ]; then + testgrid="sig-storage-csi-$repo" + else + testgrid="sig-storage-csi-other" + name=$(job_name "$@") + fi + echo "${indent}testgrid-dashboards: $testgrid" + echo "${indent}testgrid-tab-name: $name" + description="Kubernetes-CSI pull job" + ;; + esac + + if [ "$repo" ]; then + description+=" in repo $repo" + fi + if [ "$tests" ]; then + description+=" for $tests tests" + fi + if [ "$deployment" ] || [ "$kubernetes" ]; then + description+=", using deployment $deployment on Kubernetes $kubernetes" + fi + echo "${indent}description: $description" +} + +# Common suffix for job names which contains informatiopn about the test and cluster. +# Empty or starts with a hyphen. +test_name() { + local tests="$1" + local deployment="$2" + local kubernetes="$3" + local name + + if [ "$tests" ] && [ "$tests" != "non-alpha" ]; then name+="-$tests" fi if [ "$deployment" ] || [ "$kubernetes" ]; then @@ -204,9 +273,7 @@ EOF preset-service-account: "true" preset-dind-enabled: "true" preset-kind-volume-mounts: "true" - annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull $tests job in $repo, using deployment $deployment on Kubernetes ${kubernetes} + $(annotations " " "pull" "$repo" "$tests" "$deployment" "$kubernetes") spec: containers: # We need this image because it has Docker in Docker and go. @@ -220,7 +287,7 @@ EOF # Update only when the newer version is known to not cause issues, # otherwise presubmit jobs may start to fail for reasons that are # unrelated to the PR. Testing against the latest Kubernetes is covered - # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi#Summary). + # by periodic jobs (see https://k8s-testgrid.appspot.com/sig-storage-csi-ci#Summary). - name: CSI_PROW_KUBERNETES_VERSION value: "$kubernetes" - name: CSI_PROW_KUBERNETES_DEPLOYMENT @@ -254,9 +321,7 @@ EOF preset-dind-enabled: "true" preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" - annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull $tests job in $repo, using deployment $deployment on Kubernetes master + $(annotations " " "pull" "$repo" "$tests" "$deployment" master) spec: containers: # We need this image because it has Docker in Docker and go. @@ -290,9 +355,7 @@ EOF preset-dind-enabled: "true" preset-bazel-remote-cache-enabled: "true" preset-kind-volume-mounts: "true" - annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull unit job in $repo + $(annotations " " "pull" "$repo" "unit") spec: containers: # We need this image because it has Docker in Docker and go. @@ -331,9 +394,7 @@ EOF preset-service-account: "true" preset-dind-enabled: "true" preset-kind-volume-mounts: "true" - annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull $tests job in $repo + $(annotations " " "pull" "$repo" "$tests") spec: containers: # We need this image because it has Docker in Docker and go. @@ -373,9 +434,7 @@ EOF preset-service-account: "true" preset-dind-enabled: "true" preset-kind-volume-mounts: "true" - annotations: - testgrid-dashboards: sig-storage-csi - description: Kubernetes-CSI pull job on $repo + $(annotations " " "pull" "$repo") spec: containers: # We need this image because it has Docker in Docker and go. @@ -424,7 +483,6 @@ for tests in non-alpha alpha; do fi fi actual="$(if [ "$kubernetes" = "master" ]; then echo latest; else echo "release-$kubernetes"; fi)" - alpha_testgrid_prefix="$(if [ "$tests" = "alpha" ]; then echo alpha-; fi)" cat >>"$base/csi-driver-host-path/csi-driver-host-path-config.yaml" <