| Message ID | 20230525200602.3277592-1-jon.mason@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/5] CI: move FVP license auto-accept to fvp.yml | expand |
On Thu, 25 May 2023 15:05:58 -0500, Jon Mason wrote: > It is only necessary to accept the FVP usage license when using FVPs. > So, move that to the fvp.yml file from the base.yml file to make things > a little cleaner. Applied, thanks! [1/5] CI: move FVP license auto-accept to fvp.yml commit: 0442164a3007d05b0d79a72251d089c8c541d1bb [2/5] CI/corstone: remove debug-tweaks usage commit: ab01e64bb3f4ccb9d0a1e542e2bab5e621d9aac7 [3/5] arm/qemuarm-secureboot: add musl testing commit: 93cc222bf656bd59ce2e803a5b1367f68f57176c [4/5] arm/linux-yocto: remove 5.15 bbappend commit: f0c11d46aa042d1a3adce2f46e18dbcd24c29d32 [5/5] Revert "arm-bsp/tc1: re-enable signed kernel image" commit: c6e2ebc670faae21dfd3f39893c5d5204f9457d6 Best regards,
diff --git a/ci/base.yml b/ci/base.yml index a724db65..26fbb602 100644 --- a/ci/base.yml +++ b/ci/base.yml @@ -27,7 +27,6 @@ env: local_conf_header: base: | CONF_VERSION = "2" - LICENSE_FLAGS_ACCEPTED += "Arm-FVP-EULA" setup: | PACKAGE_CLASSES = "package_ipk" PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl" diff --git a/ci/fvp-baser-aemv8r64.yml b/ci/fvp-baser-aemv8r64.yml index 40818bc6..cfaf9ef2 100644 --- a/ci/fvp-baser-aemv8r64.yml +++ b/ci/fvp-baser-aemv8r64.yml @@ -2,6 +2,6 @@ header: version: 11 includes: - ci/base.yml + - ci/fvp.yml machine: fvp-baser-aemv8r64 - diff --git a/ci/fvp.yml b/ci/fvp.yml index a8f8dfc0..3803d8ca 100644 --- a/ci/fvp.yml +++ b/ci/fvp.yml @@ -3,9 +3,10 @@ header: local_conf_header: testimagefvp: | + LICENSE_FLAGS_ACCEPTED += "Arm-FVP-EULA" INHERIT += "fvpboot" + failing_tests: | # 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" diff --git a/ci/fvps.yml b/ci/fvps.yml index 58c29d53..44c153ab 100644 --- a/ci/fvps.yml +++ b/ci/fvps.yml @@ -8,6 +8,8 @@ header: machine: qemuarm64 local_conf_header: + license: | + LICENSE_FLAGS_ACCEPTED += "Arm-FVP-EULA" sdk: | SDKMACHINE = "x86_64"
It is only necessary to accept the FVP usage license when using FVPs. So, move that to the fvp.yml file from the base.yml file to make things a little cleaner. Signed-off-by: Jon Mason <jon.mason@arm.com> --- ci/base.yml | 1 - ci/fvp-baser-aemv8r64.yml | 2 +- ci/fvp.yml | 3 ++- ci/fvps.yml | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-)