CI: add common fvp yml file
PATCH 1/1 CI: add common fvp yml file
Bring fvp-base and fvp-base-arm32 to match what is currently being done in other fvps, and clean up the fvps to use a single fvp yml file (which should enable better adding and removing of issues common to fvps, like xorg test bugs).
Signed-off-by Jon Mason <[email protected]>
--- ci/corstone1000-fvp.yml | 2 +- ci/corstone500.yml | 4 ++-- ci/fvp-base-arm32.yml | 13 +------------ ci/fvp-base.yml | 13 +------------ ci/fvp.yml | 11 +++++++++++ meta-arm-bsp/conf/machine/include/fvp-common.inc | 3 +++ 6 files changed, 19 insertions(+), 27 deletions(-) create mode 100644 ci/fvp.yml
ci/corstone1000-fvp.yml +1 -1
@@ -2,11 +2,11 @@ header: version: 11 includes: - ci/corstone1000-common.yml + - ci/fvp.yml local_conf_header: fvp-config: | # Remove Dropbear SSH as it will not fit into the corstone1000 image. IMAGE_FEATURES:remove = " ssh-server-dropbear" - INHERIT += "fvpboot" machine: corstone1000-fvp
ci/corstone500.yml +2 -2
@@ -2,10 +2,10 @@ header: version: 11 includes: - ci/base.yml + - ci/fvp.yml local_conf_header: - testimagefvp: | - INHERIT += "fvpboot" + fvp-config: | IMAGE_FEATURES:remove = " ssh-server-dropbear" extrapackages: | # Intentionally blank to prevent perf from being added to the image in base.yml
ci/fvp-base-arm32.yml +1 -12
@@ -2,17 +2,6 @@ header: version: 11 includes: - ci/base.yml + - ci/fvp.yml machine: fvp-base-arm32 - -local_conf_header: - testimagefvp: | - INHERIT = "fvpboot" - # This fails but we can't add to the ignorelist from meta-arm yet - # https://bugzilla.yoctoproject.org/show_bug.cgi?id=14604 - TEST_SUITES:remove = "parselogs" - # Tell testimage to connect to localhost:8122, and forward that to SSH in the FVP. - TEST_TARGET_IP = "127.0.0.1:8122" - FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] = "8122=22" - failing_tests: | - TEST_SUITES:remove = "xorg"
ci/fvp-base.yml +1 -12
@@ -2,17 +2,6 @@ header: version: 11 includes: - ci/base.yml + - ci/fvp.yml machine: fvp-base - -local_conf_header: - testimagefvp: | - INHERIT += "fvpboot" - # This fails but we can't add to the ignorelist from meta-arm yet - # https://bugzilla.yoctoproject.org/show_bug.cgi?id=14604 - TEST_SUITES:remove = "parselogs" - # Tell testimage to connect to localhost:8022, and forward that to SSH in the FVP. - TEST_TARGET_IP = "localhost:8022" - FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] ?= "8022=22" - failing_tests: | - TEST_SUITES:remove = "xorg"
ci/fvp.yml new file +11 -0
@@ -0,0 +1,11 @@ +header: + version: 11 + +local_conf_header: + testimagefvp: | + INHERIT = "fvpboot" + # This fails but we can't add to the ignorelist from meta-arm yet + # https://bugzilla.yoctoproject.org/show_bug.cgi?id=14604 + TEST_SUITES:remove = "parselogs" + failing_tests: | + TEST_SUITES:remove = "xorg"
meta-arm-bsp/conf/machine/include/fvp-common.inc +3 -0
@@ -25,12 +25,15 @@ PACKAGECONFIG:remove:pn-openssh = "rng-tools" MACHINE_EXTRA_RRECOMMENDS += "ssh-pregen-hostkeys" TEST_TARGET = "OEFVPTarget" +TEST_TARGET_IP = "127.0.0.1:8022" FVP_PROVIDER ?= "fvp-base-a-aem-native" FVP_EXE ?= "FVP_Base_RevC-2xAEMvA" FVP_CONFIG[bp.ve_sysregs.exit_on_shutdown] ?= "1" FVP_CONFIG[bp.virtio_net.enabled] ?= "1" FVP_CONFIG[bp.virtio_net.hostbridge.userNetworking] ?= "1" +# Tell testimage to connect to localhost:8022, and forward that to SSH in the FVP. +FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] = "8022=22" FVP_CONFIG[cache_state_modelled] ?= "0" FVP_CONFIG[bp.secureflashloader.fname] ?= "${DEPLOY_DIR_IMAGE}/bl1-fvp.bin" FVP_CONFIG[bp.flashloader0.fname] ?= "${DEPLOY_DIR_IMAGE}/fip-fvp.bin"
Signature · 1 line
2.17.1
Jon Mason
AppliedQuoted 4 lines · Jon Mason
Bring fvp-base and fvp-base-arm32 to match what is currently being done in other fvps, and clean up the fvps to use a single fvp yml file (which should enable better adding and removing of issues common to fvps, like xorg test bugs).
Applied, thanks!
[1/1] CI: add common fvp yml file
commit: 75c252049c55f9986d9751ba097b705388968e00
Best regards,
Signature · 1 line
Jon Mason <[email protected]>