move kind presubmits to match kubernetes upstream supported versions

config/jobs/kubernetes-sigs/kind/kind-presubmits.yaml

@@ -194,132 +194,57 @@ presubmits:
             memory: "9000Mi"
             # during the tests more like 3-20m is used
             cpu: 2000m
-  # conformance test against kubernetes release-1.17 branch with `kind`, skipping
-  # serial tests so it runs in ~20m
-  - name: pull-kind-conformance-parallel-1-17
-    labels:
-      preset-service-account: "true"
-      preset-bazel-scratch-dir: "true"
-      preset-bazel-remote-cache-enabled: "true"
-      preset-dind-enabled: "true"
-      preset-kind-volume-mounts: "true"
-    always_run: true
-    spec:
-      containers:
-      - image: gcr.io/k8s-testimages/kubekins-e2e:v20200428-06f6e3b-1.17
-        env:
-        # skip serial tests and run with --ginkgo-parallel
-        - name: "PARALLEL"
-          value: "true"
-        args:
-        - "--job=$(JOB_NAME)"
-        - "--root=/go/src"
-        - "--repo=sigs.k8s.io/kind=$(PULL_REFS)"
-        - "--repo=k8s.io/kubernetes=release-1.17"
-        - "--service-account=/etc/service-account/service-account.json"
-        - "--upload=gs://kubernetes-jenkins/pr-logs"
-        - "--scenario=execute"
-        - "--"
-        # the script must run from kubernetes, but we're checking out kind
-        - "bash"
-        - "--"
-        - "-c"
-        - "cd ./../../k8s.io/kubernetes && ./../../sigs.k8s.io/kind/hack/ci/e2e.sh"
-        # we need privileged mode in order to do docker in docker
-        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
-  # conformance test against kubernetes release-1.16 branch with `kind`, skipping
-  # serial tests so it runs in ~20m
-  - name: pull-kind-conformance-parallel-1-16
-    labels:
-      preset-service-account: "true"
-      preset-bazel-scratch-dir: "true"
-      preset-bazel-remote-cache-enabled: "true"
-      preset-dind-enabled: "true"
-      preset-kind-volume-mounts: "true"
+  # mimic pull-kubernetes-e2e-kind, but using kind built in this PR
+  - name: pull-kind-e2e-kubernetes-1-18
     always_run: true
-    spec:
-      containers:
-      - image: gcr.io/k8s-testimages/kubekins-e2e:v20200428-06f6e3b-1.16
-        env:
-        # skip serial tests and run with --ginkgo-parallel
-        - name: "PARALLEL"
-          value: "true"
-        args:
-        - "--job=$(JOB_NAME)"
-        - "--root=/go/src"
-        - "--repo=sigs.k8s.io/kind=$(PULL_REFS)"
-        - "--repo=k8s.io/kubernetes=release-1.16"
-        - "--service-account=/etc/service-account/service-account.json"
-        - "--upload=gs://kubernetes-jenkins/pr-logs"
-        - "--scenario=execute"
-        - "--"
-        # the script must run from kubernetes, but we're checking out kind
-        - "bash"
-        - "--"
-        - "-c"
-        - "cd ./../../k8s.io/kubernetes && ./../../sigs.k8s.io/kind/hack/ci/e2e.sh"
-        # we need privileged mode in order to do docker in docker
-        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
-  # conformance test against kubernetes release-1.15 branch with `kind`, skipping
-  # serial tests so it runs in ~20m
-  - name: pull-kind-conformance-parallel-1-15
     labels:
-      preset-service-account: "true"
       preset-bazel-scratch-dir: "true"
       preset-bazel-remote-cache-enabled: "true"
       preset-dind-enabled: "true"
       preset-kind-volume-mounts: "true"
-    always_run: true
+    decorate: true
+    extra_refs:
+    - org: kubernetes
+      repo: kubernetes
+      base_ref: release-1.18
+      path_alias: k8s.io/kubernetes
+    path_alias: sigs.k8s.io/kind
+    decoration_config:
+      timeout: 40m
     spec:
       containers:
-      - image: gcr.io/k8s-testimages/kubekins-e2e:v20200428-06f6e3b-1.15
+      - image: gcr.io/k8s-testimages/krte:v20200428-2225715-1.18
+        command:
+        - wrapper.sh
+        - bash
+        - -c
+        - cd ./../../k8s.io/kubernetes && ./../../sigs.k8s.io/kind/hack/ci/e2e.sh
         env:
