From 5107ec0fd8d963ee23df4ed076828c71d894af06 Mon Sep 17 00:00:00 2001
From: Justin Chadwell <me@jedevc.com>
Date: Tue, 11 Jul 2023 16:07:31 +0100
Subject: [PATCH] ci: run docker tests in parallel

Signed-off-by: Justin Chadwell <me@jedevc.com>
---
 .github/CONTRIBUTING.md     | 3 ---
 .github/workflows/build.yml | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index b7a79991bf4..70c0cde264f 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -157,9 +157,6 @@ TESTFLAGS="--run /TestBuild.*/worker=remote/ -v" make test-integration
 >
 > Set `TEST_DOCKERD=1` for the test framework to enable the docker workers,
 > specifically the `docker` and `docker-container` drivers.
->
-> The docker tests cannot be run in parallel, so require passing `--parallel=1`
-> in `TESTFLAGS`.
 
 > **Note**
 >
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ee04de4ae81..653bd90c420 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -57,7 +57,6 @@ jobs:
       - prepare-test
     env:
       TESTFLAGS: "-v --parallel=6 --timeout=30m"
-      TESTFLAGS_DOCKER: "-v --parallel=1 --timeout=30m"
       GOTESTSUM_FORMAT: "standard-verbose"
       TEST_IMAGE_BUILD: "0"
       TEST_IMAGE_ID: "buildx-tests"
@@ -103,7 +102,7 @@ jobs:
           ./hack/test
         env:
           TEST_DOCKERD: "${{ startsWith(matrix.worker, 'docker') && '1' || '0' }}"
-          TESTFLAGS: "${{ (matrix.worker == 'docker' || matrix.worker == 'docker\\+containerd') && env.TESTFLAGS_DOCKER || env.TESTFLAGS }} --run=//worker=${{ matrix.worker }}$"
+          TESTFLAGS: "${{ env.TESTFLAGS }} --run=//worker=${{ matrix.worker }}$"
           TESTPKGS: "${{ matrix.pkg }}"
           SKIP_INTEGRATION_TESTS: "${{ matrix.skip-integration-tests }}"
       -