Skip to content

Commit c7e8bbf

Browse files
committed
ci: run docker tests in parallel
Signed-off-by: Justin Chadwell <me@jedevc.com>
1 parent 7251927 commit c7e8bbf

2 files changed

Lines changed: 1 addition & 5 deletions

File tree

.github/CONTRIBUTING.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,6 @@ TESTFLAGS="--run /TestBuild.*/worker=remote/ -v" make test-integration
157157
>
158158
> Set `TEST_DOCKERD=1` for the test framework to enable the docker workers,
159159
> specifically the `docker` and `docker-container` drivers.
160-
>
161-
> The docker tests cannot be run in parallel, so require passing `--parallel=1`
162-
> in `TESTFLAGS`.
163160
164161
> **Note**
165162
>

.github/workflows/build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ jobs:
5757
- prepare-test
5858
env:
5959
TESTFLAGS: "-v --parallel=6 --timeout=30m"
60-
TESTFLAGS_DOCKER: "-v --parallel=1 --timeout=30m"
6160
GOTESTSUM_FORMAT: "standard-verbose"
6261
TEST_IMAGE_BUILD: "0"
6362
TEST_IMAGE_ID: "buildx-tests"
@@ -103,7 +102,7 @@ jobs:
103102
./hack/test
104103
env:
105104
TEST_DOCKERD: "${{ startsWith(matrix.worker, 'docker') && '1' || '0' }}"
106-
TESTFLAGS: "${{ (matrix.worker == 'docker' || matrix.worker == 'docker\\+containerd') && env.TESTFLAGS_DOCKER || env.TESTFLAGS }} --run=//worker=${{ matrix.worker }}$"
105+
TESTFLAGS: "${{ env.TESTFLAGS }} --run=//worker=${{ matrix.worker }}$"
107106
TESTPKGS: "${{ matrix.pkg }}"
108107
SKIP_INTEGRATION_TESTS: "${{ matrix.skip-integration-tests }}"
109108
-

0 commit comments

Comments
 (0)