Merge branch 'esben/ptest-ssh-timeout' into 'kirkstone'

Fix problems with ssh timeout in ptest CI job

See merge request eclipse/oniro-oh/meta-openharmony!119

.gitlab-ci.yml

@@ -194,6 +194,11 @@ eca:
       fi >> conf/auto.conf
     - echo "RM_WORK_EXCLUDE += \"${RECIPE}\"" >> conf/auto.conf
     - echo "OPENHARMONY_VERSION = \"${OPENHARMONY_VERSION}\"" >> conf/auto.conf
+    - if [ -n "$TAP_ADDR" ] ; then
+        sudo ip tuntap add tap0 mode tap ;
+        sudo ip addr add dev tap0 "$TAP_ADDR" ;
+        sudo ip link set tap0 up ;
+      fi
   script:
     - time bitbake ${RECIPE}
   after_script:
@@ -383,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]
@@ -407,13 +413,11 @@ acts:
     DISTRO: oniro-openharmony-linux
     OPENHARMONY_VERSION: "3.0"
     MACHINE: qemuarma7
+    TAP_ADDR: 192.168.7.1/30
     HDC_CONNECT_ATTEMPTS: 6
     HDC_CONNECT_DELAY: 10
     ACTS_TESTS: "ActsFaultLoggerTest ActsHiAppEventJsTest ActsHiCollieCppTest ActsHilogTest ActsLibhilogCPPTest ActsLibhilogCTest ActsHiSysEventCPPTest ActsHitraceCPPTest ActsHitraceCTest ActsStartupJSApiTest ActsPowerMgrBatteryTest ActsOsAccountJSApiTest ActsAppdatamagrJsTest ActsDistributedDatamgrJsTest ActsContextTest ActsAmsDataUriUtilsTest ActsAmsZipfileUnzipfileSTest ActsGetWantAllTest ActsFeatureAbilityTest ActsBmsCheckPermissionTest ActsBmsJsTest ActsBmsKitTest ActsBmsModuleUsageRecordTest ActsBundleManagerTest ActsBundleManagerUninstallTest"
   script:
-    - sudo ip tuntap add tap0 mode tap
-    - sudo ip addr add dev tap0 192.168.7.1/30
-    - sudo ip link set tap0 up
     - bitbake qemu-helper-native
     - runqemu publicvnc serialstdio & sleep 130
     - ./tmp-*/deploy/sdk/openharmony-tools-${OPENHARMONY_VERSION}-cortexa7-neon-vfpv4-*.sh -y -d openharmony-tools

conf/distro/oniro-openharmony-linux.conf

@@ -40,6 +40,9 @@ INHERIT += "uninative"
 # instead.
 HOSTTOOLS += "ip ping ps scp ssh stty"
 
+# Yocto does not have ssh-keygen-native, so we need to use ssh-keygen from host
+HOSTTOOLS += "ssh-keygen"
+
 # Default to enabling serial debug console on RaspberryPi
 # Placed here to amend the machine config living in meta-raspberrypi
 ENABLE_UART:raspberrypi4-64 ?= "1"

recipes-openharmony/images/openharmony-standard-image-tests.bb

@@ -13,16 +13,25 @@ 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"
+# make target see working graphics device
+TEST_RUNQEMUPARAMS = "publicvnc"
 
 # debug-tweaks provides password-less root account required by testimage
 EXTRA_IMAGE_FEATURES += "debug-tweaks"
 
 # ptest requires ptest-runner and sshd to be present in the image
-IMAGE_INSTALL += "sshd ptest-runner"
+EXTRA_IMAGE_FEATURES += "ssh-server-dropbear"
+IMAGE_INSTALL += "ptest-runner"
 
 # install OpenHarmony components and ptests
 IMAGE_INSTALL += "openharmony-standard-ptest"
+
+# Pre-generate SSH host keys for quick first time SSH connection
+ROOTFS_POSTPROCESS_COMMAND += "ssh_host_key_gen;"
+SSH_HOST_KEY_TYPES="rsa ecdsa ed25519"
+ssh_host_key_gen() {
+    mkdir -p "${IMAGE_ROOTFS}${sysconfdir}/ssh/"
+    for type in ${SSH_HOST_KEY_TYPES} ; do
+        ssh-keygen -f "${IMAGE_ROOTFS}${sysconfdir}/ssh/ssh_host_"$type"_key" -N '' -t $type
+    done
+}