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 ea9d6354624b..dc2b009c1269 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 @@ -355,6 +355,111 @@ periodics: resources: requests: cpu: 2000m +- interval: 6h + name: ci-kubernetes-csi-1-14-on-kubernetes-1-13 + decorate: true + extra_refs: + - org: kubernetes-csi + repo: csi-driver-host-path + base_ref: master + labels: + preset-service-account: "true" + preset-dind-enabled: "true" + preset-bazel-remote-cache-enabled: "false" + preset-kind-volume-mounts: "true" + spec: + containers: + # We need this image because it has Docker in Docker and go. + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190420-93fab49-master + command: + - runner.sh + args: + - ./.prow.sh + env: + - name: CSI_PROW_KUBERNETES_VERSION + value: "release-1.13" + - name: CSI_PROW_BUILD_JOB + value: "false" + - name: CSI_PROW_DEPLOYMENT + value: "kubernetes-1.14" + - name: CSI_PROW_TESTS + value: "sanity serial parallel" + # docker-in-docker needs privileged mode + securityContext: + privileged: true + resources: + requests: + cpu: 2000m +- interval: 6h + name: ci-kubernetes-csi-1-14-on-kubernetes-1-14 + decorate: true + extra_refs: + - org: kubernetes-csi + repo: csi-driver-host-path + base_ref: master + labels: + preset-service-account: "true" + preset-dind-enabled: "true" + preset-bazel-remote-cache-enabled: "false" + preset-kind-volume-mounts: "true" + spec: + containers: + # We need this image because it has Docker in Docker and go. + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190420-93fab49-master + command: + - runner.sh + args: + - ./.prow.sh + env: + - name: CSI_PROW_KUBERNETES_VERSION + value: "release-1.14" + - name: CSI_PROW_BUILD_JOB + value: "false" + - name: CSI_PROW_DEPLOYMENT + value: "kubernetes-1.14" + - name: CSI_PROW_TESTS + value: "sanity serial parallel" + # docker-in-docker needs privileged mode + securityContext: + privileged: true + resources: + requests: + cpu: 2000m +- interval: 6h + name: ci-kubernetes-csi-1-14-on-kubernetes-master + decorate: true + extra_refs: + - org: kubernetes-csi + repo: csi-driver-host-path + base_ref: master + labels: + preset-service-account: "true" + preset-dind-enabled: "true" + preset-bazel-remote-cache-enabled: "true" + preset-kind-volume-mounts: "true" + spec: + containers: + # We need this image because it has Docker in Docker and go. + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190420-93fab49-master + command: + - runner.sh + args: + - ./.prow.sh + env: + - name: CSI_PROW_KUBERNETES_VERSION + value: "latest" + - name: CSI_PROW_BUILD_JOB + value: "false" + - name: CSI_PROW_DEPLOYMENT + value: "kubernetes-1.14" + - name: CSI_PROW_TESTS + value: "sanity serial parallel" + # docker-in-docker needs privileged mode + securityContext: + privileged: true + resources: + requests: + cpu: 2000m - interval: 6h name: ci-kubernetes-csi-alpha-1-13-on-kubernetes-1-13 decorate: true @@ -390,6 +495,41 @@ periodics: resources: requests: cpu: 2000m +- interval: 6h + name: ci-kubernetes-csi-alpha-1-14-on-kubernetes-1-14 + decorate: true + extra_refs: + - org: kubernetes-csi + repo: csi-driver-host-path + base_ref: master + labels: + preset-service-account: "true" + preset-dind-enabled: "true" + preset-bazel-remote-cache-enabled: "false" + preset-kind-volume-mounts: "true" + spec: + containers: + # We need this image because it has Docker in Docker and go. + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190420-93fab49-master + command: + - runner.sh + args: + - ./.prow.sh + env: + - name: CSI_PROW_KUBERNETES_VERSION + value: "release-1.14" + - name: CSI_PROW_BUILD_JOB + value: "false" + - name: CSI_PROW_DEPLOYMENT + value: "kubernetes-1.14" + - name: CSI_PROW_TESTS + value: "serial-alpha parallel-alpha" + # docker-in-docker needs privileged mode + securityContext: + privileged: true + resources: + requests: + cpu: 2000m - interval: 6h name: ci-kubernetes-csi-canary-on-kubernetes-1-13 decorate: true @@ -418,7 +558,9 @@ periodics: # Replace images.... - name: CSI_PROW_HOSTPATH_CANARY value: "canary" - # ... but not the RBAC rules. + # ... but the RBAC rules only when testing on master. + # The other jobs test against the unmodified deployment for + # that Kubernetes version, i.e. with the original RBAC rules. - name: UPDATE_RBAC_RULES value: "false" - name: CSI_PROW_TESTS @@ -457,7 +599,9 @@ periodics: # Replace images.... - name: CSI_PROW_HOSTPATH_CANARY value: "canary" - # ... but not the RBAC rules. + # ... but the RBAC rules only when testing on master. + # The other jobs test against the unmodified deployment for + # that Kubernetes version, i.e. with the original RBAC rules. - name: UPDATE_RBAC_RULES value: "false" - name: CSI_PROW_TESTS @@ -496,9 +640,11 @@ periodics: # Replace images.... - name: CSI_PROW_HOSTPATH_CANARY value: "canary" - # ... but not the RBAC rules. + # ... but the RBAC rules only when testing on master. + # The other jobs test against the unmodified deployment for + # that Kubernetes version, i.e. with the original RBAC rules. - name: UPDATE_RBAC_RULES - value: "false" + value: "true" - name: CSI_PROW_TESTS value: "sanity serial parallel" # docker-in-docker needs privileged mode @@ -535,9 +681,11 @@ periodics: # Replace images.... - name: CSI_PROW_HOSTPATH_CANARY value: "canary" - # ... but not the RBAC rules. + # ... but the RBAC rules only when testing on master. + # The other jobs test against the unmodified deployment for + # that Kubernetes version, i.e. with the original RBAC rules. - name: UPDATE_RBAC_RULES - value: "false" + value: "true" - 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 2b1c539b9770..639045e3056f 100755 --- a/config/jobs/kubernetes-csi/gen-jobs.sh +++ b/config/jobs/kubernetes-csi/gen-jobs.sh @@ -20,6 +20,9 @@ base="$(dirname $0)" +# We need this image because it has Docker in Docker and go. +dind_image="gcr.io/k8s-testimages/kubekins-e2e:v20190420-93fab49-master" + # All kubernetes-csi repos which are part of the hostpath driver example. # For these repos we generate the full test matrix. hostpath_example_repos=" @@ -192,7 +195,7 @@ EOF spec: containers: # We need this image because it has Docker in Docker and go. - - image: gcr.io/k8s-testimages/kubekins-e2e:v20190329-811f7954b-master + - image: ${dind_image} command: - runner.sh args: @@ -238,7 +241,7 @@ EOF spec: containers: # We need this image because it has Docker in Docker and go. - - image: gcr.io/k8s-testimages/kubekins-e2e:v20190329-811f7954b-master + - image: ${dind_image} command: - runner.sh args: @@ -270,7 +273,7 @@ EOF spec: containers: # We need this image because it has Docker in Docker and go. - - image: gcr.io/k8s-testimages/kubekins-e2e:v20190329-811f7954b-master + - image: ${dind_image} command: - runner.sh args: @@ -308,7 +311,7 @@ EOF spec: containers: # We need this image because it has Docker in Docker and go. - - image: gcr.io/k8s-testimages/kubekins-e2e:v20190329-811f7954b-master + - image: ${dind_image} command: - runner.sh args: @@ -347,7 +350,7 @@ EOF spec: containers: # We need this image because it has Docker in Docker and go. - - image: gcr.io/k8s-testimages/kubekins-e2e:v20190329-811f7954b-master + - image: ${dind_image} command: - runner.sh args: @@ -377,9 +380,8 @@ cat >>"$base/csi-driver-host-path/csi-driver-host-path-config.yaml" <