github: simplify runner assignment to server-based tags

dkruces · dkruces · commit 01221c7cfa2a · 2025-09-24T11:12:50.000+02:00
Follow up to the previous CI refactor by simplifying the complex
workflow-specific runner matching. Use test_mode to directly assign
runners to servers instead of pattern matching individual workflows.

When using kdevops-ci mode, reduce the VM size to 2GB/2core so we have
more server resources for testing more workloads.

New test modes names are: kdevops-ci and linux-ci:

kdevops-ci: Framework validation testing
- Purpose: Validate that kdevops itself works correctly
- Scope: Single lightweight test per workflow (1 VM, minimal resources)
- Examples: blktests_nvme, xfs_reflink_4k, tmpfs_default
- Use case: Push/PR triggers, quick validation, CI self-testing

linux-ci: Comprehensive Linux kernel testing
- Purpose: Full Linux kernel testing
- Scope: Complete test suites with multiple VMs and extensive coverage
- Examples: blktests (7 VMs), xfs (28 VMs), btrfs (19 VMs)
- Use case: Scheduled runs, manual testing, thorough kernel validation

Generated-by: Claude AI
Signed-off-by: Daniel Gomez &lt;da.gomez@samsung.com&gt;
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -20,6 +20,10 @@ inputs:
     required: false
     type: string
     default: 'master'
+  test_mode:
+    required: false
+    type: string
+    default: 'linux-ci'
 
 runs:
   using: "composite"
@@ -151,10 +155,21 @@ runs:
         echo "make $KDEVOPS_ARGS"
 
         make $KDEVOPS_ARGS
+
+        # Configure VM size based on CI type
+        VM_CONFIG_ARG=
+        if [[ "${{ inputs.test_mode }}" == "kdevops-ci" ]]; then
+          VM_CONFIG_ARG="defconfigs/configs/vm2g2c.config"
+          echo "Using kdevops CI configuration (2GB/2core VMs)"
+        else
+          echo "Using Linux CI configuration (4GB/8core VMs)"
+        fi
+
         ./scripts/kconfig/merge_config.sh \
         -n .config \
         defconfigs/configs/diy.config \
-        defconfigs/configs/ci.config
+        defconfigs/configs/ci.config \
+        ${VM_CONFIG_ARG}
 
     - name: Run kdevops make
       working-directory: ${{ inputs.dir }}/kdevops
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,18 +23,22 @@ on:
       test_mode:
         description: 'Testing mode'
         required: false
-        default: 'full-testing'
+        default: 'linux-ci'
         type: string
       tests:
-        description: 'Custom test to run (for kdevops-validation mode only)'
+        description: 'Custom test to run (for kdevops-ci mode only)'
         required: false
         default: ''
         type: string
 
 jobs:
   setup:
     name: Setup kdevops workspace
-    runs-on: ${{ contains(inputs.ci_workflow, 'blktests') && fromJSON('["self-hosted", "Linux", "X64", "blktests"]') || contains(inputs.ci_workflow, 'tmpfs') && fromJSON('["self-hosted", "Linux", "X64", "tmpfs"]') || contains(inputs.ci_workflow, 'xfs') && fromJSON('["self-hosted", "Linux", "X64", "xfs"]') || contains(inputs.ci_workflow, 'btrfs') && fromJSON('["self-hosted", "Linux", "X64", "btrfs"]') || contains(inputs.ci_workflow, 'ext4') && fromJSON('["self-hosted", "Linux", "X64", "ext4"]') || contains(inputs.ci_workflow, 'selftests') && fromJSON('["self-hosted", "Linux", "X64", "selftests"]') || contains(inputs.ci_workflow, 'seltests') && fromJSON('["self-hosted", "Linux", "X64", "selftests"]') || contains(inputs.ci_workflow, 'modules') && fromJSON('["self-hosted", "Linux", "X64", "modules"]') || contains(inputs.ci_workflow, 'firmware') && fromJSON('["self-hosted", "Linux", "X64", "firmware"]') || contains(inputs.ci_workflow, 'mm') && fromJSON('["self-hosted", "Linux", "X64", "mm"]') || fromJSON('["self-hosted"]') }}
+    runs-on: ${{
+      inputs.test_mode == 'kdevops-ci'
+      && fromJSON('["self-hosted", "Linux", "X64", "kdevops-ci"]')
+      || fromJSON('["self-hosted", "Linux", "X64", "linux-ci"]')
+    }}
     steps:
       - name: Checkout dkruces/kdevops
         uses: actions/checkout@v4
