Merge pull request #15346 from alexeldeib/ace/fixe2e

fix: kubebuilder DinD runner, k8s version matrix
kubernetes · Nov 21, 2019 · 8bd3c28 · 8bd3c28
2 parents 6f1b617 + 82317f0
commit 8bd3c28
Showing 1 changed file with 63 additions and 3 deletions.
diff --git a/config/jobs/kubernetes-sigs/kubebuilder/kubebuilder-presubmits.yaml b/config/jobs/kubernetes-sigs/kubebuilder/kubebuilder-presubmits.yaml
@@ -18,7 +18,7 @@ presubmits:
     annotations:
       testgrid-dashboards: sig-api-machinery-kubebuilder
       testgrid-tab-name: kubebuilder
-  - name: pull-kubebuilder-e2e
+  - name: pull-kubebuilder-e2e-k8s-1-16-2
     decorate: true
     always_run: true
     optional: true
@@ -31,14 +31,74 @@ presubmits:
         command:
         # see https://github.com/kubernetes/test-infra/blob/bb41c9ee91b50fffa843e2a6fbc0fe361999f682/config/prow/config.yaml#L590-L613
         - runner.sh
-        - test_e2e.sh
+        # this MUST be a relative directory with "./" or the runner will fail to find the file
+        - ./test_e2e.sh
+        env:
+        - name: KIND_K8S_VERSION
+          value: "v1.16.2"
         resources:
           requests:
             cpu: 4000m
         securityContext:
           privileged: true
     annotations:
       testgrid-dashboards: sig-api-machinery-kubebuilder
-      testgrid-tab-name: kubebuilder-e2e
+      testgrid-tab-name: kubebuilder-e2e-1-16-2
+    labels:
+      preset-dind-enabled: "true"
+  - name: pull-kubebuilder-e2e-k8s-1-15-3
+    decorate: true
+    always_run: true
+    optional: true
+    path_alias: sigs.k8s.io/kubebuilder
+    branches:
+    - ^master$
+    spec:
+      containers:
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20191120-b56f01e-master
+        command:
+        # see https://github.com/kubernetes/test-infra/blob/bb41c9ee91b50fffa843e2a6fbc0fe361999f682/config/prow/config.yaml#L590-L613
+        - runner.sh
+        # this MUST be a relative directory with "./" or the runner will fail to find the file
+        - ./test_e2e.sh
+        env:
+        - name: KIND_K8S_VERSION
+          value: "v1.15.3"
+        resources:
+          requests:
+            cpu: 4000m
+        securityContext:
+          privileged: true
+    annotations:
+      testgrid-dashboards: sig-api-machinery-kubebuilder
+      testgrid-tab-name: kubebuilder-e2e-1-15-3
+    labels:
+      preset-dind-enabled: "true"
+  - name: pull-kubebuilder-e2e-k8s-1-14-1
+    decorate: true
+    always_run: true
+    optional: true
+    path_alias: sigs.k8s.io/kubebuilder
+    branches:
+    - ^master$
+    spec:
+      containers:
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20191120-b56f01e-master
+        command:
+        # see https://github.com/kubernetes/test-infra/blob/bb41c9ee91b50fffa843e2a6fbc0fe361999f682/config/prow/config.yaml#L590-L613
+        - runner.sh
+        # this MUST be a relative directory with "./" or the runner will fail to find the file
+        - ./test_e2e.sh
+        env:
+        - name: KIND_K8S_VERSION
+          value: "v1.14.1"
+        resources:
+          requests:
+            cpu: 4000m
+        securityContext:
+          privileged: true
+    annotations:
+      testgrid-dashboards: sig-api-machinery-kubebuilder
+      testgrid-tab-name: kubebuilder-e2e-1-14-2
     labels:
       preset-dind-enabled: "true"