-        # skip serial tests and run with --ginkgo-parallel
-        - name: "PARALLEL"
+        - name: FOCUS
+          value: "."
+        # TODO(bentheelder): reduce the skip list further
+        # NOTE: changes should filter down to pull-kubernetes-e2e-kind-canary
+        # and then pull-kubernetes-e2e-kind
+        - name: SKIP
+          value: \[Slow\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|PodSecurityPolicy|LoadBalancer|load.balancer|In-tree.Volumes.\[Driver:.nfs\]|PersistentVolumes.NFS|Network.should.set.TCP.CLOSE_WAIT.timeout|Simple.pod.should.support.exec.through.an.HTTP.proxy|subPath.should.support.existing|ReplicationController.light.Should.scale.from.1.pod.to.2.pods|should.provide.basic.identity|\[NodeFeature:PodReadinessGate\]
+        - name: PARALLEL
           value: "true"
-        args:
-        - "--job=$(JOB_NAME)"
-        - "--root=/go/src"
-        - "--repo=sigs.k8s.io/kind=$(PULL_REFS)"
-        - "--repo=k8s.io/kubernetes=release-1.15"
-        - "--service-account=/etc/service-account/service-account.json"
-        - "--upload=gs://kubernetes-jenkins/pr-logs"
-        - "--scenario=execute"
-        - "--"
-        # the script must run from kubernetes, but we're checking out kind
-        - "bash"
-        - "--"
-        - "-c"
-        - "cd ./../../k8s.io/kubernetes && ./../../sigs.k8s.io/kind/hack/ci/e2e.sh"
+        - name: BUILD_TYPE
+          value: bazel
         # we need privileged mode in order to do docker in docker
         securityContext:
           privileged: true
         resources:
           requests:
+            # TODO(BenTheElder): adjust these everywhere
             # 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
-  # conformance test against kubernetes release-1.14 branch with `kind`, skipping
+  # conformance test against kubernetes release-1.17 branch with `kind`, skipping
   # serial tests so it runs in ~20m
-  - name: pull-kind-conformance-parallel-1-14
+  - name: pull-kind-conformance-parallel-1-17
     labels:
       preset-service-account: "true"
       preset-bazel-scratch-dir: "true"
@@ -329,7 +254,7 @@ presubmits:
     always_run: true
     spec:
       containers:
-      - image: gcr.io/k8s-testimages/kubekins-e2e:v20200218-a445c54-1.14
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20200428-06f6e3b-1.17
         env:
         # skip serial tests and run with --ginkgo-parallel
         - name: "PARALLEL"
@@ -338,7 +263,7 @@ presubmits:
         - "--job=$(JOB_NAME)"
         - "--root=/go/src"
         - "--repo=sigs.k8s.io/kind=$(PULL_REFS)"
-        - "--repo=k8s.io/kubernetes=release-1.14"
+        - "--repo=k8s.io/kubernetes=release-1.17"
         - "--service-account=/etc/service-account/service-account.json"
         - "--upload=gs://kubernetes-jenkins/pr-logs"
         - "--scenario=execute"
@@ -358,9 +283,9 @@ presubmits:
             memory: "9000Mi"
             # during the tests more like 3-20m is used
             cpu: 2000m
-  # conformance test against kubernetes release-1.13 branch with `kind`, skipping
+  # conformance test against kubernetes release-1.16 branch with `kind`, skipping
   # serial tests so it runs in ~20m
-  - name: pull-kind-conformance-parallel-1-13
+  - name: pull-kind-conformance-parallel-1-16
     labels:
       preset-service-account: "true"
       preset-bazel-scratch-dir: "true"
@@ -370,7 +295,7 @@ presubmits:
     always_run: true
     spec:
       containers:
-      - image: gcr.io/k8s-testimages/kubekins-e2e:v20191029-3656cc1-1.13
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20200428-06f6e3b-1.16
         env:
         # skip serial tests and run with --ginkgo-parallel
         - name: "PARALLEL"
@@ -379,7 +304,7 @@ presubmits:
         - "--job=$(JOB_NAME)"
         - "--root=/go/src"
         - "--repo=sigs.k8s.io/kind=$(PULL_REFS)"
-        - "--repo=k8s.io/kubernetes=release-1.13"
+        - "--repo=k8s.io/kubernetes=release-1.16"
         - "--service-account=/etc/service-account/service-account.json"
         - "--upload=gs://kubernetes-jenkins/pr-logs"
         - "--scenario=execute"
@@ -399,9 +324,9 @@ presubmits:
             memory: "9000Mi"
             # during the tests more like 3-20m is used
             cpu: 2000m
-  # conformance test against kubernetes release-1.12 branch with `kind`, skipping
+  # conformance test against kubernetes release-1.15 branch with `kind`, skipping
   # serial tests so it runs in ~20m
-  - name: pull-kind-conformance-parallel-1-12
+  - name: pull-kind-conformance-parallel-1-15
     labels:
       preset-service-account: "true"
       preset-bazel-scratch-dir: "true"
@@ -411,7 +336,7 @@ presubmits:
     always_run: true
     spec:
       containers:
-      - image: gcr.io/k8s-testimages/kubekins-e2e:v20190812-5a136da-1.12
+      - image: gcr.io/k8s-testimages/kubekins-e2e:v20200428-06f6e3b-1.15
         env:
         # skip serial tests and run with --ginkgo-parallel
         - name: "PARALLEL"
@@ -420,7 +345,7 @@ presubmits:
         - "--job=$(JOB_NAME)"
         - "--root=/go/src"
         - "--repo=sigs.k8s.io/kind=$(PULL_REFS)"
-        - "--repo=k8s.io/kubernetes=release-1.12"
+        - "--repo=k8s.io/kubernetes=release-1.15"
         - "--service-account=/etc/service-account/service-account.json"
         - "--upload=gs://kubernetes-jenkins/pr-logs"
         - "--scenario=execute"