From 1a684977718fc18b1eb0805753d45e4ed86cf89f Mon Sep 17 00:00:00 2001 From: Peter Hoyes Date: Fri, 22 Apr 2022 17:08:56 +0100 Subject: [PATCH] ci,arm-bsp/conf: Add testimage for fvp-baser-aemv8r64 Add test configuration to machine config. Add testimage to Kas file, so that testimage works out of the box. Issue-Id: SCM-4304 Signed-off-by: Peter Hoyes Change-Id: I27dc9760a2c58f43ea557efdc97d363b0d3c1447 Signed-off-by: Jon Mason --- .gitlab-ci.yml | 5 +++++ kas/fvp-baser-aemv8r64-bsp.yml | 1 + meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf | 6 ++++++ meta-arm-bsp/documentation/fvp-baser-aemv8r64.md | 1 + 4 files changed, 13 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 276cb26b..fcc405c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -108,6 +108,11 @@ fvp-base-arm32: fvp-baser-aemv8r64: extends: .build + parallel: + matrix: + - TESTING: testimage + tags: + - x86_64 fvps: extends: .build diff --git a/kas/fvp-baser-aemv8r64-bsp.yml b/kas/fvp-baser-aemv8r64-bsp.yml index 43ca36ac..0958c9b6 100644 --- a/kas/fvp-baser-aemv8r64-bsp.yml +++ b/kas/fvp-baser-aemv8r64-bsp.yml @@ -34,6 +34,7 @@ local_conf_header: PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl" EXTRA_IMAGE_FEATURES:append = " debug-tweaks ssh-server-openssh" LICENSE_FLAGS_ACCEPTED:append = " ${@oe.utils.vartrue('FVP_BASE_R_ARM_EULA_ACCEPT', 'Arm-FVP-EULA', '', d)}" + IMAGE_CLASSES:append = " testimage" target: - core-image-minimal diff --git a/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf b/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf index 8646bdf3..7e45ff81 100644 --- a/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf +++ b/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf @@ -31,6 +31,12 @@ MACHINE_FEATURES:append = " efi" PACKAGECONFIG:remove:pn-openssh = "rng-tools" MACHINE_EXTRA_RRECOMMENDS += "ssh-pregen-hostkeys" +# testimage configuration +TEST_TARGET = "OEFVPTarget" +TEST_SUITES = "ping ssh" +TEST_TARGET_IP ?= "127.0.0.1:8022" +TEST_SERVER_IP ?= "127.0.1.1" + FVP_EXTRA_ARGS = "-a cluster0*=${DEPLOY_DIR_IMAGE}/linux-system.axf" FVP_PROVIDER ?= "fvp-base-r-aem-native" FVP_EXE ?= "FVP_BaseR_AEMv8R" diff --git a/meta-arm-bsp/documentation/fvp-baser-aemv8r64.md b/meta-arm-bsp/documentation/fvp-baser-aemv8r64.md index 0b34d7f9..98808962 100644 --- a/meta-arm-bsp/documentation/fvp-baser-aemv8r64.md +++ b/meta-arm-bsp/documentation/fvp-baser-aemv8r64.md @@ -234,6 +234,7 @@ Known Issues and Limitations Change Log ---------- +- Enabled testimage support by default. - Added virtio\_rng to improve random number generation. - Added U-Boot v2022.01 for UEFI support. - Updated Linux kernel version from 5.14 to 5.15 for both standard and