Adding fixes base on QC SoC

Adding supoort for testing against SoC HW with distro=centos-stream-automotive-9 Signed-off-by: Yariv Rachmani <[email protected]>
containers · Jan 26, 2024 · e6f32bd · e6f32bd
1 parent c6dab9e
commit e6f32bd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/plans/e2e/ffi.fmf b/plans/e2e/ffi.fmf
@@ -2,6 +2,7 @@ summary: FFI - QM FreedomFromInterference
 
 environment:
     CONTROL_CONTAINER_NAME: host
+    FFI_SETUP_OPTIONS: none
 
 discover:
     how: fmf
@@ -10,24 +11,30 @@ discover:
 provision:
    how: local
 
+prepare:
+ - name: Install rpms
+   how: install
+   package: podman
+
 adjust:
  - when: run == manual
    environment+:
        # Sample code to use manual packit repo
        PACKIT_COPR_PROJECT: packit/containers-qm-291
- - when: scenario == ffi and distro == centos-stream-9, fedora
-   prepare+:
-      - name: Install rpms
-        how: install
-        package: podman
 
+ - when: distro == centos-stream-9, fedora
+   environment+:
+       FFI_SETUP_OPTIONS: --set-qm-disk-part=yes
+
+ - when: scenario == ffi
+   prepare+:
       - name: Set QM env
         how: shell
            # FIXME: On new QM release remove
            # qm-setup-from-gh-url, branch-qm option
         script: |
            cd tests/e2e
-           ./set-ffi-env-e2e --set-qm-disk-part=yes
+           ./set-ffi-env-e2e "${FFI_SETUP_OPTIONS}"
 
 execute:
     how: tmt

diff --git a/tests/e2e/set-ffi-env-e2e b/tests/e2e/set-ffi-env-e2e
@@ -187,7 +187,7 @@ install_qm_rpms() {
   if [ -n "${USE_QM_COPR}" ]; then
       dnf copr enable -y "${USE_QM_COPR}" centos-stream-9
   fi
-  dnf install -y bluechi-ctl bluechi-agent bluechi-controller qm podman hostname
+  dnf install -y bluechi-ctl bluechi-agent bluechi-controller qm hostname
 }
 
 setup_qm_services() {