The Raspberry Pi 3 platforms will be tested on all of rpi_3, rpi_3_32b and rpi_arm64 build configurations. In the case of rpi_arm64, the default environment includes calling the "pci" command in the preboot command, to enumerate USB. The problem here is that if we boot in to rpi_arm64 and we run a saveenv then later we will run the tests on rpi_3 and rpi_3_32b. They do not have the PCI command and so the test harness marks the platform as failing. It is harmless to call the command (as shown by rpi_arm64 doing it safely), so enable it in CI, to cover this case.
Signed-off-by: Tom Rini <[email protected]> --- .gitlab-ci-sage-lab.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci-sage-lab.yml b/.gitlab-ci-sage-lab.yml index 9e1c2378c6ef..4c5a4062b99d 100644 --- a/.gitlab-ci-sage-lab.yml +++ b/.gitlab-ci-sage-lab.yml @@ -186,7 +186,7 @@ Raspberry Pi 3: LABGRID_EXPORTER: "sage-exporter-rpi3-1" LG_PLACE: "rpi3-1" TEST_PY_BD: "rpi_3" - OVERRIDE: "-a UNIT_TEST -a ~CMD_EFIDEBUG -a CMD_BOOTMENU -a CMD_LOG -a CMD_BOOTEFI_SELFTEST -a CMD_TFTPPUT -a FIT -a FIT_SIGNATURE -a FIT_BEST_MATCH -a SYS_BOOTM_LEN=0x4000000 -a BOOTSTAGE -a BOOTSTAGE_STASH -a CMD_BOOTSTAGE -a BOOTSTAGE_STASH_ADDR=0x02400000" + OVERRIDE: "-a PCI -a CMD_PCI -a UNIT_TEST -a ~CMD_EFIDEBUG -a CMD_BOOTMENU -a CMD_LOG -a CMD_BOOTEFI_SELFTEST -a CMD_TFTPPUT -a FIT -a FIT_SIGNATURE -a FIT_BEST_MATCH -a SYS_BOOTM_LEN=0x4000000 -a BOOTSTAGE -a BOOTSTAGE_STASH -a CMD_BOOTSTAGE -a BOOTSTAGE_STASH_ADDR=0x02400000" Raspberry Pi 3 (rpi_arm64): <<: *sage_lab_dfn @@ -206,7 +206,7 @@ Raspberry Pi 3 (rpi_3_32b): LABGRID_EXPORTER: "sage-exporter-rpi3-1" LG_PLACE: "rpi3-1" TEST_PY_BD: "rpi_3_32b" - OVERRIDE: "-a UNIT_TEST -a ~CMD_EFIDEBUG -a CMD_BOOTMENU -a CMD_LOG -a CMD_BOOTEFI_SELFTEST -a CMD_TFTPPUT -a FIT -a FIT_SIGNATURE -a FIT_BEST_MATCH -a SYS_BOOTM_LEN=0x4000000 -a BOOTSTAGE -a BOOTSTAGE_STASH -a CMD_BOOTSTAGE -a BOOTSTAGE_STASH_ADDR=0x02400000" + OVERRIDE: "-a PCI -a CMD_PCI -a UNIT_TEST -a ~CMD_EFIDEBUG -a CMD_BOOTMENU -a CMD_LOG -a CMD_BOOTEFI_SELFTEST -a CMD_TFTPPUT -a FIT -a FIT_SIGNATURE -a FIT_BEST_MATCH -a SYS_BOOTM_LEN=0x4000000 -a BOOTSTAGE -a BOOTSTAGE_STASH -a CMD_BOOTSTAGE -a BOOTSTAGE_STASH_ADDR=0x02400000" Raspberry Pi 3 (rpi_3_32b, lwIP): <<: *sage_lab_dfn @@ -215,4 +215,4 @@ Raspberry Pi 3 (rpi_3_32b, lwIP): LABGRID_EXPORTER: "sage-exporter-rpi3-1" LG_PLACE: "rpi3-1" TEST_PY_BD: "rpi_3_32b" - OVERRIDE: "-a UNIT_TEST -a ~CMD_EFIDEBUG -a CMD_BOOTMENU -a CMD_LOG -a CMD_BOOTEFI_SELFTEST -a FIT -a FIT_SIGNATURE -a FIT_BEST_MATCH -a SYS_BOOTM_LEN=0x4000000 -a BOOTSTAGE -a BOOTSTAGE_STASH -a CMD_BOOTSTAGE -a BOOTSTAGE_STASH_ADDR=0x02400000 -a NET_LWIP" + OVERRIDE: "-a PCI -a CMD_PCI -a UNIT_TEST -a ~CMD_EFIDEBUG -a CMD_BOOTMENU -a CMD_LOG -a CMD_BOOTEFI_SELFTEST -a FIT -a FIT_SIGNATURE -a FIT_BEST_MATCH -a SYS_BOOTM_LEN=0x4000000 -a BOOTSTAGE -a BOOTSTAGE_STASH -a CMD_BOOTSTAGE -a BOOTSTAGE_STASH_ADDR=0x02400000 -a NET_LWIP" -- 2.43.0
