From 4c66c6dfd6561bd7b63797d079cceb5bfd392d0c Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
Date: Fri, 25 Mar 2022 13:48:53 +0000
Subject: [PATCH] CI: run testimage on fvp-base-arm32

Now that virtio networking is up, testimage works.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .gitlab-ci.yml        |  3 +++
 ci/fvp-base-arm32.yml | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7883d35f..6d24e0d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,6 +92,9 @@ fvp-base-arm32:
   parallel:
     matrix:
       - TOOLCHAINS: [gcc, external-gccarm]
+        TESTING: testimage
+  tags:
+    - x86_64
 
 fvp-baser-aemv8r64:
   extends: .build
diff --git a/ci/fvp-base-arm32.yml b/ci/fvp-base-arm32.yml
index 162c2f6f..85e56307 100644
--- a/ci/fvp-base-arm32.yml
+++ b/ci/fvp-base-arm32.yml
@@ -4,3 +4,13 @@ header:
     - ci/base.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"