From 90cbfdf9365620df81a74c6ef983a021d94b1442 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Sun, 10 Aug 2025 21:50:41 +0000
Subject: [PATCH] CI: Consolidate arm64 tests on GitHub runners

The arm64 tests are currently being executed on both actuated and GitHub
runners. This change removes the actuated runner to avoid redundancy and
streamline our CI process.

Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 .github/workflows/aarch64-test.yaml          | 32 +++++++++++
 .github/workflows/actuated-aarch64-test.yaml | 58 --------------------
 2 files changed, 32 insertions(+), 58 deletions(-)
 create mode 100644 .github/workflows/aarch64-test.yaml
 delete mode 100644 .github/workflows/actuated-aarch64-test.yaml

diff --git a/.github/workflows/aarch64-test.yaml b/.github/workflows/aarch64-test.yaml
new file mode 100644
index 000000000..32b19e176
--- /dev/null
+++ b/.github/workflows/aarch64-test.yaml
@@ -0,0 +1,32 @@
+name: aarch64 test
+
+on: [push, pull_request]
+
+# Cancel any preceding run on the pull request.
+concurrency:
+  group: aarch64-test-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04-arm
+    strategy:
+      matrix:
+        target: [GCC=1, CLANG=1]
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Run Tests ${{ matrix.target }}
+      # Following tests are failing on the VMs:
+      #  ./change_mnt_context --pidfile=change_mnt_context.pid --outfile=change_mnt_context.out
+      #   45: ERR: change_mnt_context.c:23: mount (errno = 22 (Invalid argument))
+      #
+      # In combination with '--remote-lazy-pages' following error occurs:
+      #  138: FAIL: maps05.c:84: Data corrupted at page 1639 (errno = 11 (Resource temporarily unavailable))
+      run: |
+        # The 'sched_policy00' needs the following:
+        sudo sysctl -w kernel.sched_rt_runtime_us=-1
+        # etc/hosts entry is needed for netns_lock_iptables
+        echo "127.0.0.1   localhost" | sudo tee -a /etc/hosts
+        sudo -E make -C scripts/ci local ${{ matrix.target }} RUN_TESTS=1 \
+          ZDTM_OPTS="-x zdtm/static/change_mnt_context -x zdtm/static/maps05"
diff --git a/.github/workflows/actuated-aarch64-test.yaml b/.github/workflows/actuated-aarch64-test.yaml
deleted file mode 100644
index 567746a5f..000000000
--- a/.github/workflows/actuated-aarch64-test.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-name: aarch64 test
-
-on: [push, pull_request]
-
-# Cancel any preceding run on the pull request.
-concurrency:
-  group: actuated-test-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/criu-dev' }}
-
-jobs:
-  build:
-    # Actuated runners are not available in all repositories.
-    if: ${{ github.repository == 'checkpoint-restore/criu' }}
-    # The memory size and the number of CPUs can be freely selected for
-    # the actuated runners. 3GB and 4 CPUs seems to be enough according to the
-    # result from 'vmmeter'.
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [actuated-arm64-4cpu-3gb, ubuntu-24.04-arm]
-        target: [GCC=1, CLANG=1]
-
-    steps:
-    # https://gist.github.com/alexellis/1f33e581c75e11e161fe613c46180771#file-metering-gha-md
-    # vmmeter start
-    - name: Prepare arkade
-      if: ${{ matrix.os == 'actuated-arm64-4cpu-3gb' }}
-      uses: alexellis/arkade-get@master
-      with:
-        crane: latest
-        print-summary: false
-
-    - name: Install vmmeter
-      if: ${{ matrix.os == 'actuated-arm64-4cpu-3gb' }}
-      run: |
-        crane export --platform linux/arm64 ghcr.io/openfaasltd/vmmeter:latest | sudo tar -xvf - -C /usr/local/bin
-
-    - name: Run vmmeter
-      if: ${{ matrix.os == 'actuated-arm64-4cpu-3gb' }}
-      uses: self-actuated/vmmeter-action@master
-    # vmmeter end
-
-    - uses: actions/checkout@v4
-    - name: Run Tests ${{ matrix.target }}/${{ matrix.os }}
-      # Following tests are failing on the actuated VMs:
-      #  ./change_mnt_context --pidfile=change_mnt_context.pid --outfile=change_mnt_context.out
-      #   45: ERR: change_mnt_context.c:23: mount (errno = 22 (Invalid argument))
-      #
-      # In combination with '--remote-lazy-pages' following error occurs:
-      #  138: FAIL: maps05.c:84: Data corrupted at page 1639 (errno = 11 (Resource temporarily unavailable))
-      run: |
-        # The 'sched_policy00' needs the following:
-        sudo sysctl -w kernel.sched_rt_runtime_us=-1
-        # etc/hosts entry is needed for netns_lock_iptables
-        echo "127.0.0.1   localhost" | sudo tee -a /etc/hosts
-        sudo -E make -C scripts/ci local ${{ matrix.target }} RUN_TESTS=1 \
-          ZDTM_OPTS="-x zdtm/static/change_mnt_context -x zdtm/static/maps05"