containers/testnode: Install podman

To get a recent version we have to switch OSes.

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/containers/testnode/Dockerfile b/containers/testnode/Dockerfile
index 355b6951f85bc4007eb11362f218b25295db8b1b..8a16657f576fe1b4915bb27f6620967f375a1f03 100644 (file)
--- a/containers/testnode/Dockerfile
+++ b/containers/testnode/Dockerfile
@@ -1,15 +1,12 @@
-FROM ubuntu:focal
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt update && \
-    apt -y install \
-        sudo \
-        openssh-server \
-        hostname \
-        curl \
-        python3-pip \
-        apache2 \
-        nfs-kernel-server && \
-    apt clean all
+FROM quay.io/centos/centos:stream9
+RUN dnf -y install \
+    sudo \
+    openssh-server \
+    hostname \
+    python3-pip \
+    httpd \
+    podman && \
+    dnf clean all
 COPY testnode_start.sh /
 COPY testnode_stop.sh /
 COPY testnode_sudoers /etc/sudoers.d/teuthology
@@ -18,6 +15,7 @@ RUN \
     sed -i 's/#PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config && \
     mkdir -p /root/.ssh && \
     chmod 700 /root/.ssh && \
+    groupadd sudo && \
     useradd -g sudo ubuntu && \
     mkdir -p /home/ubuntu/.ssh && \
     chmod 700 /home/ubuntu/.ssh && \

diff --git a/containers/testnode/testnode_start.sh b/containers/testnode/testnode_start.sh
index 46d44179eb4a21baf30928fe668f660731a255f4..d3e208e206e67c16394c08acc4cec590f25e629c 100755 (executable)
--- a/containers/testnode/testnode_start.sh
+++ b/containers/testnode/testnode_start.sh
@@ -3,7 +3,7 @@ set -x
 cat /run/secrets/id_rsa.pub >> /root/.ssh/authorized_keys
 cat /run/secrets/id_rsa.pub >> /home/ubuntu/.ssh/authorized_keys
 chown ubuntu /home/ubuntu/.ssh/authorized_keys
-payload="{\"name\": \"$(hostname)\", \"machine_type\": \"testnode\", \"up\": true, \"locked\": false, \"os_type\": \"ubuntu\", \"os_version\": \"20.04\"}"
+payload="{\"name\": \"$(hostname)\", \"machine_type\": \"testnode\", \"up\": true, \"locked\": false, \"os_type\": \"centos\", \"os_version\": \"8.stream\"}"
 for i in $(seq 1 5); do
     echo "attempt $i"
     curl -v -f -d "$payload" http://paddles:8080/nodes/ && break

diff --git a/containers/testnode/testnode_stop.sh b/containers/testnode/testnode_stop.sh
index 2e1044d807a2794819b8be4a337238ed198c892e..2c84fb27223d31eb7b072875fd5bcba9902ea29f 100755 (executable)
--- a/containers/testnode/testnode_stop.sh
+++ b/containers/testnode/testnode_stop.sh
@@ -7,4 +7,4 @@ for i in $(seq 1 5); do
     curl -s -f -X PUT -d "$payload" http://paddles:8080/nodes/$hostname/ && break
     sleep 1
 done
-pkill sshd
\ No newline at end of file
+telinit 0