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

[KEP-3041] - remove node special feature and node alpha feature from test-infra for non release branch #33828

Merged
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
10 changes: 5 additions & 5 deletions config/jobs/kubernetes/sig-node/containerd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ periodics:
- '--node-test-args=--container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"'
- --node-tests=true
- --provider=gce
- --test_args=--nodes=1 --timeout=4h --focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]|\[NodeFeature:NodeSwap]"
Copy link
Contributor

Choose a reason for hiding this comment

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

Instead of removing, should we replace it with specific feature labels like Feature:PodLevelResource and Feature:InPlacePodVerticalScaling? This would allow us to exclude tests related to in-development features from certain jobs.

Copy link
Contributor

@AnishShah AnishShah Dec 11, 2024

Choose a reason for hiding this comment

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

During the sig-node CI meeting, we discussed a strategy to submit your 2 changes. This approach would streamline the PR submission process. By replacing the generic labels NodeAlphaFeature and NodeSpecialFeature with specific feature labels, we can prioritize the submission of this PR, followed by the k/k PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That was about a different item. In this case, We are skipping based on NodeSpecialFeature. I think we can drop this as is.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In this case I think merging the k8s PR first and then this one is sufficient..

- --test_args=--nodes=1 --timeout=4h --focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]|\[NodeFeature:Eviction\]|\[NodeFeature:NodeSwap]"
- --timeout=240m
env:
- name: GOPATH
Expand Down Expand Up @@ -642,7 +642,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\]|\[NodeFeature:.+\]|\[NodeFeature\]|\[Feature:.+\]|\[Feature\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[Legacy:.+\]|\[Benchmark\]|\[Feature:SCTPConnectivity\]"
- --test_args=--nodes=1 --skip="\[Flaky\]|\[NodeConformance\]|\[Conformance\]|\[Serial\]|\[NodeFeature:.+\]|\[NodeFeature\]|\[Feature:.+\]|\[Feature\]|\[Legacy:.+\]|\[Benchmark\]|\[Feature:SCTPConnectivity\]"
- --timeout=300m
env:
- name: GOPATH
Expand All @@ -657,7 +657,7 @@ periodics:
annotations:
testgrid-dashboards: sig-node-containerd
testgrid-tab-name: node-e2e-unlabelled
description: "Contains all uncategorized tests, these are tests which are not marked with a [Node] tag. All node tests should be marked with [NodeFeature] or [NodeSpecialFeature] or [NodeAlphaFeature] or [NodeConformance] classification. Also skipped are [Flaky], [Benchmark], [Legacy]."
description: "Contains all uncategorized tests, these are tests which are not marked with a [Node] tag. All node tests should be marked with [NodeFeature] or [NodeConformance] classification. Also skipped are [Flaky], [Benchmark], [Legacy]."
- interval: 1h
name: ci-cos-containerd-e2e-cos-gce
cluster: k8s-infra-prow-build
Expand Down Expand Up @@ -1131,7 +1131,7 @@ periodics:
- '--node-test-args=--container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=containerd --container-runtime-pid-file= --kubelet-flags="--fail-cgroupv1=true --cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"'
- --node-tests=true
- --provider=gce
- --test_args=--nodes=1 --timeout=4h --focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]|\[NodeFeature:NodeSwap\]"
- --test_args=--nodes=1 --timeout=4h --focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]|\[NodeFeature:Eviction\]|\[NodeFeature:NodeSwap\]"
- --timeout=240m
env:
- name: GOPATH
Expand Down Expand Up @@ -1421,7 +1421,7 @@ periodics:
- '--node-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=/ --runtime-cgroups=/system.slice/containerd.service --lock-file=/var/run/kubelet.lock --exit-on-lock-contention=true" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"'
- --node-tests=true
- --provider=gce
- --test_args=--nodes=1 --focus="\[NodeSpecialFeature:LockContention\]" --skip="\[Flaky\]|\[Serial\]"
- --test_args=--nodes=1 --focus="\[Feature:LockContention\]" --skip="\[Flaky\]|\[Serial\]"
env:
- name: GOPATH
value: /go
Expand Down
48 changes: 6 additions & 42 deletions config/jobs/kubernetes/sig-node/crio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,42 +52,6 @@ periodics:
testgrid-alert-email: [email protected]

description: "OWNER: sig-node; runs NodeConformance e2e tests with crio master and cgroup v1"
# TODO (https://github.com/kubernetes/test-infra/issues/26127) consider restoring once we will figure out the right set of alpha features. The tag NodeAlphaFeature is not being used any longer
# - name: ci-crio-cgroupv1-node-e2e-alpha
# cluster: k8s-infra-prow-build
# interval: 1h
# labels:
# preset-service-account: "true"
# preset-k8s-ssh: "true"
# spec:
# containers:
# - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241128-8df65c072f-master
# args:
# - --root=/go/src
# - --repo=k8s.io/kubernetes
# - "--timeout=90"
# - --scenario=kubernetes_e2e
# - -- # end bootstrap args, scenario args below
# - --deployment=node
# - --env=KUBE_SSH_USER=core
# - --gcp-zone=us-west1-b
# - '--node-test-args=--feature-gates=AllAlpha=true,RotateKubeletServerCertificate=false --container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"'
# - --node-tests=true
# - --provider=gce
# - --test_args=--nodes=8 --focus="\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]" --skip="\[Flaky\]|\[Serial\]"
# - --runtime-config=api/all=true
# - --timeout=65m
# - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/crio/latest/image-config-cgroupv1.yaml
# env:
# - name: GOPATH
# value: /go
# - name: IGNITION_INJECT_GCE_SSH_PUBLIC_KEY_FILE
# value: "1"
# annotations:
# testgrid-dashboards: sig-node-cri-o
# testgrid-tab-name: ci-crio-cgroupv1-node-e2e-alpha
# testgrid-alert-email: [email protected]
# description: "OWNER: sig-node; runs NodeConformance and alpha e2e tests with crio master and cgroup v1"
- name: ci-crio-cgroupv1-node-e2e-features
cluster: k8s-infra-prow-build
interval: 1h
Expand Down Expand Up @@ -276,7 +240,7 @@ periodics:
- '--node-test-args=--container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"'
- --node-tests=true
- --provider=gce
- --test_args=--nodes=1 --skip="\[Flaky\]|\[NodeConformance\]|\[Conformance\]|\[Serial\]|\[NodeFeature:.+\]|\[NodeFeature\]|\[Feature:.+\]|\[Feature\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[Legacy:.+\]|\[Benchmark\]|\[Feature:SCTPConnectivity\]"
- --test_args=--nodes=1 --skip="\[Flaky\]|\[NodeConformance\]|\[Conformance\]|\[Serial\]|\[NodeFeature:.+\]|\[NodeFeature\]|\[Feature:.+\]|\[Feature\]|\[Legacy:.+\]|\[Benchmark\]|\[Feature:SCTPConnectivity\]"
- --timeout=300m
- --node-args=--image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/latest/image-config-cgroupv1.yaml
env:
Expand All @@ -295,7 +259,7 @@ periodics:
testgrid-dashboards: sig-node-cri-o
testgrid-tab-name: ci-crio-cgroupv1-node-e2e-unlabelled
testgrid-alert-email: [email protected]
description: "Contains all uncategorized tests, these are tests which are not marked with a [Node] tag. All node tests should be marked with [NodeFeature] or [NodeSpecialFeature] or [NodeAlphaFeature] or [NodeConformance] classification. Also skipped are [Flaky], [Benchmark], [Legacy]."
description: "Contains all uncategorized tests, these are tests which are not marked with a [Node] tag. All node tests should be marked with [NodeFeature] or [NodeConformance] classification. Also skipped are [Flaky], [Benchmark], [Legacy]."
- name: ci-crio-cgroupv2-node-e2e-unlabelled
cluster: k8s-infra-prow-build
interval: 12h
Expand Down Expand Up @@ -328,7 +292,7 @@ periodics:
- '--node-test-args=--container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--fail-cgroupv1=true --cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"'
- --node-tests=true
- --provider=gce
- --test_args=--nodes=1 --skip="\[Flaky\]|\[NodeConformance\]|\[Conformance\]|\[Serial\]|\[NodeFeature:.+\]|\[NodeFeature\]|\[Feature:.+\]|\[Feature\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[Legacy:.+\]|\[Benchmark\]|\[Feature:SCTPConnectivity\]"
- --test_args=--nodes=1 --skip="\[Flaky\]|\[NodeConformance\]|\[Conformance\]|\[Serial\]|\[NodeFeature:.+\]|\[NodeFeature\]|\[Feature:.+\]|\[Feature\]|\[Legacy:.+\]|\[Benchmark\]|\[Feature:SCTPConnectivity\]"
- --timeout=300m
- --node-args=--image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/latest/image-config-cgroupv2.yaml
env:
Expand All @@ -347,7 +311,7 @@ periodics:
testgrid-dashboards: sig-node-cri-o
testgrid-tab-name: ci-crio-cgroupv2-node-e2e-unlabelled
testgrid-alert-email: [email protected]
description: "Contains all uncategorized tests, these are tests which are not marked with a [Node] tag. All node tests should be marked with [NodeFeature] or [NodeSpecialFeature] or [NodeAlphaFeature] or [NodeConformance] classification. Also skipped are [Flaky], [Benchmark], [Legacy]."
description: "Contains all uncategorized tests, these are tests which are not marked with a [Node] tag. All node tests should be marked with [NodeFeature] or [NodeConformance] classification. Also skipped are [Flaky], [Benchmark], [Legacy]."
- name: ci-crio-cgroupv1-node-e2e-eviction
cluster: k8s-infra-prow-build
interval: 4h30m
Expand Down Expand Up @@ -858,10 +822,10 @@ periodics:
- --deployment=node
- --env=KUBE_SSH_USER=core
- --gcp-zone=us-west1-b
- '--node-test-args=--feature-gates="DevicePluginCDIDevices=true" --container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"'
- '--node-test-args=--container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"'
- --node-tests=true
- --provider=gce
- --test_args=--focus="\[NodeSpecialFeature:CDI\]" --skip="\[Flaky\]"
- --test_args=--focus="\[Feature:DevicePluginCDIDevices\]" --skip="\[Flaky\]"
- --timeout=60m
- --node-args=--image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/latest/image-config-cgroupv1-serial.yaml
env:
Expand Down
6 changes: 3 additions & 3 deletions config/jobs/kubernetes/sig-node/ec2-containerd-presubmit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ presubmits:
- name: IMAGE_CONFIG_FILE
value: aws-instance.yaml
- name: SKIP
value: \[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]
value: \[Flaky\]|\[Benchmark\]|\[NodeFeature:Eviction\]
- name: TEST_ARGS
value: '--kubelet-flags="--cgroup-driver=systemd"'
resources:
Expand Down Expand Up @@ -219,7 +219,7 @@ presubmits:
- name: FOCUS
value: \[Serial\]
- name: SKIP
value: \[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]
value: \[Flaky\]|\[Benchmark\]|\[NodeFeature:Eviction\]
- name: BUILD_EKS_AMI
value: "true"
- name: IMAGE_CONFIG_DIR
Expand Down Expand Up @@ -267,7 +267,7 @@ presubmits:
- name: FOCUS
value: \[Serial\]
- name: SKIP
value: \[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]
value: \[Flaky\]|\[Benchmark\]|\[NodeFeature:Eviction\]
- name: USE_DOCKERIZED_BUILD
value: "true"
- name: TARGET_BUILD_ARCH
Expand Down
12 changes: 6 additions & 6 deletions config/jobs/kubernetes/sig-node/ec2-containerd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ periodics:
- name: FOCUS
value: \[Serial\]
- name: SKIP
value: \[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]
value: \[Flaky\]|\[Benchmark\]|\[NodeFeature:Eviction\]
- name: USE_DOCKERIZED_BUILD
value: "true"
- name: TARGET_BUILD_ARCH
Expand Down Expand Up @@ -421,7 +421,7 @@ periodics:
- name: IMAGE_CONFIG_FILE
value: aws-instance.yaml
- name: SKIP
value: \[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]
value: \[Flaky\]|\[Benchmark\]|\[NodeFeature:Eviction\]
- name: TEST_ARGS
value: '--kubelet-flags="--fail-cgroupv1=true --cgroup-driver=systemd"'
resources:
Expand Down Expand Up @@ -464,7 +464,7 @@ periodics:
- name: FOCUS
value: \[Serial\]
- name: SKIP
value: \[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]|\[NodeFeature:NodeSwap\]
value: \[Flaky\]|\[Benchmark\]|\[NodeFeature:Eviction\]|\[NodeFeature:NodeSwap\]
- name: BUILD_EKS_AMI
value: "true"
- name: IMAGE_CONFIG_DIR
Expand Down Expand Up @@ -513,7 +513,7 @@ periodics:
- name: FOCUS
value: \[Serial\]
- name: SKIP
value: \[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]|\[NodeFeature:NodeSwap\]
value: \[Flaky\]|\[Benchmark\]|\[NodeFeature:Eviction\]|\[NodeFeature:NodeSwap\]
- name: BUILD_EKS_AMI
value: "true"
- name: BUILD_EKS_AMI_ARCH
Expand Down Expand Up @@ -570,7 +570,7 @@ periodics:
- name: FOCUS
value: \[Serial\]
- name: SKIP
value: \[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]
value: \[Flaky\]|\[Benchmark\]|\[NodeFeature:Eviction\]
- name: BUILD_EKS_AMI
value: "true"
- name: BUILD_EKS_AMI_OS
Expand Down Expand Up @@ -621,7 +621,7 @@ periodics:
- name: FOCUS
value: \[Serial\]
- name: SKIP
value: \[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]
value: \[Flaky\]|\[NodeFeature:Eviction\]
- name: BUILD_EKS_AMI
value: "true"
- name: BUILD_EKS_AMI_OS
Expand Down
Loading