e2e-tests: Send journal via TCP if host doesn't support VSOCK yet

systemd only supports sending the journal via VSOCK since v256. In the
GitHub CI the newest Ubuntu release we can use on the runners (both
GitHub-hosted or self-hosted) is 24.04, which has systemd 255.

Author: adombeck

authd-oidc-brokers/e2e-tests/resources/authd/Journal.py

@@ -10,6 +10,26 @@
 HOST_CID = 2 # 2 always refers to the host
 PORT = 55000
 
+def libvirt_host_ip() -> str:
+    # Get the bridge name for the default libvirt network
+    bridge = ExecUtils.check_output(
+        ["virsh", "net-info", "default"],
+        text=True,
+    ).split("Bridge:")[1].split()[0]
+
+    # Get the IPv4 address assigned to that bridge
+    ip = ExecUtils.check_output(
+        ["ip", "-4", "addr", "show", bridge],
+        text=True,
+    )
+
+    host_ip = next(
+        line.split()[1].split("/")[0]
+        for line in ip.splitlines()
+        if line.strip().startswith("inet ")
+    )
+    return host_ip
+
 @library
 class Journal:
     process = None
@@ -28,10 +48,16 @@ async def start_receiving_journal(self) -> None:
         self.output_dir = os.path.join(output_dir, suite_name, "journal")
         os.makedirs(self.output_dir, exist_ok=True)
 
+        if os.getenv("SYSTEMD_SUPPORTS_VSOCK"):
+            listen_address = f"vsock:{HOST_CID}:{PORT}"
+        else:
+            host_ip = libvirt_host_ip()
+            listen_address = f"{host_ip}:{PORT}"
+
         self.process = ExecUtils.Popen(
             [
                 "/lib/systemd/systemd-journal-remote",
-                f"--listen-raw=vsock:{HOST_CID}:{PORT}",
+                f"--listen-raw={listen_address}",
                 f"--output={self.output_dir}"
             ],
         )

authd-oidc-brokers/e2e-tests/run-tests.sh

@@ -113,6 +113,11 @@ if [ -n "${RERUNFAILED:-}" ] && [ -z "${PREVIOUS_TEST_RUN_DIR}" ]; then
     exit 1
 fi
 
+systemd_ver=$(systemctl --version | awk 'NR==1 {print $2}')
+if dpkg --compare-versions "$systemd_ver" "ge" "256"; then
+    SYSTEMD_SUPPORTS_VSOCK=1
+fi
+
 ROBOT_ARGS=()
 if [ -n "${RERUNFAILED:-}" ]; then
     echo "Rerunning failed tests from previous run in ${PREVIOUS_TEST_RUN_DIR}"
@@ -163,19 +168,21 @@ for test_file in $TESTS_TO_RUN; do
     ln -s "${test_file}" tests
 done
 
-E2E_USER="$E2E_USER" \
-E2E_PASSWORD="$E2E_PASSWORD" \
-TOTP_SECRET="$TOTP_SECRET" \
-BROKER="$BROKER" \
-RELEASE="$RELEASE" \
-VNC_PORT="$VNC_PORT" \
-robot \
-    --loglevel DEBUG \
-    --pythonpath "${YARF_DIR}/yarf/rf_libraries/libraries/vnc" \
-    --outputdir "${OUTPUT_DIR}" \
-    "${ROBOT_ARGS[@]}" \
-    "$@" \
-    tests \
-    || test_result=$?
+env \
+    E2E_USER="$E2E_USER" \
+    E2E_PASSWORD="$E2E_PASSWORD" \
+    TOTP_SECRET="$TOTP_SECRET" \
+    BROKER="$BROKER" \
+    RELEASE="$RELEASE" \
+    VNC_PORT="$VNC_PORT" \
+    SYSTEMD_SUPPORTS_VSOCK="${SYSTEMD_SUPPORTS_VSOCK:-}" \
+    robot \
+        --loglevel DEBUG \
+        --pythonpath "${YARF_DIR}/yarf/rf_libraries/libraries/vnc" \
+        --outputdir "${OUTPUT_DIR}" \
+        "${ROBOT_ARGS[@]}" \
+        "$@" \
+        tests \
+        || test_result=$?
 
 exit "${test_result:-0}"

authd-oidc-brokers/e2e-tests/vm/cloud-init-template-noble.yaml

@@ -94,7 +94,7 @@ write_files:
 
       [Service]
       Type=simple
-      ExecStart=/bin/bash -o pipefail -c 'journalctl -b --lines=all -o export -f | socat - VSOCK-CONNECT:2:55000'
+      ExecStart=/bin/bash -o pipefail -c 'journalctl -b --lines=all -o export -f | socat - ${SOCAT_ADDRESS}'
       OOMScoreAdjust=-1000
       Restart=always
       RestartSec=1

authd-oidc-brokers/e2e-tests/vm/cloud-init-template-questing.yaml

@@ -69,7 +69,7 @@ write_files:
   - path: /etc/systemd/journald.conf.d/00-forward-to-vsock.conf
     content: |
       [Journal]
-      ForwardToSocket=vsock:2:55000
+      ForwardToSocket=${JOURNAL_FORWARD_SOCKET}
 
 runcmd:
   # Disable apport

authd-oidc-brokers/e2e-tests/vm/provision-ubuntu.sh

@@ -146,8 +146,21 @@ if [ ! -f "${CLOUD_INIT_ISO}" ]; then
     CLOUD_INIT_DIR="$(mktemp -d)"
     trap 'rm -rf ${CLOUD_INIT_DIR}' EXIT
 
+    systemd_ver=$(systemctl --version | awk 'NR==1 {print $2}')
+    if dpkg --compare-versions "$systemd_ver" "ge" "256"; then
+        JOURNAL_FORWARD_SOCKET="vsock:2:55000"
+        SOCAT_ADDRESS="VSOCK-CONNECT:2:55000"
+    else
+        iface=$(virsh net-info default | awk '/Bridge:/ {print $2}')
+        ip=$(ip -4 addr show "${iface}" | awk '/inet / {print $2}' | cut -d/ -f1)
+        JOURNAL_FORWARD_SOCKET="${ip}:55000"
+        SOCAT_ADDRESS="TCP:${ip}:55000"
+    fi
+
     SSH_PUBLIC_KEY=$(cat "${SSH_PUBLIC_KEY_FILE}") \
-        envsubst < "${CLOUD_INIT_TEMPLATE}" > "${CLOUD_INIT_DIR}/user-data"
+      JOURNAL_FORWARD_SOCKET="${JOURNAL_FORWARD_SOCKET}" \
+      SOCAT_ADDRESS="${SOCAT_ADDRESS}" \
+      envsubst < "${CLOUD_INIT_TEMPLATE}" > "${CLOUD_INIT_DIR}/user-data"
 
     cloud-localds "${CLOUD_INIT_ISO}" "${CLOUD_INIT_DIR}/user-data"
 else