Merge pull request #17242 from msau42/add-1.18-csi

Make csi 1.18 pull jobs required
kubernetes · Apr 16, 2020 · 5d54eeb · 5d54eeb
2 parents 6d1039a + 90ae7c4
commit 5d54eeb
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
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
@@ -172,7 +172,7 @@ presubmits:
           cpu: 2000m
   - name: pull-kubernetes-csi-csi-driver-host-path-1-18-on-kubernetes-1-18
     always_run: true
-    optional: true
+    optional: false
     decorate: true
     skip_report: false
     skip_branches: []

diff --git a/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml b/config/jobs/kubernetes-csi/external-attacher/external-attacher-config.yaml
@@ -172,7 +172,7 @@ presubmits:
           cpu: 2000m
   - name: pull-kubernetes-csi-external-attacher-1-18-on-kubernetes-1-18
     always_run: true
-    optional: true
+    optional: false
     decorate: true
     skip_report: false
     skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$"]

diff --git a/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml b/config/jobs/kubernetes-csi/external-provisioner/external-provisioner-config.yaml
@@ -172,7 +172,7 @@ presubmits:
           cpu: 2000m
   - name: pull-kubernetes-csi-external-provisioner-1-18-on-kubernetes-1-18
     always_run: true
-    optional: true
+    optional: false
     decorate: true
     skip_report: false
     skip_branches: ["^(release-0.2.0|release-0.3.0|release-0.4|release-1.0|v0.1.0)$"]

diff --git a/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml b/config/jobs/kubernetes-csi/external-resizer/external-resizer-config.yaml
@@ -172,7 +172,7 @@ presubmits:
           cpu: 2000m
   - name: pull-kubernetes-csi-external-resizer-1-18-on-kubernetes-1-18
     always_run: true
-    optional: true
+    optional: false
     decorate: true
     skip_report: false
     skip_branches: []

diff --git a/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml b/config/jobs/kubernetes-csi/external-snapshotter/external-snapshotter-config.yaml
@@ -172,7 +172,7 @@ presubmits:
           cpu: 2000m
   - name: pull-kubernetes-csi-external-snapshotter-1-18-on-kubernetes-1-18
     always_run: true
-    optional: true
+    optional: false
     decorate: true
     skip_report: false
     skip_branches: ["^(k8s_1.12.0-beta.1|release-0.4|release-1.0)$"]

diff --git a/config/jobs/kubernetes-csi/gen-jobs.sh b/config/jobs/kubernetes-csi/gen-jobs.sh
@@ -241,8 +241,8 @@ pull_optional() {
 
     if [ "$tests" == "alpha" ]; then
         echo "true"
-    elif [ "$kubernetes" == "1.18.0" ]; then
-        # Testing 1.18 may require updates to release-tools.
+    elif [ "$kubernetes" == "1.19.0" ]; then
+        # Testing 1.19 may require updates to release-tools.
         # Once that is done, and tests are passing,
         # this can be set to the next k8s version
         echo "true"

diff --git a/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml b/config/jobs/kubernetes-csi/livenessprobe/livenessprobe-config.yaml
@@ -172,7 +172,7 @@ presubmits:
           cpu: 2000m
   - name: pull-kubernetes-csi-livenessprobe-1-18-on-kubernetes-1-18
     always_run: true
-    optional: true
+    optional: false
     decorate: true
     skip_report: false
     skip_branches: ["^(release-0.4|release-1.0)$"]

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
@@ -172,7 +172,7 @@ presubmits:
           cpu: 2000m
   - name: pull-kubernetes-csi-node-driver-registrar-1-18-on-kubernetes-1-18
     always_run: true
-    optional: true
+    optional: false
     decorate: true
     skip_report: false
     skip_branches: ["^(release-1.0)$"]