From 8cd8917d6529e0a6ac932e1d0e4ac684912e1b44 Mon Sep 17 00:00:00 2001
From: Julien <julien@caffeine.lu>
Date: Tue, 7 Jan 2025 12:34:55 +0100
Subject: [PATCH] Run the nonroot tests in parallel with the root tests (#362)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This saves us ~15 minutes on the slowest CI job 🎉
---
 .github/workflows/ci.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5684bfe..3d6b8bb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -153,6 +153,7 @@ jobs:
       # Note we use /src/pulumi-test-containers as entrypoint and not bash to avoid bash
       # changing the environment in some way.
         run: |
+          chmod o+r $GOOGLE_APPLICATION_CREDENTIALS
           docker run \
             -e RUN_CONTAINER_TESTS=true \
             -e IMAGE_VARIANT=pulumi \
@@ -173,10 +174,7 @@ jobs:
             --volume /tmp:/src \
             --entrypoint /src/pulumi-test-containers \
             ${{ env.DOCKER_ORG }}/pulumi:${{ env.PULUMI_VERSION }} \
-            -test.timeout=1h -test.v
-      - name: Tests for nonroot variant
-        run: |
-          chmod o+r $GOOGLE_APPLICATION_CREDENTIALS
+            -test.timeout=1h -test.v | sed 's/.*/[root] &/' &
           docker run \
             -e RUN_CONTAINER_TESTS=true \
             -e IMAGE_VARIANT=pulumi-nonroot \
@@ -197,7 +195,8 @@ jobs:
             --volume /tmp:/src \
             --entrypoint /src/pulumi-test-containers \
             ${{ env.DOCKER_ORG }}/pulumi:${{ env.PULUMI_VERSION }}-nonroot \
-            -test.timeout=1h -test.v
+            -test.timeout=1h -test.v | sed 's/.*/[nonroot] &/' &
+          wait
 
   provider-build-environment:
     name: Provider Build Environment image