diff --git a/config/jobs/kubernetes-sigs/kind/kind-presubmits.yaml b/config/jobs/kubernetes-sigs/kind/kind-presubmits.yaml index b96f44f7ae969..e9ce1b0e573d3 100644 --- a/config/jobs/kubernetes-sigs/kind/kind-presubmits.yaml +++ b/config/jobs/kubernetes-sigs/kind/kind-presubmits.yaml @@ -234,12 +234,12 @@ presubmits: extra_refs: - org: kubernetes repo: kubernetes - base_ref: release-1.20 + base_ref: release-1.22 path_alias: k8s.io/kubernetes labels: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" - name: pull-kind-e2e-kubernetes-1-20 + name: pull-kind-e2e-kubernetes-1-22 path_alias: sigs.k8s.io/kind spec: containers: @@ -255,7 +255,7 @@ presubmits: value: \[Slow\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|PodSecurityPolicy|LoadBalancer|load.balancer|Simple.pod.should.support.exec.through.an.HTTP.proxy|subPath.should.support.existing|NFS|nfs|inline.execution.and.attach|should.be.rejected.when.no.endpoints.exist - name: PARALLEL value: "true" - image: gcr.io/k8s-staging-test-infra/krte:v20211014-1439a9f025-1.20 + image: gcr.io/k8s-staging-test-infra/krte:v20211014-1439a9f025-1.22 name: "" resources: limits: @@ -268,19 +268,19 @@ presubmits: privileged: true # mimic pull-kubernetes-e2e-kind, but using kind built in this PR - always_run: true - extra_refs: - - org: kubernetes - repo: kubernetes - base_ref: release-1.19 - path_alias: k8s.io/kubernetes decorate: true decoration_config: grace_period: 15m0s timeout: 1h0m0s + extra_refs: + - org: kubernetes + repo: kubernetes + base_ref: release-1.21 + path_alias: k8s.io/kubernetes labels: preset-dind-enabled: "true" preset-kind-volume-mounts: "true" - name: pull-kind-e2e-kubernetes-1-19 + name: pull-kind-e2e-kubernetes-1-21 path_alias: sigs.k8s.io/kind spec: containers: @@ -293,10 +293,10 @@ presubmits: - name: FOCUS value: . - name: SKIP - value: \[Slow\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|PodSecurityPolicy|LoadBalancer|load.balancer|Simple.pod.should.support.exec.through.an.HTTP.proxy|subPath.should.support.existing|Conntrack|udp|UDP|NFS|nfs|inline.execution.and.attach|should.be.rejected.when.no.endpoints.exist + value: \[Slow\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|PodSecurityPolicy|LoadBalancer|load.balancer|Simple.pod.should.support.exec.through.an.HTTP.proxy|subPath.should.support.existing|NFS|nfs|inline.execution.and.attach|should.be.rejected.when.no.endpoints.exist - name: PARALLEL value: "true" - image: gcr.io/k8s-staging-test-infra/krte:v20211014-1439a9f025-1.19 + image: gcr.io/k8s-staging-test-infra/krte:v20211014-1439a9f025-1.21 name: "" resources: limits: @@ -308,24 +308,23 @@ presubmits: securityContext: privileged: true # mimic pull-kubernetes-e2e-kind, but using kind built in this PR - - name: pull-kind-e2e-kubernetes-1-18 - always_run: true - labels: - preset-dind-enabled: "true" - preset-kind-volume-mounts: "true" + - always_run: true decorate: true + decoration_config: + grace_period: 15m0s + timeout: 1h0m0s extra_refs: - org: kubernetes repo: kubernetes - base_ref: release-1.18 + base_ref: release-1.20 path_alias: k8s.io/kubernetes + labels: + preset-dind-enabled: "true" + preset-kind-volume-mounts: "true" + name: pull-kind-e2e-kubernetes-1-20 path_alias: sigs.k8s.io/kind - decoration_config: - timeout: 40m - grace_period: 15m spec: containers: - - image: gcr.io/k8s-staging-test-infra/krte:v20211014-1439a9f025-1.18 command: - wrapper.sh - bash @@ -333,61 +332,60 @@ presubmits: - cd ./../../k8s.io/kubernetes && ./../../sigs.k8s.io/kind/hack/ci/e2e.sh env: - 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 + value: . - 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|should.provide.basic.identity|\[NodeFeature:PodReadinessGate\] + value: \[Slow\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|PodSecurityPolicy|LoadBalancer|load.balancer|Simple.pod.should.support.exec.through.an.HTTP.proxy|subPath.should.support.existing|NFS|nfs|inline.execution.and.attach|should.be.rejected.when.no.endpoints.exist - name: PARALLEL value: "true" - # we need privileged mode in order to do docker in docker - securityContext: - privileged: true + image: gcr.io/k8s-staging-test-infra/krte:v20211014-1439a9f025-1.20 + name: "" resources: + limits: + cpu: "4" + memory: 9000Mi 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.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-dind-enabled: "true" - preset-kind-volume-mounts: "true" - always_run: true - decorate: true + cpu: "4" + memory: 9000Mi + securityContext: + privileged: true + # mimic pull-kubernetes-e2e-kind, but using kind built in this PR + - always_run: true extra_refs: - org: kubernetes repo: kubernetes - base_ref: release-1.17 + base_ref: release-1.19 path_alias: k8s.io/kubernetes - path_alias: sigs.k8s.io/kind + decorate: true decoration_config: - timeout: 40m + grace_period: 15m0s + timeout: 1h0m0s + labels: + preset-dind-enabled: "true" + preset-kind-volume-mounts: "true" + name: pull-kind-e2e-kubernetes-1-19 + path_alias: sigs.k8s.io/kind spec: containers: - - image: gcr.io/k8s-staging-test-infra/krte:v20210204-b06ec78-1.17 - env: - # skip serial tests and run with --ginkgo-parallel - - name: "PARALLEL" - value: "true" - command: + - command: - wrapper.sh - 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 + env: + - name: FOCUS + value: . + - name: SKIP + value: \[Slow\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|PodSecurityPolicy|LoadBalancer|load.balancer|Simple.pod.should.support.exec.through.an.HTTP.proxy|subPath.should.support.existing|Conntrack|udp|UDP|NFS|nfs|inline.execution.and.attach|should.be.rejected.when.no.endpoints.exist + - name: PARALLEL + value: "true" + image: gcr.io/k8s-staging-test-infra/krte:v20211014-1439a9f025-1.19 + name: "" resources: + limits: + cpu: "4" + memory: 9000Mi 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 + cpu: "4" + memory: 9000Mi + securityContext: + privileged: true