@@ -48,10 +52,15 @@ jobs:
           dir: ${{ inputs.ci_workflow }}
           kernel_ref: ${{ inputs.kernel_ref }}
           kernel_tree: ${{ inputs.kernel_tree }}
+          test_mode: ${{ inputs.test_mode }}
 
   test:
     name: Run kdevops ci-test
-    runs-on: ${{ contains(inputs.ci_workflow, 'blktests') && fromJSON('["self-hosted", "Linux", "X64", "blktests"]') || contains(inputs.ci_workflow, 'tmpfs') && fromJSON('["self-hosted", "Linux", "X64", "tmpfs"]') || contains(inputs.ci_workflow, 'xfs') && fromJSON('["self-hosted", "Linux", "X64", "xfs"]') || contains(inputs.ci_workflow, 'btrfs') && fromJSON('["self-hosted", "Linux", "X64", "btrfs"]') || contains(inputs.ci_workflow, 'ext4') && fromJSON('["self-hosted", "Linux", "X64", "ext4"]') || contains(inputs.ci_workflow, 'selftests') && fromJSON('["self-hosted", "Linux", "X64", "selftests"]') || contains(inputs.ci_workflow, 'seltests') && fromJSON('["self-hosted", "Linux", "X64", "selftests"]') || contains(inputs.ci_workflow, 'modules') && fromJSON('["self-hosted", "Linux", "X64", "modules"]') || contains(inputs.ci_workflow, 'firmware') && fromJSON('["self-hosted", "Linux", "X64", "firmware"]') || contains(inputs.ci_workflow, 'mm') && fromJSON('["self-hosted", "Linux", "X64", "mm"]') || fromJSON('["self-hosted"]') }}
+    runs-on: ${{
+      inputs.test_mode == 'kdevops-ci'
+      && fromJSON('["self-hosted", "Linux", "X64", "kdevops-ci"]')
+      || fromJSON('["self-hosted", "Linux", "X64", "linux-ci"]')
+    }}
     needs: [setup]
     timeout-minutes: 120
     steps:
@@ -65,7 +74,11 @@ jobs:
 
   archive:
     name: Archive kdevops
-    runs-on: ${{ contains(inputs.ci_workflow, 'blktests') && fromJSON('["self-hosted", "Linux", "X64", "blktests"]') || contains(inputs.ci_workflow, 'tmpfs') && fromJSON('["self-hosted", "Linux", "X64", "tmpfs"]') || contains(inputs.ci_workflow, 'xfs') && fromJSON('["self-hosted", "Linux", "X64", "xfs"]') || contains(inputs.ci_workflow, 'btrfs') && fromJSON('["self-hosted", "Linux", "X64", "btrfs"]') || contains(inputs.ci_workflow, 'ext4') && fromJSON('["self-hosted", "Linux", "X64", "ext4"]') || contains(inputs.ci_workflow, 'selftests') && fromJSON('["self-hosted", "Linux", "X64", "selftests"]') || contains(inputs.ci_workflow, 'seltests') && fromJSON('["self-hosted", "Linux", "X64", "selftests"]') || contains(inputs.ci_workflow, 'modules') && fromJSON('["self-hosted", "Linux", "X64", "modules"]') || contains(inputs.ci_workflow, 'firmware') && fromJSON('["self-hosted", "Linux", "X64", "firmware"]') || contains(inputs.ci_workflow, 'mm') && fromJSON('["self-hosted", "Linux", "X64", "mm"]') || fromJSON('["self-hosted"]') }}
+    runs-on: ${{
+      inputs.test_mode == 'kdevops-ci'
+      && fromJSON('["self-hosted", "Linux", "X64", "kdevops-ci"]')
+      || fromJSON('["self-hosted", "Linux", "X64", "linux-ci"]')
+    }}
     needs: [setup, test]
     steps:
       - name: Start SSH Agent
