TZ update to sync tier-0 testing

remove containers host containers from disk on cleanup Remove qm.service update referencing to usage of drop-in files Reorgnizing tests call and definition inside ffi/common/prepare.sh Signed-off-by: Yariv Rachmani <[email protected]>
containers · Jul 16, 2024 · 89b24c6 · 89b24c6
1 parent 7856625
commit 89b24c6
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 59 deletions.
diff --git a/tests/e2e/lib/container b/tests/e2e/lib/container
@@ -62,6 +62,7 @@ file: ${container_file} tag: ${container_tag}"
     # Execute the container
     eval "$(podman run -d \
                 --privileged \
+                --tz local \
                 --network podmanDualStack \
                 --name "${container_name}" \
                 --hostname "${container_name}" \

diff --git a/tests/ffi/common/prepare.sh b/tests/ffi/common/prepare.sh
@@ -2,33 +2,31 @@
 # shellcheck disable=SC1091
 . ../../e2e/lib/utils
 
+DROP_IN_DIR="/etc/containers/systemd/qm.container.d/"
+export QM_HOST_REGISTRY_DIR="/var/qm/lib/containers/registry"
+export QM_REGISTRY_DIR="/var/lib/containers/registry"
+
 prepare_test() {
-   qm_service_file=$(systemctl show -P  SourcePath qm)
-   #create backup file for qm unit file
-   qm_service_backup=$(mktemp -d -p /tmp)/qm.service
-   if_error_exit "cannot create temp dir under /tmp/"
-   exec_cmd "cp ${qm_service_file} ${qm_service_backup}"
-   # Remove 'DropCapability=sys_resource' enable nested container in QM
-   exec_cmd "sed -i 's|DropCapability=sys_resource|#DropCapability=sys_resource|' \
-            ${qm_service_file}"
-   exec_cmd "restorecon -RFv /var/lib/containers"
-   # Create qm container custom config folder
-   exec_cmd "mkdir -p /etc/containers/systemd/qm.container.d"
-   # FIXME: This action should be performed if necessary through systemd drop-in files.
-   #
-   # # Changing QM score to 1000 to avoid full memory error on SoC
-   # if [[ -n "${PACKIT_COPR_PROJECT}" && "${PACKIT_COPR_PROJECT}" == "release" ]]; then
-   #   exec_cmd "sed -i 's|OOMScoreAdjust.*|OOMScoreAdjust=1000|' ${qm_service_file}"
-   # fi
+   # Search variables for upsate file in qm.container
+   # qm_service_file=$(systemctl show -P  SourcePath qm)
+   # Create qm container custom config folder for qm drop-in file.
+   # Use drop-in files to update qm_service_file
+   # please refer 'zcat $(man -w qm.8) | grep -i "^\.sh" | grep drop-in'
+   exec_cmd "mkdir -p ${DROP_IN_DIR}"
 }
 
 disk_cleanup() {
-   exec_cmd "systemctl stop qm"
+   exec_cmd "podman exec -it qm /bin/bash -c \"podman  rmi -f --all\""
+   # Clean large size files created by tests inside qm part
    remove_file=$(find /var/qm -size  +2G)
-   exec_cmd "rm -f $remove_file"
-   remove_qm_custom_conf_files=$(find /etc/containers/systemd/qm.container.d -type f)
-   exec_cmd "rm -f $remove_qm_custom_conf_files"
-   exec_cmd "systemctl start qm"
+   exec_cmd "rm -rf $remove_file"
+   # Clean drop-in files used for tests
+   if test -d "${DROP_IN_DIR=}"; then
+      exec_cmd "rm -rf ${DROP_IN_DIR}"
+   fi
+   exec_cmd "systemctl daemon-reload"
+   exec_cmd "systemctl restart qm"
+   # Clean large size files created by tests inside host part
    remove_file=$(find /root -size  +1G)
    exec_cmd "rm -f $remove_file"
 }
@@ -46,7 +44,7 @@ prepare_images() {
        exec_cmd "mkdir -p ${QM_HOST_REGISTRY_DIR}"
        exec_cmd "podman push ${image_id} dir:${QM_HOST_REGISTRY_DIR}/tools-ffi:latest"
        # Remove image to save /var space
-       exec_cmd "podman image rm -f ${image_id}"
+       exec_cmd "podman rmi -f ${image_id}"
    fi
 }
 

diff --git a/tests/ffi/deny_sched_setattr/test.sh b/tests/ffi/deny_sched_setattr/test.sh
@@ -3,8 +3,6 @@
 # shellcheck source=tests/ffi/common/prepare.sh
 . ../common/prepare.sh
 
-export QM_HOST_REGISTRY_DIR="/var/qm/lib/containers/registry"
-export QM_REGISTRY_DIR="/var/lib/containers/registry"
 expected_result="sched_setattr failed: Operation not permitted"
 
 disk_cleanup

diff --git a/tests/ffi/deny_set_scheduler/test.sh b/tests/ffi/deny_set_scheduler/test.sh
@@ -3,8 +3,6 @@
 # shellcheck source=tests/ffi/common/prepare.sh
 . ../common/prepare.sh
 
