split up tests-no-qemu-quick (#3448)

The tests-no-qemu-quick no longer is, split it up into two seperate parts. Signed-off-by: Alex Couture-Beil <[email protected]>
earthly · Nov 1, 2023 · 71b8cd9 · 71b8cd9
1 parent 2f5483c
commit 71b8cd9
Show file tree

Hide file tree

Showing 5 changed files with 106 additions and 17 deletions.
diff --git a/.github/workflows/ci-docker-satellites.yml b/.github/workflows/ci-docker-satellites.yml
@@ -60,11 +60,25 @@ jobs:
       EARTHLY_ORG: "earthly-technologies"
     secrets: inherit
 
-  docker-tests-no-qemu-quick:
+  docker-tests-no-qemu-quick1:
     needs: build-earthly
     uses: ./.github/workflows/reusable-test.yml
     with:
-      TEST_TARGET: "+test-no-qemu-quick"
+      TEST_TARGET: "+test-no-qemu-quick1"
+      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
+      RUNS_ON: "ubuntu-latest"
+      BINARY: "docker"
+      SUDO: ""
+      USE_SATELLITE: true
+      SATELLITE_NAME: "core-test"
+      EARTHLY_ORG: "earthly-technologies"
+    secrets: inherit
+
+  docker-tests-no-qemu-quick2:
+    needs: build-earthly
+    uses: ./.github/workflows/reusable-test.yml
+    with:
+      TEST_TARGET: "+test-no-qemu-quick2"
       BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
       RUNS_ON: "ubuntu-latest"
       BINARY: "docker"

diff --git a/.github/workflows/ci-docker-ubuntu.yml b/.github/workflows/ci-docker-ubuntu.yml
@@ -66,25 +66,52 @@ jobs:
       SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
     secrets: inherit
 
-  docker-tests-no-qemu-quick:
+  docker-tests-no-qemu-quick1:
     needs: build-earthly
     if: ${{ !failure() }}
     uses: ./.github/workflows/reusable-test.yml
     with:
-      TEST_TARGET: "+test-no-qemu-quick"
+      TEST_TARGET: "+test-no-qemu-quick1"
       BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
       RUNS_ON: "ubuntu-latest"
       BINARY: "docker"
       SUDO: ""
       SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
     secrets: inherit
 
-  docker-tests-no-qemu-quick-no-logbus:
+  docker-tests-no-qemu-quick2:
     needs: build-earthly
     if: ${{ !failure() }}
     uses: ./.github/workflows/reusable-test.yml
     with:
-      TEST_TARGET: "+test-no-qemu-quick"
+      TEST_TARGET: "+test-no-qemu-quick2"
+      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
+      RUNS_ON: "ubuntu-latest"
+      BINARY: "docker"
+      SUDO: ""
+      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
+    secrets: inherit
+
+  docker-tests-no-qemu-quick1-no-logbus:
+    needs: build-earthly
+    if: ${{ !failure() }}
+    uses: ./.github/workflows/reusable-test.yml
+    with:
+      TEST_TARGET: "+test-no-qemu-quick1"
+      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
+      RUNS_ON: "ubuntu-latest"
+      BINARY: "docker"
+      SUDO: ""
+      EXTRA_ARGS: "--logstream=false --logstream-upload=false"
+      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
+    secrets: inherit
+
+  docker-tests-no-qemu-quick2-no-logbus:
+    needs: build-earthly
+    if: ${{ !failure() }}
+    uses: ./.github/workflows/reusable-test.yml
+    with:
+      TEST_TARGET: "+test-no-qemu-quick2"
       BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
       RUNS_ON: "ubuntu-latest"
       BINARY: "docker"
@@ -358,7 +385,7 @@ jobs:
       TARGET_NAME: "+test-quick"
     secrets: inherit
 
-  docker-wait-block-no-qemu-quick:
+  docker-wait-block-no-qemu-quick1:
     needs: build-earthly
     if: ${{ !failure() }}
     uses: ./.github/workflows/reusable-wait-block-target.yml
@@ -368,7 +395,20 @@ jobs:
       BINARY: "docker"
       SUDO: ""
       SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
-      TARGET_NAME: "+test-no-qemu-quick"
+      TARGET_NAME: "+test-no-qemu-quick1"
+    secrets: inherit
+
+  docker-wait-block-no-qemu-quick2:
+    needs: build-earthly
+    if: ${{ !failure() }}
+    uses: ./.github/workflows/reusable-wait-block-target.yml
+    with:
+      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
+      RUNS_ON: "ubuntu-latest"
+      BINARY: "docker"
+      SUDO: ""
+      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
+      TARGET_NAME: "+test-no-qemu-quick2"
     secrets: inherit
 
   docker-wait-block-no-qemu-normal:
@@ -436,13 +476,27 @@ jobs:
       SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
     secrets: inherit
 
-  race-tests-no-qemu-quick:
+  race-tests-no-qemu-quick1:
+    needs: build-earthly
+    if: ${{ !failure() }}
+    uses: ./.github/workflows/reusable-race-test.yml
+    with:
+      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
+      TEST_TARGET: "+test-no-qemu-quick1"
+      RUNS_ON: "ubuntu-latest"
+      USE_QEMU: false
+      BINARY: "docker"
+      SUDO: ""
+      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
+    secrets: inherit
+
+  race-tests-no-qemu-quick2:
     needs: build-earthly
     if: ${{ !failure() }}
     uses: ./.github/workflows/reusable-race-test.yml
     with:
       BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
-      TEST_TARGET: "+test-no-qemu-quick"
+      TEST_TARGET: "+test-no-qemu-quick2"
       RUNS_ON: "ubuntu-latest"
       USE_QEMU: false
       BINARY: "docker"

diff --git a/.github/workflows/ci-podman-ubuntu.yml b/.github/workflows/ci-podman-ubuntu.yml
@@ -66,12 +66,25 @@ jobs:
       SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
     secrets: inherit
 
-  podman-tests-no-qemu-quick:
+  podman-tests-no-qemu-quick1:
     needs: build-earthly
     if: ${{ !failure() }}
     uses: ./.github/workflows/reusable-test.yml
     with:
-      TEST_TARGET: "+test-no-qemu-quick"
+      TEST_TARGET: "+test-no-qemu-quick1"
+      BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
+      RUNS_ON: "ubuntu-latest"
+      BINARY: "podman"
+      SUDO: "sudo -E"
+      SKIP_JOB: ${{ needs.build-earthly.result != 'success' }}
+    secrets: inherit
+
+  podman-tests-no-qemu-quick2:
+    needs: build-earthly
+    if: ${{ !failure() }}
+    uses: ./.github/workflows/reusable-test.yml
+    with:
+      TEST_TARGET: "+test-no-qemu-quick2"
       BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly"
       RUNS_ON: "ubuntu-latest"
       BINARY: "podman"

diff --git a/Earthfile b/Earthfile
@@ -699,9 +699,14 @@ test-quick:
     BUILD +earthly-script-no-stdout
     BUILD --pass-args ./ast/tests+all
 
-# test-no-qemu-quick runs the tests from ./tests+ga-no-qemu-quick
-test-no-qemu-quick:
-    BUILD --pass-args ./tests+ga-no-qemu-quick \
+# test-no-qemu-quick1 runs the tests from ./tests+ga-no-qemu-quick1
+test-no-qemu-quick1:
+    BUILD --pass-args ./tests+ga-no-qemu-quick1 \
+        --GLOBAL_WAIT_END="$GLOBAL_WAIT_END"
+
+# test-no-qemu-quick runs the tests from ./tests+ga-no-qemu-quick2
+test-no-qemu-quick2:
+    BUILD --pass-args ./tests+ga-no-qemu-quick2 \
         --GLOBAL_WAIT_END="$GLOBAL_WAIT_END"
 
 # test-no-qemu-quick runs the tests from ./tests+ga-no-qemu-normal

diff --git a/tests/Earthfile b/tests/Earthfile
@@ -14,7 +14,7 @@ ga:
 ga-qemu:
     BUILD ./platform+test
 
-ga-no-qemu-quick:
+ga-no-qemu-quick1:
     BUILD --pass-args ./autocompletion+test-all
     BUILD ./dockerfile+test
     BUILD ./dockerfile2/subdir+test
@@ -69,6 +69,8 @@ ga-no-qemu-quick:
     BUILD +escape-test --EARTHFILE=escape-v0.5.earth
     BUILD +escape-dir-test
     BUILD +fail-invalid-artifact-test
+
+ga-no-qemu-quick2:
     BUILD +target-first-line
     BUILD +absolute-reference-with-relative
     BUILD +end-comment
@@ -178,7 +180,8 @@ ga-no-qemu-kind:
     BUILD ./with-docker-kind+all
 
 ga-no-qemu:
-    BUILD +ga-no-qemu-quick
+    BUILD +ga-no-qemu-quick1
+    BUILD +ga-no-qemu-quick2
     BUILD +ga-no-qemu-normal
     BUILD +ga-no-qemu-slow