Fixes related to arm64

last fixes after rerunnig on clean arm64 Adding option to run with AutoSD, release repos Once setting PACKIT_COPR_PROJECT=release Signed-off-by: Yariv Rachmani <[email protected]>
containers · Feb 15, 2024 · f93f760 · f93f760
1 parent f58cc87
commit f93f760
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/setup b/setup
@@ -98,7 +98,7 @@ storage() {
 	      "${ROOTFS}/var/lib/shared/overlay-layers/layers.lock"
 
         sed -e '/additionalimage.*/,/]/s/^#//g' \
-            -e '/additionalimages.*/{n;s|.*|\"\/var\/lib\/shared/\",|}' \
+            -e '/additionalimages.*/a\"/var\/lib\/shared/\",' \
             -e 's|^#.*transient_store.*|transient_store=true|g' \
             /"${ROOTFS}/usr/share/containers/storage.conf" \
             > "${ROOTFS}/etc/containers/storage.conf"

diff --git a/tests/e2e/set-ffi-env-e2e b/tests/e2e/set-ffi-env-e2e
@@ -183,8 +183,9 @@ install_qm_rpms() {
   info_message "=============================="
   dnf install -y 'dnf-command(config-manager)'
   dnf config-manager --set-enabled crb
-  dnf copr enable -y @centos-automotive-sig/bluechi-snapshot centos-stream-9
-  if [ -n "${USE_QM_COPR}" ]; then
+
+  if [[ -n "${USE_QM_COPR}" && "${USE_QM_COPR}" != "release" ]]; then
+      dnf copr enable -y @centos-automotive-sig/bluechi-snapshot centos-stream-9
       dnf copr enable -y "${USE_QM_COPR}" centos-stream-9
   fi
   dnf install -y bluechi-ctl bluechi-agent bluechi-controller qm hostname

diff --git a/tests/ffi/agent-flood/test.sh b/tests/ffi/agent-flood/test.sh
@@ -14,7 +14,7 @@ setup_test_containers_in_qm() {
     #Prepare quadlet files for testing containers
     for ((i=1;i<=NUMBER_OF_NODES;i++)); do
         info_message "setup_test_containers_in_qm(): prepare quadlet files for bluechi-tester-${i}.container"
-        cat >> "/etc/qm/containers/systemd/bluechi-tester-${i}.container" <<EOF
+        cat > "/etc/qm/containers/systemd/bluechi-tester-${i}.container" <<EOF
 [Unit]
 Description=bluechi-tester-X
 After=local-fs.target

diff --git a/tests/ffi/common/prepare.sh b/tests/ffi/common/prepare.sh
@@ -19,6 +19,11 @@ prepare_test() {
    fi
    # FIXME: QM is failing to start run podman #297 on asil space
    exec_cmd "restorecon -RFv /var/lib/containers &> /tmp/asil-restorecon"
+   # FIXME: oom killer not triggerd for qm processes
+   # 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
 }
 
 disk_cleanup() {
@@ -43,7 +48,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 ${image_id}"
+       exec_cmd "podman image rm -f ${image_id}"
    fi
 }