-export QM_HOST_REGISTRY_DIR="/var/qm/lib/containers/registry"
-export QM_REGISTRY_DIR="/var/lib/containers/registry"
 expected_result="Failed to set scheduler: Operation not permitted"
 
 disk_cleanup
@@ -22,4 +20,4 @@ if [[ "${return_from_setscheduler}" =~ ${expected_result} ]]; then
 else
     info_message "set_scheduler() syscall can be executed in QM."
     exit 1
-fi
+fi
diff --git a/tests/ffi/disk/test.sh b/tests/ffi/disk/test.sh
@@ -5,9 +5,9 @@
 . ../common/prepare.sh
 
 disk_cleanup
-prepare_test
+prepare_images
 
-cat << EOF > /etc/containers/systemd/qm.container.d/oom.conf
+cat << EOF > "${DROP_IN_DIR}"/oom.conf
 [Service]
 OOMScoreAdjust=1000
 EOF

diff --git a/tests/ffi/memory/main.fmf b/tests/ffi/memory/main.fmf
@@ -1,6 +1,6 @@
 summary: Test is calling systemd as stand alone test
 test: /bin/bash ./test.sh
-duration: 10m
+duration: 15m
 tag: ffi
 framework: shell
 id: fff26f33-a051-4d9e-aae2-97935e425273
diff --git a/tests/ffi/memory/test.sh b/tests/ffi/memory/test.sh
@@ -4,22 +4,13 @@
 
 . ../common/prepare.sh
 
-export QM_HOST_REGISTRY_DIR="/var/qm/lib/containers/registry"
-export QM_REGISTRY_DIR="/var/lib/containers/registry"
-
 disk_cleanup
-prepare_test
+prepare_images
 reload_config
 
 exec_cmd "podman run -d --rm --replace -d --name ffi-asil \
           quay.io/centos-sig-automotive/ffi-tools:latest \
           ./ASIL/20_percent_memory_eat > /dev/null"
-# Copy container image registry to /var/qm/lib/containers
-image_id=$(podman images | grep quay.io/centos-sig-automotive/ffi-tools | awk -F " " '{print $3}')
-if [ ! -d "${QM_HOST_REGISTRY_DIR}" ]; then
-    exec_cmd "mkdir -p ${QM_HOST_REGISTRY_DIR}"
-    exec_cmd "podman push ${image_id} dir:${QM_HOST_REGISTRY_DIR}/tools-ffi:latest"
-fi
 
 podman exec -it qm /bin/bash -c \
          "podman run  --replace --name ffi-qm  dir:${QM_REGISTRY_DIR}/tools-ffi:latest \

diff --git a/tests/ffi/modules/test.sh b/tests/ffi/modules/test.sh
@@ -4,9 +4,6 @@
 
 . ../common/prepare.sh
 
-export QM_HOST_REGISTRY_DIR="/var/qm/lib/containers/registry"
-export QM_REGISTRY_DIR="/var/lib/containers/registry"
-
 disk_cleanup
 prepare_test
 reload_config

diff --git a/tests/ffi/qm-oom-score-adj/main.fmf b/tests/ffi/qm-oom-score-adj/main.fmf
@@ -1,5 +1,5 @@
 summary: Test the qm's oom-score-adj values
-test: /bin/bash ./test.sh
+test: /bin/bash  ./test.sh
 duration: 10m
 tag: ffi
 framework: shell

diff --git a/tests/ffi/qm-oom-score-adj/test.sh b/tests/ffi/qm-oom-score-adj/test.sh
@@ -4,20 +4,10 @@
 
 . ../common/prepare.sh
 
-export QM_HOST_REGISTRY_DIR="/var/qm/lib/containers/registry"
-export QM_REGISTRY_DIR="/var/lib/containers/registry"
-
 disk_cleanup
-prepare_test
+prepare_images
 reload_config
 
-# Copy container image registry to /var/qm/lib/containers
-image_id=$(podman images | grep quay.io/centos-sig-automotive/ffi-tools | awk -F " " '{print $3}')
-if [ ! -d "${QM_HOST_REGISTRY_DIR}" ]; then
-    exec_cmd "mkdir -p ${QM_HOST_REGISTRY_DIR}"
-    exec_cmd "podman push ${image_id} dir:${QM_HOST_REGISTRY_DIR}/tools-ffi:latest"
-fi
-
 podman exec -it qm /bin/bash -c \
          "podman run -d --replace --name ffi-qm  dir:${QM_REGISTRY_DIR}/tools-ffi:latest \
           /usr/bin/sleep infinity > /dev/null"

diff --git a/tests/ffi/sysctl/test.sh b/tests/ffi/sysctl/test.sh
@@ -4,9 +4,6 @@
 
 . ../common/prepare.sh
 
-export QM_HOST_REGISTRY_DIR="/var/qm/lib/containers/registry"
-export QM_REGISTRY_DIR="/var/lib/containers/registry"
-
 disk_cleanup
 prepare_test
 reload_config