lkl/ci: enable FreeBSD tests on github

tavip · tavip · commit d8c5d92916cf · 2026-06-04T00:27:59.000Z
Switch running the FreeBSD tests to github and remove the circleci
FreeBSD steps. Doing so requires minor changes in the test
infrastructure.

Signed-off-by: Octavian Purdila &lt;tavip@google.com&gt;
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -56,8 +56,6 @@ do_steps: &do_steps
       command: |
         if [[ $CROSS_COMPILE == *android* ]]; then
           emulator -avd Nexus5_API24 -no-window -no-audio -no-boot-anim;
-        elif [[ $CROSS_COMPILE == *freebsd* ]] || [[ -n "$LKL_QEMU_TEST" ]]; then
-          cd /home/ubuntu && eval $QEMU
         fi
       background: true
   - run: cd tools/lkl && make -j8 ${MKARG}
@@ -71,11 +69,6 @@ do_steps: &do_steps
       command: |
         if [[ $CROSS_COMPILE == *android* ]]; then
           /home/ubuntu/circle-android.sh wait-for-boot;
-        elif [[ $CROSS_COMPILE == *freebsd* ]] || [[ -n "$LKL_QEMU_TEST" ]]; then
-          while ! $MYSSH -o ConnectTimeout=1 exit 2> /dev/null
-          do
-             sleep 5
-          done
         fi
   - run:
       name: run tests
@@ -116,13 +109,6 @@ jobs:
      ANDROID_SDK_ROOT: /home/ubuntu/android-sdk
    <<: *do_steps
 
-  freebsd11_x86_64:
-   docker:
-     - image: lkldocker/circleci-freebsd11-x86_64:v1.4
-   environment:
-     CROSS_COMPILE: "x86_64-pc-freebsd11-"
-   <<: *do_steps
-
   x86_64_valgrind:
    docker:
      - image: lkldocker/circleci-x86_64:v1.4
@@ -137,7 +123,6 @@ workflows:
   build:
     jobs:
      - android-aarch64
-     - freebsd11_x86_64
      - i386
   nightly:
     triggers:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -165,7 +165,6 @@ jobs:
         run: |
           make -j4 -C tools/lkl ${{ matrix.build_options }}
       - name: Tests
-        if: matrix.displayTargetName != 'freebsd'
         run: mkdir junit && make -C tools/lkl run-tests tests="--junit-dir ../../junit"
       - name: Save test results
         uses: actions/upload-artifact@v5
diff --git a/tools/lkl/tests/test.sh b/tools/lkl/tests/test.sh
@@ -117,11 +117,8 @@ lkl_test_exec()
     elif file $file | grep -q ARM; then
         WRAPPER="qemu-arm-static"
     elif file $file | grep -q "FreeBSD"; then
-        ssh_copy "$file" $BSD_WDIR
-        if [ -n "$SUDO" ]; then
-            SUDO=""
-        fi
-        WRAPPER="$MYSSH $SU"
+        $MYSCP $file $MYHOST:$BSD_WDIR
+        WRAPPER="$MYSSH $SUDO"
         # ssh will mess up with pipes ('|') so, escape the pipe char.
         args="${@//\|/\\\|}"
         set - $BSD_WDIR/$(basename $file) $args
@@ -160,7 +157,8 @@ lkl_test_cmd()
         fi
         WRAPPER="adb shell $SU"
     elif [ -n "$LKL_HOST_CONFIG_BSD" ]; then
-        WRAPPER="$MYSSH $SU"
+        WRAPPER="$MYSSH"
+        USER=lkl
     fi
 
     echo "$@" | $WRAPPER sh $SHOPTS
@@ -190,11 +188,6 @@ adb_push()
     done
 }
 
-ssh_copy()
-{
-    $MYSCP -P 7722 -r $1 root@localhost:$2
-}
-
 lkl_test_android_cleanup()
 {
     adb shell rm -rf $ANDROID_WDIR
@@ -213,6 +206,6 @@ fi
 
 if [ -n "$LKL_HOST_CONFIG_BSD" ]; then
     trap lkl_test_bsd_cleanup EXIT
-    export BSD_WDIR=/root/lkl
+    export BSD_WDIR=lkl
     $MYSSH mkdir -p $BSD_WDIR
 fi
