Skip to content

Commit 9aadff2

Browse files
authored
Merge pull request #28723 from haircommander/swap-prow
crio: finish adding core user to swap and serial jobs
2 parents ceed3e4 + 9ec4768 commit 9aadff2

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ periodics:
9494
- --scenario=kubernetes_e2e
9595
- --
9696
- --deployment=node
97+
- --env=KUBE_SSH_USER=core
9798
- --gcp-zone=us-west1-b
9899
- '--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\"]}"'
99100
- --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/crio/latest/image-config-cgrpv1-serial.yaml
@@ -184,7 +185,6 @@ periodics:
184185
- --scenario=kubernetes_e2e
185186
- --
186187
- --deployment=node
187-
- --env=KUBE_SSH_USER=core
188188
- --gcp-zone=us-west1-b
189189
- --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/swap/image-config-swap.yaml
190190
- '--node-test-args=--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*\"]}"'
@@ -226,6 +226,7 @@ periodics:
226226
- --scenario=kubernetes_e2e
227227
- -- # end bootstrap args, scenario args below
228228
- --deployment=node
229+
- --env=KUBE_SSH_USER=core
229230
- --gcp-zone=us-west1-b
230231
- '--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\"]}"'
231232
- --node-tests=true

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,6 +1077,7 @@ presubmits:
10771077
- --scenario=kubernetes_e2e
10781078
- -- # end bootstrap args, scenario args below
10791079
- --deployment=node
1080+
- --env=KUBE_SSH_USER=core
10801081
- --gcp-zone=us-west1-b
10811082
- '--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\"]}"'
10821083
- --node-tests=true
@@ -1167,6 +1168,7 @@ presubmits:
11671168
- --scenario=kubernetes_e2e
11681169
- -- # end bootstrap args, scenario args below
11691170
- --deployment=node
1171+
- --env=KUBE_SSH_USER=core
11701172
- --gcp-zone=us-west1-b
11711173
- '--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\"]}"'
11721174
- --node-tests=true

0 commit comments

Comments
 (0)