[PATCH 1/2] CI: move network test skips to fvp.yml

testimage.yml was skipping the opkg tests, but we also need to skip the
dnf tests for when PACKAGE_CLASSES="package_rpm".

These skips are FVP-specific as they are due to the wrong IP being used
by the test suite. This should be fixed in the FVP test harness, but
for now move the exclusions into fvp.yml so they're isolated.

Signed-off-by: Ross Burton <[email protected]>
---
 ci/fvp.yml       | 3 +++
 ci/testimage.yml | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ci/fvp.yml b/ci/fvp.yml
index 667bb64109..30b09e40dc 100644
--- a/ci/fvp.yml
+++ b/ci/fvp.yml
@@ -7,3 +7,6 @@ local_conf_header:
   testimagefvp: |
     LICENSE_FLAGS_ACCEPTED += "Arm-FVP-EULA"
     IMAGE_CLASSES += "fvpboot"
+  networking_failing_tests: |
+    # These tests currently fail as the wrong IP for the build host is used
+    TEST_SUITES:remove = "opkg dnf"
diff --git a/ci/testimage.yml b/ci/testimage.yml
index a9b13d9a78..afc53ed45c 100644
--- a/ci/testimage.yml
+++ b/ci/testimage.yml
@@ -17,5 +17,3 @@ local_conf_header:
     IMAGE_FEATURES += "ssh-server-dropbear"
   sshkeys: |
     CORE_IMAGE_EXTRA_INSTALL += "ssh-pregen-hostkeys"
-  universally_failing_tests: |
-    TEST_SUITES:remove = "opkg"
-- 
2.43.0