diff --git a/.github/workflows/ci-docker-satellites.yml b/.github/workflows/ci-docker-satellites.yml index 81b98a65..57455b2e 100644 --- a/.github/workflows/ci-docker-satellites.yml +++ b/.github/workflows/ci-docker-satellites.yml @@ -60,11 +60,11 @@ jobs: EARTHLY_ORG: "earthly-technologies" secrets: inherit - docker-tests-no-qemu-quick1: + docker-tests-no-qemu-group1: needs: build-earthly uses: ./.github/workflows/reusable-test.yml with: - TEST_TARGET: "+test-no-qemu-quick1" + TEST_TARGET: "+test-no-qemu-group1" BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" @@ -74,11 +74,11 @@ jobs: EARTHLY_ORG: "earthly-technologies" secrets: inherit - docker-tests-no-qemu-quick2: + docker-tests-no-qemu-group2: needs: build-earthly uses: ./.github/workflows/reusable-test.yml with: - TEST_TARGET: "+test-no-qemu-quick2" + TEST_TARGET: "+test-no-qemu-group2" BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" @@ -88,11 +88,25 @@ jobs: EARTHLY_ORG: "earthly-technologies" secrets: inherit - docker-tests-no-qemu-normal: + docker-tests-no-qemu-group3: needs: build-earthly uses: ./.github/workflows/reusable-test.yml with: - TEST_TARGET: "+test-no-qemu-normal" + TEST_TARGET: "+test-no-qemu-group3" + 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-group4: + needs: build-earthly + uses: ./.github/workflows/reusable-test.yml + with: + TEST_TARGET: "+test-no-qemu-group4" 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 index a4c55c94..2987978a 100644 --- a/.github/workflows/ci-docker-ubuntu.yml +++ b/.github/workflows/ci-docker-ubuntu.yml @@ -66,12 +66,12 @@ jobs: SKIP_JOB: ${{ needs.build-earthly.result != 'success' }} secrets: inherit - docker-tests-no-qemu-quick1: + docker-tests-no-qemu-group1: needs: build-earthly if: ${{ !failure() }} uses: ./.github/workflows/reusable-test.yml with: - TEST_TARGET: "+test-no-qemu-quick1" + TEST_TARGET: "+test-no-qemu-group1" BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" @@ -79,12 +79,12 @@ jobs: SKIP_JOB: ${{ needs.build-earthly.result != 'success' }} secrets: inherit - docker-tests-no-qemu-quick2: + docker-tests-no-qemu-group2: needs: build-earthly if: ${{ !failure() }} uses: ./.github/workflows/reusable-test.yml with: - TEST_TARGET: "+test-no-qemu-quick2" + TEST_TARGET: "+test-no-qemu-group2" BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" @@ -92,12 +92,12 @@ jobs: SKIP_JOB: ${{ needs.build-earthly.result != 'success' }} secrets: inherit - docker-tests-no-qemu-quick1-no-logbus: + docker-tests-no-qemu-group1-no-logbus: needs: build-earthly if: ${{ !failure() }} uses: ./.github/workflows/reusable-test.yml with: - TEST_TARGET: "+test-no-qemu-quick1" + TEST_TARGET: "+test-no-qemu-group1" BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" @@ -106,12 +106,12 @@ jobs: SKIP_JOB: ${{ needs.build-earthly.result != 'success' }} secrets: inherit - docker-tests-no-qemu-quick2-no-logbus: + docker-tests-no-qemu-group2-no-logbus: needs: build-earthly if: ${{ !failure() }} uses: ./.github/workflows/reusable-test.yml with: - TEST_TARGET: "+test-no-qemu-quick2" + TEST_TARGET: "+test-no-qemu-group2" BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" @@ -120,12 +120,12 @@ jobs: SKIP_JOB: ${{ needs.build-earthly.result != 'success' }} secrets: inherit - docker-tests-no-qemu-normal: + docker-tests-no-qemu-group3: needs: build-earthly if: ${{ !failure() }} uses: ./.github/workflows/reusable-test.yml with: - TEST_TARGET: "+test-no-qemu-normal" + TEST_TARGET: "+test-no-qemu-group3" BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" @@ -133,12 +133,39 @@ jobs: SKIP_JOB: ${{ needs.build-earthly.result != 'success' }} secrets: inherit - docker-tests-no-qemu-normal-no-logbus: + docker-tests-no-qemu-group3-no-logbus: needs: build-earthly if: ${{ !failure() }} uses: ./.github/workflows/reusable-test.yml with: - TEST_TARGET: "+test-no-qemu-normal" + TEST_TARGET: "+test-no-qemu-group3" + 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-group4: + needs: build-earthly + if: ${{ !failure() }} + uses: ./.github/workflows/reusable-test.yml + with: + TEST_TARGET: "+test-no-qemu-group4" + 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-group4-no-logbus: + needs: build-earthly + if: ${{ !failure() }} + uses: ./.github/workflows/reusable-test.yml + with: + TEST_TARGET: "+test-no-qemu-group4" BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "docker" @@ -385,7 +412,7 @@ jobs: TARGET_NAME: "+test-quick" secrets: inherit - docker-wait-block-no-qemu-quick1: + docker-wait-block-no-qemu-group1: needs: build-earthly if: ${{ !failure() }} uses: ./.github/workflows/reusable-wait-block-target.yml @@ -395,10 +422,10 @@ jobs: BINARY: "docker" SUDO: "" SKIP_JOB: ${{ needs.build-earthly.result != 'success' }} - TARGET_NAME: "+test-no-qemu-quick1" + TARGET_NAME: "+test-no-qemu-group1" secrets: inherit - docker-wait-block-no-qemu-quick2: + docker-wait-block-no-qemu-group2: needs: build-earthly if: ${{ !failure() }} uses: ./.github/workflows/reusable-wait-block-target.yml @@ -408,10 +435,10 @@ jobs: BINARY: "docker" SUDO: "" SKIP_JOB: ${{ needs.build-earthly.result != 'success' }} - TARGET_NAME: "+test-no-qemu-quick2" + TARGET_NAME: "+test-no-qemu-group2" secrets: inherit - docker-wait-block-no-qemu-normal: + docker-wait-block-no-qemu-group3: needs: build-earthly if: ${{ !failure() }} uses: ./.github/workflows/reusable-wait-block-target.yml @@ -421,7 +448,20 @@ jobs: BINARY: "docker" SUDO: "" SKIP_JOB: ${{ needs.build-earthly.result != 'success' }} - TARGET_NAME: "+test-no-qemu-normal" + TARGET_NAME: "+test-no-qemu-group3" + secrets: inherit + + docker-wait-block-no-qemu-group4: + 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-group4" secrets: inherit docker-wait-block-no-qemu-slow: @@ -476,13 +516,27 @@ jobs: SKIP_JOB: ${{ needs.build-earthly.result != 'success' }} secrets: inherit - race-tests-no-qemu-quick1: + race-tests-no-qemu-group1: + 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-group1" + RUNS_ON: "ubuntu-latest" + USE_QEMU: false + BINARY: "docker" + SUDO: "" + SKIP_JOB: ${{ needs.build-earthly.result != 'success' }} + secrets: inherit + + race-tests-no-qemu-group2: 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" + TEST_TARGET: "+test-no-qemu-group2" RUNS_ON: "ubuntu-latest" USE_QEMU: false BINARY: "docker" @@ -490,13 +544,13 @@ jobs: SKIP_JOB: ${{ needs.build-earthly.result != 'success' }} secrets: inherit - race-tests-no-qemu-quick2: + race-tests-no-qemu-group3: 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-quick2" + TEST_TARGET: "+test-no-qemu-group3" RUNS_ON: "ubuntu-latest" USE_QEMU: false BINARY: "docker" @@ -504,13 +558,13 @@ jobs: SKIP_JOB: ${{ needs.build-earthly.result != 'success' }} secrets: inherit - race-tests-no-qemu-normal: + race-tests-no-qemu-group4: 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-normal" + TEST_TARGET: "+test-no-qemu-group4" 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 index ea462904..ebab6ca0 100644 --- a/.github/workflows/ci-podman-ubuntu.yml +++ b/.github/workflows/ci-podman-ubuntu.yml @@ -66,12 +66,12 @@ jobs: SKIP_JOB: ${{ needs.build-earthly.result != 'success' }} secrets: inherit - podman-tests-no-qemu-quick1: + podman-tests-no-qemu-group1: needs: build-earthly if: ${{ !failure() }} uses: ./.github/workflows/reusable-test.yml with: - TEST_TARGET: "+test-no-qemu-quick1" + TEST_TARGET: "+test-no-qemu-group1" BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" @@ -79,12 +79,12 @@ jobs: SKIP_JOB: ${{ needs.build-earthly.result != 'success' }} secrets: inherit - podman-tests-no-qemu-quick2: + podman-tests-no-qemu-group2: needs: build-earthly if: ${{ !failure() }} uses: ./.github/workflows/reusable-test.yml with: - TEST_TARGET: "+test-no-qemu-quick2" + TEST_TARGET: "+test-no-qemu-group2" BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" @@ -92,12 +92,25 @@ jobs: SKIP_JOB: ${{ needs.build-earthly.result != 'success' }} secrets: inherit - podman-tests-no-qemu-normal: + podman-tests-no-qemu-group3: needs: build-earthly if: ${{ !failure() }} uses: ./.github/workflows/reusable-test.yml with: - TEST_TARGET: "+test-no-qemu-normal" + TEST_TARGET: "+test-no-qemu-group3" + 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-group4: + needs: build-earthly + if: ${{ !failure() }} + uses: ./.github/workflows/reusable-test.yml + with: + TEST_TARGET: "+test-no-qemu-group4" BUILT_EARTHLY_PATH: "./build/linux/amd64/earthly" RUNS_ON: "ubuntu-latest" BINARY: "podman" diff --git a/Earthfile b/Earthfile index 7f4b0ec8..64d75ade 100644 --- a/Earthfile +++ b/Earthfile @@ -693,9 +693,10 @@ lint-docs: # using secure docker hub mirror configurations test-no-qemu: BUILD --pass-args +test-quick - BUILD --pass-args +test-no-qemu-quick1 - BUILD --pass-args +test-no-qemu-quick2 - BUILD --pass-args +test-no-qemu-normal + BUILD --pass-args +test-no-qemu-group1 + BUILD --pass-args +test-no-qemu-group2 + BUILD --pass-args +test-no-qemu-group3 + BUILD --pass-args +test-no-qemu-group4 BUILD --pass-args +test-no-qemu-slow # test-quick runs the unit, chaos, offline, and go tests and ensures the earthly script does not write to stdout @@ -706,19 +707,24 @@ test-quick: BUILD +earthly-script-no-stdout BUILD --pass-args ./ast/tests+all -# 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 \ +# test-no-qemu-group1 runs the tests from ./tests+ga-no-qemu-group1 +test-no-qemu-group1: + BUILD --pass-args ./tests+ga-no-qemu-group1 \ --GLOBAL_WAIT_END="$GLOBAL_WAIT_END" -# test-no-qemu-quick2 runs the tests from ./tests+ga-no-qemu-quick2 -test-no-qemu-quick2: - BUILD --pass-args ./tests+ga-no-qemu-quick2 \ +# test-no-qemu-group2 runs the tests from ./tests+ga-no-qemu-group2 +test-no-qemu-group2: + BUILD --pass-args ./tests+ga-no-qemu-group2 \ --GLOBAL_WAIT_END="$GLOBAL_WAIT_END" -# test-no-qemu-normal runs the tests from ./tests+ga-no-qemu-normal -test-no-qemu-normal: - BUILD --pass-args ./tests+ga-no-qemu-normal \ +# test-no-qemu-group3 runs the tests from ./tests+ga-no-qemu-group3 +test-no-qemu-group3: + BUILD --pass-args ./tests+ga-no-qemu-group3 \ + --GLOBAL_WAIT_END="$GLOBAL_WAIT_END" + +# test-no-qemu-group4 runs the tests from ./tests+ga-no-qemu-group4 +test-no-qemu-group4: + BUILD --pass-args ./tests+ga-no-qemu-group4 \ --GLOBAL_WAIT_END="$GLOBAL_WAIT_END" # test-no-qemu-slow runs the tests from ./tests+ga-no-qemu-slow diff --git a/tests/Earthfile b/tests/Earthfile index 49e60f59..5f60c617 100644 --- a/tests/Earthfile +++ b/tests/Earthfile @@ -14,7 +14,7 @@ ga: ga-qemu: BUILD ./platform+test -ga-no-qemu-quick1: +ga-no-qemu-group1: BUILD --pass-args ./autocompletion+test-all BUILD ./dockerfile+test BUILD ./dockerfile2/subdir+test @@ -70,7 +70,7 @@ ga-no-qemu-quick1: BUILD +escape-dir-test BUILD +fail-invalid-artifact-test -ga-no-qemu-quick2: +ga-no-qemu-group2: BUILD +target-first-line BUILD +absolute-reference-with-relative BUILD +end-comment @@ -139,7 +139,7 @@ ga-no-qemu-quick2: BUILD ./with-docker-via-command+test END -ga-no-qemu-normal: +ga-no-qemu-group3: BUILD +cache-test BUILD --pass-args ./do-not-track+test-all BUILD --pass-args ./scrub-https-credentials+all @@ -152,6 +152,8 @@ ga-no-qemu-normal: BUILD +remote-test BUILD +save-artifact-dont-overwrite BUILD ./with-docker-expose+all + +ga-no-qemu-group4: BUILD +cache-mount-arg BUILD +infinite-recursion BUILD +save-artifact-selective @@ -180,9 +182,10 @@ ga-no-qemu-kind: BUILD ./with-docker-kind+all ga-no-qemu: - BUILD +ga-no-qemu-quick1 - BUILD +ga-no-qemu-quick2 - BUILD +ga-no-qemu-normal + BUILD +ga-no-qemu-group1 + BUILD +ga-no-qemu-group2 + BUILD +ga-no-qemu-group3 + BUILD +ga-no-qemu-group4 BUILD +ga-no-qemu-slow tests-that-require-earthly-technologies-account-access: