Merge pull request #35063 from iholder101/swap-lanes-to-run-eviction-tests-remove-parallelism-flag

swap-conformance: Fix setting --parallelism=1

Author: k8s-ci-robot

config/jobs/kubernetes/sig-node/node-kubelet.yaml

@@ -528,13 +528,14 @@ periodics:
         args:
           - --deployment=node
           - --gcp-zone=us-central1-b
+          - --parallelism=1
           - --node-args=--image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/swap/image-config-swap.yaml
           - --env=KUBE_MASTER_EXTRA_METADATA=user-data=/home/prow/go/src/github.com/containerd/containerd/test/e2e/master.yaml,containerd-configure-sh=/home/prow/go/src/github.com/containerd/containerd/cluster/gce/configure.sh,containerd-extra-init-sh=/home/prow/go/src/github.com/containerd/containerd/test/e2e_node/gci-init.sh,containerd-env=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-main/cgroupv2/env-cgroupv2
           - --env=KUBE_NODE_EXTRA_METADATA=user-data=/home/prow/go/src/github.com/containerd/containerd/test/e2e/node.yaml,containerd-configure-sh=/home/prow/go/src/github.com/containerd/containerd/cluster/gce/configure.sh,containerd-extra-init-sh=/home/prow/go/src/github.com/containerd/containerd/test/e2e_node/gci-init.sh,containerd-env=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-main/cgroupv2/env-cgroupv2
           - '--node-test-args=--feature-gates="NodeSwap=true" --service-feature-gates="NodeSwap=true" --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --fail-swap-on=false --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"'
           - --node-tests=true
           - --provider=gce
-          - --test_args=--nodes=1 --parallelism=1 --focus="\[Feature:NodeSwap\]|MemoryAllocatableEviction|PriorityMemoryEvictionOrdering" --skip="\[Flaky\]|\[Benchmark\]"
+          - --test_args=--nodes=1 --focus="\[Feature:NodeSwap\]|MemoryAllocatableEviction|PriorityMemoryEvictionOrdering" --skip="\[Flaky\]|\[Benchmark\]"
           - --timeout=180m
         env:
           - name: GOPATH
@@ -585,10 +586,11 @@ periodics:
       - --deployment=node
       - --env=KUBE_SSH_USER=core
       - --gcp-zone=us-central1-b
+      - --parallelism=1
       - '--node-test-args=--feature-gates="NodeSwap=true" --service-feature-gates="NodeSwap=true" --container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--fail-swap-on=false --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 --parallelism=1 --timeout=4h --focus="\[Feature:NodeSwap\]|MemoryAllocatableEviction|PriorityMemoryEvictionOrdering" --skip="\[Flaky\]|\[Benchmark\]"
+      - --test_args=--nodes=1 --timeout=4h --focus="\[Feature:NodeSwap\]|MemoryAllocatableEviction|PriorityMemoryEvictionOrdering" --skip="\[Flaky\]|\[Benchmark\]"
       - --timeout=270m
       - --node-args=--image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/swap/image-config-swap-fedora.yaml
       resources:

config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml

@@ -2456,13 +2456,14 @@ presubmits:
           args:
             - --deployment=node
             - --gcp-zone=us-central1-b
+            - --parallelism=1
             - --node-args=--image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/swap/image-config-swap.yaml
             - --env=KUBE_MASTER_EXTRA_METADATA=user-data=/home/prow/go/src/github.com/containerd/containerd/test/e2e/master.yaml,containerd-configure-sh=/home/prow/go/src/github.com/containerd/containerd/cluster/gce/configure.sh,containerd-extra-init-sh=/home/prow/go/src/github.com/containerd/containerd/test/e2e_node/gci-init.sh,containerd-env=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-main/cgroupv2/env-cgroupv2
             - --env=KUBE_NODE_EXTRA_METADATA=user-data=/home/prow/go/src/github.com/containerd/containerd/test/e2e/node.yaml,containerd-configure-sh=/home/prow/go/src/github.com/containerd/containerd/cluster/gce/configure.sh,containerd-extra-init-sh=/home/prow/go/src/github.com/containerd/containerd/test/e2e_node/gci-init.sh,containerd-env=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-main/cgroupv2/env-cgroupv2
             - '--node-test-args=--feature-gates=NodeSwap=true --service-feature-gates=NodeSwap=true --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --fail-swap-on=false --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"'
             - --node-tests=true
             - --provider=gce
-            - --test_args=--nodes=1 --parallelism=1 --focus="\[Feature:NodeSwap\]|MemoryAllocatableEviction|PriorityMemoryEvictionOrdering" --skip="\[Flaky\]|\[Benchmark\]"
+            - --test_args=--nodes=1 --focus="\[Feature:NodeSwap\]|MemoryAllocatableEviction|PriorityMemoryEvictionOrdering" --skip="\[Flaky\]|\[Benchmark\]"
             - --timeout=180m
           env:
             - name: GOPATH
@@ -2515,10 +2516,11 @@ presubmits:
         - --deployment=node
         - --env=KUBE_SSH_USER=core
         - --gcp-zone=us-central1-b
+        - --parallelism=1
         - '--node-test-args=--feature-gates="NodeSwap=true" --service-feature-gates="NodeSwap=true" --container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--fail-swap-on=false --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 --parallelism=1 --focus="\[Feature:NodeSwap\]|MemoryAllocatableEviction|PriorityMemoryEvictionOrdering" --skip="\[Flaky\]|\[Benchmark\]"
+        - --test_args=--nodes=1 --focus="\[Feature:NodeSwap\]|MemoryAllocatableEviction|PriorityMemoryEvictionOrdering" --skip="\[Flaky\]|\[Benchmark\]"
         - --timeout=180m
         - --node-args=--image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/swap/image-config-swap-fedora.yaml
         resources: