Merge pull request #28611 from haircommander/swap-sync

crio swap: sync the swap configuration

Author: k8s-ci-robot

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

@@ -129,20 +129,23 @@ periodics:
     containers:
       - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230127-9396ca613c-master
         args:
-          - --repo=k8s.io/kubernetes=master
-          - --timeout=240
           - --root=/go/src
+          - "--job=$(JOB_NAME)"
+          - "--repo=k8s.io/$(REPO_NAME)=$(PULL_REFS)"
           - "--service-account=/etc/service-account/service-account.json"
+          - "--upload=gs://kubernetes-jenkins/pr-logs"
+          - "--timeout=240"
           - --scenario=kubernetes_e2e
-          - --
+          - -- # end bootstrap args, scenario args below
           - --deployment=node
+          - --env=KUBE_SSH_USER=core
           - --gcp-zone=us-west1-b
-          - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/swap/image-config-swap-fedora.yaml
           - '--node-test-args=--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=8 --focus="\[NodeConformance\]|\[NodeFeature:.+\]|\[NodeFeature\]" --skip="\[Flaky\]|\[Slow\]|\[Serial\]"
           - --timeout=180m
+          - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/swap/image-config-swap-fedora.yaml
         env:
           - name: GOPATH
             value: /go
@@ -213,20 +216,23 @@ periodics:
     containers:
     - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20230127-9396ca613c-master
       args:
-      - --repo=k8s.io/kubernetes=master
-      - --timeout=240
       - --root=/go/src
+      - "--job=$(JOB_NAME)"
+      - "--repo=k8s.io/$(REPO_NAME)=$(PULL_REFS)"
       - "--service-account=/etc/service-account/service-account.json"
+      - "--upload=gs://kubernetes-jenkins/pr-logs"
+      - "--timeout=240"
       - --scenario=kubernetes_e2e
-      - --
+      - -- # end bootstrap args, scenario args below
       - --deployment=node
+      - --env=KUBE_SSH_USER=core
       - --gcp-zone=us-west1-b
-      - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/swap/image-config-swap-fedora.yaml
       - '--node-test-args=--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 --focus="\[Serial\]" --skip="\[Flaky\]|\[Slow\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]"
       - --timeout=180m
+      - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/swap/image-config-swap-fedora.yaml
       resources:
         limits:
           cpu: 4
@@ -239,7 +245,6 @@ periodics:
           value: /go
         - name: IGNITION_INJECT_GCE_SSH_PUBLIC_KEY_FILE
           value: "1"
-
 # TODO: migrate performance special config tests to containerd/cri-o
 #- name: ci-kubernetes-node-kubelet-performance-test
 #  interval: 12h

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

@@ -1090,6 +1090,9 @@ presubmits:
           requests:
             cpu: 4
             memory: 6Gi
+        env:
+          - name: IGNITION_INJECT_GCE_SSH_PUBLIC_KEY_FILE
+            value: "1"
   - name: pull-kubernetes-node-swap-ubuntu-serial
     cluster: k8s-infra-prow-build
     always_run: false
@@ -1184,7 +1187,6 @@ presubmits:
           - name: IGNITION_INJECT_GCE_SSH_PUBLIC_KEY_FILE
             value: "1"
 
-
   - name: pull-kubernetes-node-kubelet-credential-provider
     cluster: k8s-infra-prow-build
     always_run: false

jobs/e2e_node/swap/crio_swap1g.ign

@@ -48,14 +48,5 @@
         "name": "crio-install.service"
       }
     ]
-  },
-  "passwd": {
-    "users": [
-      {
-        "name": "prow",
-        "system": true,
-        "groups": ["sudo"]
-      }
-    ]
   }
 }