-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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
generate DRA job configs from a Jinja template #34010
Open
bart0sh
wants to merge
4
commits into
kubernetes:master
Choose a base branch
from
bart0sh:PR060-generate-job-configs
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+723
−367
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,9 @@ | ||
| # GENERATED FILE - DO NOT EDIT! | ||
| # | ||
| # Instead, modify dra.jinja and run `make generate-jobs`. | ||
| presubmits: | ||
| kubernetes/kubernetes: | ||
| - name: canary-kind-dra | ||
| - name: pull-kubernetes-kind-dra-canary | ||
| cluster: eks-prow-build-cluster | ||
| skip_branches: | ||
| - release-\d+\.\d+ # per-release image | ||
|
|
@@ -13,30 +16,26 @@ presubmits: | |
| annotations: | ||
| testgrid-dashboards: sig-node-dynamic-resource-allocation, sig-node-presubmits | ||
| description: Runs E2E tests for Dynamic Resource Allocation beta features against a Kubernetes master cluster created with sigs.k8s.io/kind | ||
| testgrid-alert-email: [email protected],[email protected] | ||
| testgrid-alert-email: [email protected], [email protected] | ||
| decorate: true | ||
| decoration_config: | ||
| timeout: 90m | ||
| path_alias: k8s.io/kubernetes | ||
| spec: | ||
| containers: | ||
| - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241218-d4b51bc3e8-master | ||
| - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241230-3006692a6f-master | ||
| command: | ||
| - runner.sh | ||
| args: | ||
| - /bin/sh | ||
| - /bin/bash | ||
| - -xce | ||
| - | | ||
| make WHAT="github.com/onsi/ginkgo/v2/ginkgo k8s.io/kubernetes/test/e2e/e2e.test" | ||
| curl -sSL https://kind.sigs.k8s.io/dl/latest/linux-amd64.tgz | tar xvfz - -C "${PATH%%:*}/" kind | ||
| kind build node-image --image=dra/node:latest . | ||
| trap 'kind export logs "${ARTIFACTS}/kind"; kind delete cluster' EXIT | ||
| # Which DRA features exist can change over time. | ||
| features=( $(grep '"DRA' pkg/features/kube_features.go | sed 's/.*"\(.*\)"/\1/') ) | ||
| echo "Enabling DRA feature(s): ${features[*]}." | ||
| # Those additional features are not in kind.yaml, but they can be added at the end. | ||
| kind create cluster --retain --config <(cat test/e2e/dra/kind.yaml; for feature in ${features}; do echo " ${feature}: true"; done) --image dra/node:latest | ||
| KUBERNETES_PROVIDER=local KUBECONFIG=${HOME}/.kube/config GINKGO_PARALLEL_NODES=8 E2E_REPORT_DIR=${ARTIFACTS} GINKGO_TIMEOUT=1h hack/ginkgo-e2e.sh -ginkgo.label-filter="Feature: containsAny DynamicResourceAllocation && Feature: isSubsetOf { Alpha, Beta, DynamicResourceAllocation$(for feature in ${features}; do echo , ${feature}; done)} && !Flaky && !Slow" | ||
| kind create cluster --retain --config test/e2e/dra/kind.yaml --image dra/node:latest | ||
| KUBERNETES_PROVIDER=local KUBECONFIG=${HOME}/.kube/config GINKGO_PARALLEL_NODES=8 E2E_REPORT_DIR=${ARTIFACTS} GINKGO_TIMEOUT=2h30m hack/ginkgo-e2e.sh -ginkgo.label-filter='Feature: containsAny DynamicResourceAllocation && Feature: isSubsetOf { Beta, DynamicResourceAllocation } && !Flaky' | ||
| # docker-in-docker needs privileged mode | ||
| securityContext: | ||
| privileged: true | ||
|
|
@@ -48,7 +47,7 @@ presubmits: | |
| cpu: 2 | ||
| memory: 9Gi | ||
|
|
||
| - name: canary-kind-dra-all | ||
| - name: pull-kubernetes-kind-dra-all-canary | ||
| cluster: eks-prow-build-cluster | ||
| skip_branches: | ||
| - release-\d+\.\d+ # per-release image | ||
|
|
@@ -61,18 +60,18 @@ presubmits: | |
| annotations: | ||
| testgrid-dashboards: sig-node-dynamic-resource-allocation, sig-node-presubmits | ||
| description: Runs E2E tests for Dynamic Resource Allocation alpha and beta features against a Kubernetes master cluster created with sigs.k8s.io/kind | ||
| testgrid-alert-email: [email protected],[email protected] | ||
| testgrid-alert-email: [email protected], [email protected] | ||
| decorate: true | ||
| decoration_config: | ||
| timeout: 90m | ||
| path_alias: k8s.io/kubernetes | ||
| spec: | ||
| containers: | ||
| - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241218-d4b51bc3e8-master | ||
| - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241230-3006692a6f-master | ||
| command: | ||
| - runner.sh | ||
| args: | ||
| - /bin/sh | ||
| - /bin/bash | ||
| - -xce | ||
| - | | ||
| make WHAT="github.com/onsi/ginkgo/v2/ginkgo k8s.io/kubernetes/test/e2e/e2e.test" | ||
|
|
@@ -96,8 +95,8 @@ presubmits: | |
| cpu: 2 | ||
| memory: 9Gi | ||
|
|
||
| - name: canary-node-e2e-cgrpv1-crio-dra | ||
| cluster: eks-prow-build-cluster | ||
| - name: pull-kubernetes-node-e2e-cgrpv1-crio-dra-canary | ||
| cluster: k8s-infra-prow-build | ||
| skip_branches: | ||
| - release-\d+\.\d+ # per-release image | ||
| always_run: false | ||
|
|
@@ -106,12 +105,10 @@ presubmits: | |
| labels: | ||
| preset-service-account: "true" | ||
| preset-k8s-ssh: "true" | ||
| preset-pull-kubernetes-e2e: "true" | ||
| preset-pull-kubernetes-e2e-gce: "true" | ||
| annotations: | ||
| testgrid-dashboards: sig-node-dynamic-resource-allocation, sig-node-presubmits, sig-node-cri-o | ||
| description: Runs E2E node tests for Dynamic Resource Allocation beta features with CRI-O using cgroup v1 | ||
| testgrid-alert-email: [email protected],[email protected] | ||
| testgrid-alert-email: [email protected], [email protected] | ||
| decorate: true | ||
| decoration_config: | ||
| timeout: 90m | ||
|
|
@@ -123,7 +120,7 @@ presubmits: | |
| path_alias: k8s.io/test-infra | ||
| spec: | ||
| containers: | ||
| - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241218-d4b51bc3e8-master | ||
| - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241230-3006692a6f-master | ||
| command: | ||
| - runner.sh | ||
| - /workspace/scenarios/kubernetes_e2e.py | ||
|
|
@@ -150,8 +147,8 @@ presubmits: | |
| cpu: 2 | ||
| memory: 9Gi | ||
|
|
||
| - name: canary-node-e2e-cgrpv2-crio-dra | ||
| cluster: eks-prow-build-cluster | ||
| - name: pull-kubernetes-node-e2e-cgrpv2-crio-dra-canary | ||
| cluster: k8s-infra-prow-build | ||
| skip_branches: | ||
| - release-\d+\.\d+ # per-release image | ||
| always_run: false | ||
|
|
@@ -160,12 +157,10 @@ presubmits: | |
| labels: | ||
| preset-service-account: "true" | ||
| preset-k8s-ssh: "true" | ||
| preset-pull-kubernetes-e2e: "true" | ||
| preset-pull-kubernetes-e2e-gce: "true" | ||
| annotations: | ||
| testgrid-dashboards: sig-node-dynamic-resource-allocation, sig-node-presubmits, sig-node-cri-o | ||
| description: Runs E2E node tests for Dynamic Resource Allocation beta features with CRI-O using cgroup v2 | ||
| testgrid-alert-email: [email protected],[email protected] | ||
| testgrid-alert-email: [email protected], [email protected] | ||
| decorate: true | ||
| decoration_config: | ||
| timeout: 90m | ||
|
|
@@ -177,7 +172,7 @@ presubmits: | |
| path_alias: k8s.io/test-infra | ||
| spec: | ||
| containers: | ||
| - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241218-d4b51bc3e8-master | ||
| - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241230-3006692a6f-master | ||
| command: | ||
| - runner.sh | ||
| - /workspace/scenarios/kubernetes_e2e.py | ||
|
|
@@ -204,8 +199,8 @@ presubmits: | |
| cpu: 2 | ||
| memory: 9Gi | ||
|
|
||
| - name: canary-node-e2e-containerd-1-7-dra | ||
| cluster: eks-prow-build-cluster | ||
| - name: pull-kubernetes-node-e2e-containerd-1-7-dra-canary | ||
| cluster: k8s-infra-prow-build | ||
| skip_branches: | ||
| - release-\d+\.\d+ # per-release image | ||
| always_run: false | ||
|
|
@@ -214,12 +209,10 @@ presubmits: | |
| labels: | ||
| preset-service-account: "true" | ||
| preset-k8s-ssh: "true" | ||
| preset-pull-kubernetes-e2e: "true" | ||
| preset-pull-kubernetes-e2e-gce: "true" | ||
| annotations: | ||
| testgrid-dashboards: sig-node-dynamic-resource-allocation, sig-node-presubmits, sig-node-containerd | ||
| description: Runs E2E node tests for Dynamic Resource Allocation beta features with containerd | ||
| testgrid-alert-email: [email protected],[email protected] | ||
| testgrid-alert-email: [email protected], [email protected] | ||
| decorate: true | ||
| decoration_config: | ||
| timeout: 90m | ||
|
|
@@ -231,14 +224,14 @@ presubmits: | |
| path_alias: k8s.io/test-infra | ||
| spec: | ||
| containers: | ||
| - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241218-d4b51bc3e8-master | ||
| - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241230-3006692a6f-master | ||
| command: | ||
| - runner.sh | ||
| - /workspace/scenarios/kubernetes_e2e.py | ||
| args: | ||
| - --deployment=node | ||
| - --gcp-zone=us-west1-b | ||
| - '--node-test-args=--feature-gates=DynamicResourceAllocation=true --service-feature-gates=DynamicResourceAllocation=true --runtime-config=api/beta=true --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd\"]}"' | ||
| - '--node-test-args=--feature-gates=DynamicResourceAllocation=true --service-feature-gates=DynamicResourceAllocation=true --runtime-config=api/beta=true --container-runtime-endpoint=unix:///var/run/containerd/containerd.sock --container-runtime-process-name=/usr/local/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd\"]}"' | ||
| - --node-tests=true | ||
| - --provider=gce | ||
| - '--test_args=--timeout=1h --label-filter="Feature: containsAny DynamicResourceAllocation && Feature: isSubsetOf { Beta, DynamicResourceAllocation } && !Flaky && !Slow"' | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should fix the https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/directory/canary-kind-dra/1875675905863454720 failure:
Arrays are a bash feature, so
features=( ... )only works in bash.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep, that was a reason of submitting #34088
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
At this point merely comparing old and new jobs in the diff still shows several potentially relevant differences. Let's minimize or explain those, that's faster than getting approval for experimental jobs.