From bdd0a2a9708bc08ab42843065fa6ce24c9a7636f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= <pawel.gronowski@docker.com>
Date: Tue, 9 Sep 2025 16:29:59 +0200
Subject: [PATCH] gha: extract vm test to a separate workflow
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`vm` is quite lengthy which makes it impossible to restart other failed
(flaky) jobs from the `test` workflow before the `vm` finishes.

This patch moves it to a separate workflow to allow retrying other jobs
independently.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
---
 .github/workflows/test.yml | 19 ----------------
 .github/workflows/vm.yml   | 46 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 19 deletions(-)
 create mode 100644 .github/workflows/vm.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 646dfbbed2..c58ac264ce 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -208,22 +208,3 @@ jobs:
           targets: binary-smoketest
           set: |
             *.platform=${{ matrix.platform }}
-
-  vm:
-    needs:
-      - validate-dco
-    uses: ./.github/workflows/.vm.yml
-    strategy:
-      fail-fast: false
-      matrix:
-        template:
-          # EL 8 is used for running the tests with cgroup v1.
-          # Do not upgrade this to EL 9 until formally deprecating the cgroup v1 support.
-          #
-          # FIXME: use almalinux-8, then probably no need to keep oraclelinux-8 here.
-          # On almalinux-8, port forwarding tests are failing:
-          # https://github.com/moby/moby/pull/49819#issuecomment-2815676000
-          - template://oraclelinux-8 # Oracle's kernel 5.15
-          # - template://almalinux-8 # kernel 4.18
-    with:
-      template: ${{ matrix.template }}
diff --git a/.github/workflows/vm.yml b/.github/workflows/vm.yml
new file mode 100644
index 0000000000..77abc2a9c3
--- /dev/null
+++ b/.github/workflows/vm.yml
@@ -0,0 +1,46 @@
+name: vm
+
+# Default to 'contents: read', which grants actions to read commits.
+#
+# If any permission is set, any permission not included in the list is
+# implicitly set to "none".
+#
+# see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'master'
+      - '[0-9]+.[0-9]+'
+      - '[0-9]+.x'
+  pull_request:
+
+jobs:
+  validate-dco:
+    uses: ./.github/workflows/.dco.yml
+
+  vm:
+    needs:
+      - validate-dco
+    uses: ./.github/workflows/.vm.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        template:
+          # EL 8 is used for running the tests with cgroup v1.
+          # Do not upgrade this to EL 9 until formally deprecating the cgroup v1 support.
+          #
+          # FIXME: use almalinux-8, then probably no need to keep oraclelinux-8 here.
+          # On almalinux-8, port forwarding tests are failing:
+          # https://github.com/moby/moby/pull/49819#issuecomment-2815676000
+          - template://oraclelinux-8  # Oracle's kernel 5.15
+          # - template://almalinux-8  # kernel 4.18
+    with:
+      template: ${{ matrix.template }}