Skip to content

Cleanup NodeSwap Feature Labels #35791

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.

Sign up for GitHub

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Cleanup NodeSwap Feature Labels #35791

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c417c8
cleanup swap feature labels
mariafromano-25 Oct 28, 2025
8253c24
removed redundant feature labels and restored nodeswap labels for com…
mariafromano-25 Oct 30, 2025
e8eaef2
reverted removing NodeSwap Feature label from release branch jobs
mariafromano-25 Oct 31, 2025
e2d6b5f
labeled Feature instead of NodeFeature
mariafromano-25 Oct 31, 2025
5ab38de
keeping nodefeature as is in 1.32.yaml
mariafromano-25 Nov 5, 2025
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
12 changes: 5 additions & 7 deletions config/jobs/kubernetes/sig-node/containerd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ periodics:
- '--node-test-args=--container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/home/containerd/usr/local/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-driver=systemd --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service"'
- --node-tests=true
- --provider=gce
- --test_args=--nodes=1 --skip="\[Flaky\]|\[NodeConformance\]|\[Conformance\]|\[Serial\]|\[Feature:.+\]|\[Feature\]|\[Legacy:.+\]|\[Benchmark\]|\[Feature:SCTPConnectivity\]"
- --test_args=--nodes=1 --skip=\[Flaky\]|\[NodeConformance\]|\[Conformance\]|\[Serial\]|\[Feature:.+\]|\[Feature\]|\[Legacy:.+\]|\[Benchmark\]
- --timeout=300m
env:
- name: GOPATH
Expand Down Expand Up @@ -426,7 +426,7 @@ periodics:
- --image-family=cos-125-lts
- --image-project=cos-cloud
- --provider=gce
- --test_args=--ginkgo.skip=\[Driver:.gcepd\]|\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[Feature:RuntimeHandler\] --minStartupPods=8
- --test_args=--ginkgo.skip=\[Driver:.gcepd\]|\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\] --minStartupPods=8
- --timeout=50m
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251021-e2c2c9806f-master
resources:
Expand Down Expand Up @@ -465,7 +465,7 @@ periodics:
- --image-family=pipeline-1-34-amd64
- --image-project=ubuntu-os-gke-cloud
- --provider=gce
- --test_args=--ginkgo.skip=\[Driver:.gcepd\]|\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[Feature:RuntimeHandler\] --minStartupPods=8
- --test_args=--ginkgo.skip=\[Driver:.gcepd\]|\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\] --minStartupPods=8
- --timeout=50m
resources:
limits:
Expand Down Expand Up @@ -774,7 +774,7 @@ periodics:
- --image-family=cos-stable
- --image-project=cos-cloud
- --provider=gce
- --test_args=--ginkgo.skip=\[Driver:.gcepd\]|\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[Feature:NodeSwap\] --minStartupPods=8
Copy link
Member

@SergeyKanzhelev SergeyKanzhelev Oct 28, 2025

Choose a reason for hiding this comment

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

good clean up. The [Feature:.+\] already covers the [Feature:NodeSwap\]

Copy link
Contributor Author

@mariafromano-25 mariafromano-25 Oct 30, 2025

Choose a reason for hiding this comment

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

yes I have applied that similar logic to the redundant labels above^

- --test_args=--ginkgo.skip=\[Driver:.gcepd\]|\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\] --minStartupPods=8
- --timeout=50m
resources:
limits:
Expand Down Expand Up @@ -864,9 +864,7 @@ periodics:
- --gcp-zone=us-central1-b
- --ginkgo-parallel=30
- --provider=gce
# [Driver: gcepd] tests are skipped because CSIMigrationGCE is on in 1.23 and can be un-skipped once the cluster-up process
# uses cloud-provider-gcp. see issue https://github.com/kubernetes/cloud-provider-gcp/issues/293
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Driver:.gcepd\]|\[Flaky\]|\[Feature:.+\]|\[Feature:RuntimeHandler\]|\[Feature:NodeSwap\] --minStartupPods=8
Copy link
Member

@SergeyKanzhelev SergeyKanzhelev Oct 28, 2025

Choose a reason for hiding this comment

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

this is no-op clean up since the [Feature:.+\]| already skips NodeSwap

Copy link
Member

@SergeyKanzhelev SergeyKanzhelev Oct 28, 2025

Choose a reason for hiding this comment

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

you can remove other features here as well

- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Driver:.gcepd\]|\[Flaky\]|\[Feature:.+\] --minStartupPods=8
- --timeout=50m
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251021-e2c2c9806f-master
resources:
Expand Down
2 changes: 1 addition & 1 deletion config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ presubmits:
- --gcp-zone=us-central1-b
- --ginkgo-parallel=30
- --provider=gce
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|\[Feature:RuntimeHandler\] --minStartupPods=8
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\] --minStartupPods=8
- --timeout=80m # thinking about making this longer? don't! 80m is a hard cap, and should get down to no more than 60m.
image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20251021-e2c2c9806f-master
resources:
Expand Down
2 changes: 1 addition & 1 deletion config/jobs/kubernetes/sig-release/release-branch-jobs/1.32.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1396,7 +1396,7 @@ presubmits:
- --focus-regex=\[Serial\]
- --use-dockerized-build=true
- --target-build-arch=linux/arm64
- --skip-regex=\[Flaky\]|\[Slow\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]|\[Feature:DynamicResourceAllocation\]|\[NodeFeature:NodeSwap\]
Copy link
Member

@SergeyKanzhelev SergeyKanzhelev Oct 31, 2025

Choose a reason for hiding this comment

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

in 1.32 branch was it called Feature or NodeFeature? It might have changed

Copy link
Contributor Author

@mariafromano-25 mariafromano-25 Oct 31, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

It was called NodeFeature. Should I leave it at that? I just changed it to Feature to keep it consistent with 1.33 and 1.34

Copy link
Member

@SergeyKanzhelev SergeyKanzhelev Nov 1, 2025

Choose a reason for hiding this comment

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

Yes. We are trying not to touch the release jobs much - code never changes there so all tags typically stay as-is

- --skip-regex=\[Flaky\]|\[Slow\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]|\[Feature:DynamicResourceAllocation\]|\[Feature:NodeSwap\]
- '--test-args=--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=/
Expand Down