From ce5d550e4743f1f283328eda25a505748cd4472c Mon Sep 17 00:00:00 2001
From: Esben Haabendal <esben@geanix.com>
Date: Wed, 12 Apr 2023 15:04:04 +0200
Subject: [PATCH] openharmony-standard-image-tests: Use tun/tap networking

As we by now require working tun/tap support in CI runner to allow running ACTS,
there is no need for using slirp networking.

And who knows, maybe the randomly failing ssh ptest could be related to the QEMU
slirp implementation.

Signed-off-by: Esben Haabendal <esben@geanix.com>
---
 .gitlab-ci.yml                                            | 1 +
 .../images/openharmony-standard-image-tests.bb            | 8 +-------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f156765..2d46e6fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -388,6 +388,7 @@ ptest:
       DISTRO: oniro-openharmony-linux
       OPENHARMONY_VERSION: "3.0"
       RECIPE: openharmony-standard-image-tests
+      TAP_ADDR: 192.168.7.1/30
   parallel:
     matrix:
       - MACHINE: [qemuarma7]
diff --git a/recipes-openharmony/images/openharmony-standard-image-tests.bb b/recipes-openharmony/images/openharmony-standard-image-tests.bb
index f1f712c4..98629f11 100644
--- a/recipes-openharmony/images/openharmony-standard-image-tests.bb
+++ b/recipes-openharmony/images/openharmony-standard-image-tests.bb
@@ -13,13 +13,7 @@ REQUIRED_DISTRO_FEATURES = "ptest"
 # ping and ssh are the minimum required test suites dependencies of ptest
 TEST_SUITES = "ping ssh ptest"
 
-# slirp provides networking without the need for sudo to setup TUN/TAP
-TEST_QEMUBOOT_TIMEOUT = "300"
-TEST_SERVER_IP = "127.0.0.1"
-QEMU_USE_SLIRP = "1"
-
-# although not accessible when using slirp, this at least makes target see
-# working graphics devices
+# make target see working graphics device
 TEST_RUNQEMUPARAMS = "publicvnc"
 
 # debug-tweaks provides password-less root account required by testimage
-- 
GitLab