From 5493e2d3300c115795987d6f63134af2437e83fc Mon Sep 17 00:00:00 2001 From: Adam King Date: Mon, 30 Jan 2023 11:27:09 -0500 Subject: [PATCH] qa/cephadm: add check that iscsi daemon /etc/hosts matches host /etc/hosts To make sure we aren't being affected by any podman introduced changes to the /etc/hosts file and test that we're properly mounting /etc/hosts in our daemon containers Signed-off-by: Adam King --- .../+ | 0 .../.qa | 0 .../centos_8.stream_container_tools.yaml | 0 .../test_iscsi_container.yaml} | 1 + qa/workunits/cephadm/test_iscsi_etc_hosts.sh | 21 +++++++++++++++++++ 5 files changed, 22 insertions(+) rename qa/suites/orch/cephadm/workunits/task/{test_iscsi_pids_limit => test_iscsi_container}/+ (100%) rename qa/suites/orch/cephadm/workunits/task/{test_iscsi_pids_limit => test_iscsi_container}/.qa (100%) rename qa/suites/orch/cephadm/workunits/task/{test_iscsi_pids_limit => test_iscsi_container}/centos_8.stream_container_tools.yaml (100%) rename qa/suites/orch/cephadm/workunits/task/{test_iscsi_pids_limit/test_iscsi_pids_limit.yaml => test_iscsi_container/test_iscsi_container.yaml} (88%) create mode 100755 qa/workunits/cephadm/test_iscsi_etc_hosts.sh diff --git a/qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit/+ b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/+ similarity index 100% rename from qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit/+ rename to qa/suites/orch/cephadm/workunits/task/test_iscsi_container/+ diff --git a/qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit/.qa b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/.qa similarity index 100% rename from qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit/.qa rename to qa/suites/orch/cephadm/workunits/task/test_iscsi_container/.qa diff --git a/qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit/centos_8.stream_container_tools.yaml b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_8.stream_container_tools.yaml similarity index 100% rename from qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit/centos_8.stream_container_tools.yaml rename to qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_8.stream_container_tools.yaml diff --git a/qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit/test_iscsi_pids_limit.yaml b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/test_iscsi_container.yaml similarity index 88% rename from qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit/test_iscsi_pids_limit.yaml rename to qa/suites/orch/cephadm/workunits/task/test_iscsi_container/test_iscsi_container.yaml index b271777e187..19d302c87de 100644 --- a/qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit/test_iscsi_pids_limit.yaml +++ b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/test_iscsi_container.yaml @@ -18,3 +18,4 @@ tasks: clients: client.0: - cephadm/test_iscsi_pids_limit.sh + - cephadm/test_iscsi_etc_hosts.sh diff --git a/qa/workunits/cephadm/test_iscsi_etc_hosts.sh b/qa/workunits/cephadm/test_iscsi_etc_hosts.sh new file mode 100755 index 00000000000..adbc34a926a --- /dev/null +++ b/qa/workunits/cephadm/test_iscsi_etc_hosts.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +# checks if the container and host's /etc/hosts files match +# Necessary to avoid potential bugs caused by podman making +# edits to /etc/hosts file in the container +# exits with code 1 if host and iscsi container /etc/hosts do no match + +set -ex + +ISCSI_DAEMON=$(sudo /home/ubuntu/cephtest/cephadm ls | jq -r '.[] | select(.service_name == "iscsi.foo") | .name') +sudo /home/ubuntu/cephtest/cephadm enter --name $ISCSI_DAEMON -- cat /etc/hosts > iscsi_daemon_etc_hosts.txt +if cmp --silent /etc/hosts iscsi_daemon_etc_hosts.txt; then + echo "Daemon and host /etc/hosts files successfully matched" +else + echo "ERROR: /etc/hosts on host did not match /etc/hosts in the iscsi container!" + echo "Host /etc/hosts:" + cat /etc/hosts + echo "Iscsi container /etc/hosts:" + cat iscsi_daemon_etc_hosts.txt + exit 1 +fi -- 2.39.5