Merge pull request #14383 from alanmcanonical/mtu

Restrict mtu size for podman

Author: Mab879

Dockerfiles/test_suite-ubuntu2204

@@ -26,11 +26,9 @@ RUN true \
 RUN true \
         && ssh-keygen -A \
         && mkdir -p /root/.ssh \
+        && mkdir /run/sshd && chmod 0755 /run/sshd \
         && printf "%s\n" "$CLIENT_PUBLIC_KEY" >> "$AUTH_KEYS" \
         && chmod og-rw /root/.ssh "$AUTH_KEYS" \
         && sed -i '/session\s\+required\s\+pam_loginuid.so/d' /etc/pam.d/sshd \
         && echo CPE_NAME="cpe:/o:canonical:ubuntu_linux:22.04" >> /etc/os-release \
 && true
-
-RUN mkdir /run/sshd
-CMD ["/usr/sbin/sshd", "-D"]

Dockerfiles/test_suite-ubuntu2404

@@ -19,10 +19,9 @@ RUN true \
 RUN true \
         && ssh-keygen -A \
         && mkdir -p /root/.ssh \
+        && mkdir /run/sshd && chmod 0755 /run/sshd \
         && printf "%s\n" "$CLIENT_PUBLIC_KEY" >> "$AUTH_KEYS" \
         && chmod og-rw /root/.ssh "$AUTH_KEYS" \
         && sed -i '/session\s\+required\s\+pam_loginuid.so/d' /etc/pam.d/sshd \
-        && echo CPE_NAME="cpe:/o:canonical:ubuntu_linux:24.04" >> /etc/os-release
-
-RUN mkdir /run/sshd
-CMD ["/usr/sbin/sshd", "-D"]
+        && echo CPE_NAME="cpe:/o:canonical:ubuntu_linux:24.04" >> /etc/os-release \
+&& true

tests/ssg_test_suite/test_env.py

@@ -533,6 +533,7 @@ def _new_container_from_image(self, image_name, container_name):
                       "--cap-add=cap_sys_admin",
                       "--cap-add=cap_sys_chroot",
                     #   "--privileged",
+                      "--network", "slirp4netns:mtu=1500",
                       "--publish", "{}".format(self.internal_ssh_port), "--detach", image_name,
                       "/usr/sbin/sshd", "-p", "{}".format(self.internal_ssh_port), "-D"]
         try: