Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kind job updates: update test target, add more branches #20765

Merged
merged 2 commits into from
Feb 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/jobs/kubernetes-sigs/kind/kind-postsubmits.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# sigs.k8s.io/kind postsubmits
postsubmits:
kubernetes-sigs/kind:
- name: ci-kind-unit
- name: ci-kind-test
decorate: true
path_alias: sigs.k8s.io/kind
always_run: true
Expand All @@ -13,7 +13,7 @@ postsubmits:
command:
- runner.sh
- make
- unit
- test
# we need privileged mode in order to do docker in docker
securityContext:
privileged: true
Expand Down
98 changes: 96 additions & 2 deletions config/jobs/kubernetes-sigs/kind/kind-presubmits.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ presubmits:
# we need privileged mode in order to do docker in docker
securityContext:
privileged: true
- name: pull-kind-unit
- name: pull-kind-test
decorate: true
path_alias: sigs.k8s.io/kind
always_run: true
Expand All @@ -28,7 +28,7 @@ presubmits:
command:
- wrapper.sh
- make
- unit
- test
# we need privileged mode in order to do docker in docker
securityContext:
privileged: true
Expand Down Expand Up @@ -242,6 +242,100 @@ presubmits:
# during the tests more like 3-20m is used
cpu: 2000m
# mimic pull-kubernetes-e2e-kind, but using kind built in this PR
- always_run: true
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • copy from k/k forked job
  • add extra ref for the kubernetes branch
  • update name field to match kind presubmits
  • update container command to cd to k/k and run e2e.sh instead of curl + e2e-k8s.sh
  • drop cluster field since it's unclear if we're allowed to use that cluster

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aha: the missing piece is to also drop the branches field entirely, as we want it to run on whatever the kind development branch is.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

branches:
- release-1.20
decorate: true
decoration_config:
grace_period: 15m0s
timeout: 1h0m0s
extra_refs:
- org: kubernetes
repo: kubernetes
base_ref: release-1.20
path_alias: k8s.io/kubernetes
labels:
preset-bazel-remote-cache-enabled: "true"
preset-bazel-scratch-dir: "true"
preset-dind-enabled: "true"
preset-kind-volume-mounts: "true"
name: pull-kind-e2e-kubernetes-1-20
path_alias: k8s.io/kubernetes
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wrong

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed in followup

spec:
containers:
- command:
- wrapper.sh
- bash
- -c
- cd ./../../k8s.io/kubernetes && ./../../sigs.k8s.io/kind/hack/ci/e2e.sh
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|NFS|nfs|inline.execution.and.attach|should.be.rejected.when.no.endpoints.exist
- name: PARALLEL
value: "true"
- name: BUILD_TYPE
value: bazel
image: gcr.io/k8s-testimages/krte:v20210204-b06ec78-1.20
name: ""
resources:
limits:
cpu: "4"
memory: 9000Mi
requests:
cpu: "4"
memory: 9000Mi
securityContext:
privileged: true
# mimic pull-kubernetes-e2e-kind, but using kind built in this PR
- always_run: true
branches:
- release-1.19
extra_refs:
- org: kubernetes
repo: kubernetes
base_ref: release-1.189
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed in followup

path_alias: k8s.io/kubernetes
decorate: true
decoration_config:
grace_period: 15m0s
timeout: 1h0m0s
labels:
preset-bazel-remote-cache-enabled: "true"
preset-bazel-scratch-dir: "true"
preset-dind-enabled: "true"
preset-kind-volume-mounts: "true"
name: pull-kind-e2e-kubernetes-1-19
path_alias: k8s.io/kubernetes
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wrong

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed in followup

spec:
containers:
- command:
- wrapper.sh
- bash
- -c
- cd ./../../k8s.io/kubernetes && ./../../sigs.k8s.io/kind/hack/ci/e2e.sh
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"
- name: BUILD_TYPE
value: bazel
image: gcr.io/k8s-testimages/krte:v20210204-3eaec9a-1.19
name: ""
resources:
limits:
cpu: "4"
memory: 9000Mi
requests:
cpu: "4"
memory: 9000Mi
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:
Expand Down
4 changes: 2 additions & 2 deletions config/jobs/kubernetes-sigs/kind/kind.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
periodics:
- name: ci-kind-unit
- name: ci-kind-test
interval: 6h
decorate: true
extra_refs:
Expand All @@ -16,7 +16,7 @@ periodics:
command:
- wrapper.sh
- make
- unit
- test
# we need privileged mode in order to do docker in docker
securityContext:
privileged: true
Expand Down