@@ -87,7 +100,11 @@ jobs:
 
   cleanup:
     name: Cleanup kdevops workspace
-    runs-on: ${{ contains(inputs.ci_workflow, 'blktests') && fromJSON('["self-hosted", "Linux", "X64", "blktests"]') || contains(inputs.ci_workflow, 'tmpfs') && fromJSON('["self-hosted", "Linux", "X64", "tmpfs"]') || contains(inputs.ci_workflow, 'xfs') && fromJSON('["self-hosted", "Linux", "X64", "xfs"]') || contains(inputs.ci_workflow, 'btrfs') && fromJSON('["self-hosted", "Linux", "X64", "btrfs"]') || contains(inputs.ci_workflow, 'ext4') && fromJSON('["self-hosted", "Linux", "X64", "ext4"]') || contains(inputs.ci_workflow, 'selftests') && fromJSON('["self-hosted", "Linux", "X64", "selftests"]') || contains(inputs.ci_workflow, 'seltests') && fromJSON('["self-hosted", "Linux", "X64", "selftests"]') || contains(inputs.ci_workflow, 'modules') && fromJSON('["self-hosted", "Linux", "X64", "modules"]') || contains(inputs.ci_workflow, 'firmware') && fromJSON('["self-hosted", "Linux", "X64", "firmware"]') || contains(inputs.ci_workflow, 'mm') && fromJSON('["self-hosted", "Linux", "X64", "mm"]') || fromJSON('["self-hosted"]') }}
+    runs-on: ${{
+      inputs.test_mode == 'kdevops-ci'
+      && fromJSON('["self-hosted", "Linux", "X64", "kdevops-ci"]')
+      || fromJSON('["self-hosted", "Linux", "X64", "linux-ci"]')
+    }}
     needs: [setup, test, archive]
     if: always()
     steps:
diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
@@ -73,13 +73,13 @@ on:
       test_mode:
         description: 'Testing mode'
         required: false
-        default: 'full-testing'
+        default: 'linux-ci'
         type: choice
         options:
-          - 'full-testing'        # Complete test suite
-          - 'kdevops-validation'  # Single test for framework validation
+          - 'linux-ci'        # Complete test suite
+          - 'kdevops-ci'  # Single test for framework validation
       tests:
-        description: 'Custom test to run (for kdevops-validation mode only)'
+        description: 'Custom test to run (for kdevops-ci mode only)'
         required: false
         type: string
         default: ''
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -25,5 +25,5 @@ jobs:
       ci_workflow: ${{ matrix.ci_workflow }}
       kernel_ref: 'v6.15'
       kernel_tree: 'linux'
-      test_mode: 'kdevops-validation'
+      test_mode: 'kdevops-ci'
       tests: ''
diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml
@@ -36,7 +36,7 @@ jobs:
           "${{ github.workspace }}/scripts/github_output.sh" kernel_tree "$kernel_tree"
 
   schedule:
-    name: Scheduled kdevops CI
+    name: Scheduled Linux CI
     needs: [check_ref]
     uses: ./.github/workflows/main.yml
     secrets: inherit
@@ -52,3 +52,4 @@ jobs:
       ci_workflow: ${{ matrix.ci_workflow }}
       kernel_ref: ${{ needs.check_ref.outputs.kernel_ref }}
       kernel_tree: ${{ needs.check_ref.outputs.kernel_tree }}
+      test_mode: 'linux-ci'
