Skip to content

Commit f6c10e5

Browse files
committed
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]>
1 parent 5c77640 commit f6c10e5

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

Diff for: plans/e2e/ffi.fmf

+13-6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ summary: FFI - QM FreedomFromInterference
22

33
environment:
44
CONTROL_CONTAINER_NAME: host
5+
FFI_SETUP_OPTIONS: none
56

67
discover:
78
how: fmf
@@ -10,24 +11,30 @@ discover:
1011
provision:
1112
how: local
1213

14+
prepare:
15+
- name: Install rpms
16+
how: install
17+
package: podman
18+
1319
adjust:
1420
- when: run == manual
1521
environment+:
1622
# Sample code to use manual packit repo
1723
PACKIT_COPR_PROJECT: packit/containers-qm-291
18-
- when: scenario == ffi and distro == centos-stream-9, fedora
19-
prepare+:
20-
- name: Install rpms
21-
how: install
22-
package: podman
2324

25+
- when: distro == centos-stream-9, fedora
26+
environment+:
27+
FFI_SETUP_OPTIONS: --set-qm-disk-part=yes
28+
29+
- when: scenario == ffi
30+
prepare+:
2431
- name: Set QM env
2532
how: shell
2633
# FIXME: On new QM release remove
2734
# qm-setup-from-gh-url, branch-qm option
2835
script: |
2936
cd tests/e2e
30-
./set-ffi-env-e2e --set-qm-disk-part=yes
37+
./set-ffi-env-e2e "${FFI_SETUP_OPTIONS}"
3138

3239
execute:
3340
how: tmt

Diff for: tests/e2e/set-ffi-env-e2e

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ install_qm_rpms() {
187187
if [ -n "${USE_QM_COPR}" ]; then
188188
dnf copr enable -y "${USE_QM_COPR}" centos-stream-9
189189
fi
190-
dnf install -y bluechi-ctl bluechi-agent bluechi-controller qm podman hostname
190+
dnf install -y bluechi-ctl bluechi-agent bluechi-controller qm hostname
191191
}
192192

193193
setup_qm_services() {

0 commit comments

Comments
 (0)