From 2d22a1f7ae203805ee2345249ebc244cd9f53bfc Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 18 Oct 2021 16:40:56 +0100 Subject: [PATCH] CI: enable testimage for fvp-base Inherit fvpboot so that the FVP binary is fetched and configuration generated. Configure the FVP to forward host port 8022 to port 22 locally, and tell testimage to SSH to localhost:8022. This has the limitation that only one testimage can run per machine, but this will be removed shortly. Disable the parselogs test case, as there are some harmless warnings in the dmesg which cause it to fail. Currently meta-arm can't extend the whitelist of ignorable warnings. The FVP binaries are x86-64 only, so tag the job appropriately. Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- .gitlab-ci.yml | 4 +++- ci/fvp-base.yml | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f00bdcf8..4a2b3366 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -109,8 +109,10 @@ corstone700-fvp: corstone700-mps3: extends: .build -fvp-base: +fvp-base/testimage: extends: .build + tags: + - x86_64 fvp-base-arm32: extends: .build diff --git a/ci/fvp-base.yml b/ci/fvp-base.yml index 1c3675fa..47d123e3 100644 --- a/ci/fvp-base.yml +++ b/ci/fvp-base.yml @@ -5,3 +5,12 @@ header: 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"