From 221011ee3704bb57cf25b1d5468bd85c43f9e02c Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Tue, 17 Nov 2026 16:34:26 +0000 Subject: [PATCH] [TASK] Pass the image test runner on to the image jobs as an artifact Every image job built ci/image-tests/Dockerfile from the cache of the job image-test-runner. Even with every step cached, BuildKit asks Docker Hub for the metadata of php:8.4-cli-alpine and composer:2, so each run sent about 300 anonymous requests to Docker Hub, and jobs failed with "429 Too Many Requests" in that step. The job image-test-runner now exports the runner per architecture as an archive for docker load (type=docker) and uploads it as the artifact webdevops-image-tests-, still with the cache of GitHub Actions. The image jobs download it and load it with docker load, without a request to Docker Hub. Only if the download or the load fails, e.g. because that job could not build the runner, they build it themselves from the cache as before. CONTRIBUTING.md, AGENTS.md and the comment in the Makefile describe the new way. --- .github/workflows/build.yaml | 871 +++++++++++++++++- AGENTS.md | 2 +- CONTRIBUTING.md | 4 +- Makefile | 2 +- ci/src/GithubJobBuilder.php | 101 +- .../Commands/GenerateGithubCiCommandTest.php | 35 + ci/tests/GithubJobBuilderTest.php | 67 +- 7 files changed, 1054 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 30ced584f..3627bb861 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -63,15 +63,29 @@ jobs: uses: docker/setup-buildx-action@v4 - name: 'Build the image test runner' + id: build-image-test-runner uses: docker/build-push-action@v7 continue-on-error: true with: context: . file: ci/image-tests/Dockerfile platforms: '${{ matrix.platform }}' - outputs: type=cacheonly + tags: webdevops-image-tests + outputs: 'type=docker,dest=.ci-image-test-runner/webdevops-image-tests.tar' cache-from: 'type=gha,scope=webdevops-image-tests-${{ matrix.arch }}' cache-to: 'type=gha,scope=webdevops-image-tests-${{ matrix.arch }},mode=max' + - + name: 'Upload the image test runner' + if: "${{ steps.build-image-test-runner.outcome == 'success' }}" + uses: actions/upload-artifact@v7 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner/webdevops-image-tests.tar + retention-days: 1 + overwrite: true + compression-level: 0 + if-no-files-found: error apache_alpine: strategy: fail-fast: false @@ -142,8 +156,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/base:alpine=oci-layout://.ci-oci-image/base_alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -272,8 +301,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/base:alpine=oci-layout://.ci-oci-image/base_alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -407,8 +451,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/base:ubuntu-22.04=oci-layout://.ci-oci-image/base_ubuntu-22-04:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -570,8 +629,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/bootstrap:alpine=oci-layout://.ci-oci-image/bootstrap_alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -731,8 +805,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/bootstrap:ubuntu-22.04=oci-layout://.ci-oci-image/bootstrap_ubuntu-22-04:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -894,8 +983,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -1055,8 +1159,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -1218,8 +1337,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/base-app:ubuntu-22.04=oci-layout://.ci-oci-image/base-app_ubuntu-22-04:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -1348,8 +1482,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/base:alpine=oci-layout://.ci-oci-image/base_alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -1478,8 +1627,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php-apache:8.2=oci-layout://.ci-oci-image/php-apache_8-2:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -1572,8 +1736,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php-apache:8.2-alpine=oci-layout://.ci-oci-image/php-apache_8-2-alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -1738,8 +1917,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php-apache:8.3=oci-layout://.ci-oci-image/php-apache_8-3:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -1832,8 +2026,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php-apache:8.3-alpine=oci-layout://.ci-oci-image/php-apache_8-3-alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -1998,8 +2207,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php-apache:8.4=oci-layout://.ci-oci-image/php-apache_8-4:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -2092,8 +2316,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php-apache:8.4-alpine=oci-layout://.ci-oci-image/php-apache_8-4-alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -2258,8 +2497,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php-apache:8.5=oci-layout://.ci-oci-image/php-apache_8-5:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -2352,8 +2606,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php-apache:8.5-alpine=oci-layout://.ci-oci-image/php-apache_8-5-alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -2518,8 +2787,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.2=oci-layout://.ci-oci-image/php_8-2:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -2638,8 +2922,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.2-alpine=oci-layout://.ci-oci-image/php_8-2-alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -2830,8 +3129,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.3=oci-layout://.ci-oci-image/php_8-3:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -2950,8 +3264,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.3-alpine=oci-layout://.ci-oci-image/php_8-3-alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -3142,8 +3471,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.4=oci-layout://.ci-oci-image/php_8-4:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -3262,8 +3606,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.4-alpine=oci-layout://.ci-oci-image/php_8-4-alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -3454,8 +3813,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.5=oci-layout://.ci-oci-image/php_8-5:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -3574,8 +3948,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.5-alpine=oci-layout://.ci-oci-image/php_8-5-alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -3766,8 +4155,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.2=oci-layout://.ci-oci-image/php_8-2:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -3865,8 +4269,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.2-alpine=oci-layout://.ci-oci-image/php_8-2-alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -4036,8 +4455,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.3=oci-layout://.ci-oci-image/php_8-3:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -4135,8 +4569,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.3-alpine=oci-layout://.ci-oci-image/php_8-3-alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -4306,8 +4755,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.4=oci-layout://.ci-oci-image/php_8-4:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -4405,8 +4869,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.4-alpine=oci-layout://.ci-oci-image/php_8-4-alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -4576,8 +5055,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.5=oci-layout://.ci-oci-image/php_8-5:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -4675,8 +5169,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.5-alpine=oci-layout://.ci-oci-image/php_8-5-alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -4846,8 +5355,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php-nginx:8.2=oci-layout://.ci-oci-image/php-nginx_8-2:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -4940,8 +5464,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php-nginx:8.2-alpine=oci-layout://.ci-oci-image/php-nginx_8-2-alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -5106,8 +5645,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php-nginx:8.3=oci-layout://.ci-oci-image/php-nginx_8-3:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -5200,8 +5754,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php-nginx:8.3-alpine=oci-layout://.ci-oci-image/php-nginx_8-3-alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -5366,8 +5935,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php-nginx:8.4=oci-layout://.ci-oci-image/php-nginx_8-4:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -5460,8 +6044,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php-nginx:8.4-alpine=oci-layout://.ci-oci-image/php-nginx_8-4-alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -5626,8 +6225,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php-nginx:8.5=oci-layout://.ci-oci-image/php-nginx_8-5:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -5720,8 +6334,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php-nginx:8.5-alpine=oci-layout://.ci-oci-image/php-nginx_8-5-alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -5886,8 +6515,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.2=oci-layout://.ci-oci-image/php_8-2:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -6011,8 +6655,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.2-alpine=oci-layout://.ci-oci-image/php_8-2-alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -6208,8 +6867,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.3=oci-layout://.ci-oci-image/php_8-3:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -6333,8 +7007,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.3-alpine=oci-layout://.ci-oci-image/php_8-3-alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -6530,8 +7219,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.4=oci-layout://.ci-oci-image/php_8-4:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -6655,8 +7359,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.4-alpine=oci-layout://.ci-oci-image/php_8-4-alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -6852,8 +7571,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.5=oci-layout://.ci-oci-image/php_8-5:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -6977,8 +7711,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/php:8.5-alpine=oci-layout://.ci-oci-image/php_8-5-alpine:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -7174,8 +7923,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -7299,8 +8063,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -7500,8 +8279,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -7625,8 +8419,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -7826,8 +8635,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -7951,8 +8775,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -8152,8 +8991,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . @@ -8277,8 +9131,23 @@ jobs: build-args: 'TARGETARCH=${{ matrix.arch }}' secret-envs: COMPOSER_AUTH=COMPOSER_AUTH build-contexts: 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image' + - + name: 'Download the image test runner' + id: download-image-test-runner + uses: actions/download-artifact@v8 + continue-on-error: true + with: + name: 'webdevops-image-tests-${{ matrix.arch }}' + path: .ci-image-test-runner + - + name: 'Load the image test runner' + id: load-image-test-runner + if: "${{ steps.download-image-test-runner.outcome == 'success' }}" + continue-on-error: true + run: 'docker load --input .ci-image-test-runner/webdevops-image-tests.tar' - name: 'Build the image test runner' + if: "${{ steps.load-image-test-runner.outcome != 'success' }}" uses: docker/build-push-action@v7 with: context: . diff --git a/AGENTS.md b/AGENTS.md index 2ea77f5ca..6cf06ae64 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -27,7 +27,7 @@ Only these commands are known to work: - `docker build -t webdevops/: docker//` builds one image; its parent and `webdevops/toolbox` come from local images or Docker Hub. - `./build-local.sh [version]` builds all PHP images of one version. - `make check` installs the PHP tools of `ci/` and checks the PHP code in `ci/` with GrumPHP: coding standard, PHPStan, Rector, `composer audit` and the PHPUnit tests. Run it after every change to `ci/`. GrumPHP and PHPStan only check files that Git knows (`git ls-files`), so `git add` new files first; PHPUnit runs every test anyway. `make test` runs only the tests. Changes to `ci/src` come with tests. -- `make test-image IMAGE=webdevops/:` runs the image tests of that image against a container of it; `REFERENCE=` tests another image, e.g. a local build, with the same tests. It builds `ci/image-tests/Dockerfile` (`make test-image-runner`) and runs it with the Docker socket (`make test-image-run`); the CI runs `make test-image-run` after building the runner with its cache. +- `make test-image IMAGE=webdevops/:` runs the image tests of that image against a container of it; `REFERENCE=` tests another image, e.g. a local build, with the same tests. It builds `ci/image-tests/Dockerfile` (`make test-image-runner`) and runs it with the Docker socket (`make test-image-run`); the CI runs `make test-image-run` after loading the runner that the job `image-test-runner` passes on. - `make generate`, `make check` and `make test` run as your user, so the files they write belong to you. Do not write into the checkout as root. Besides `generate`, `check` and `test`, the Makefile has `structure-test`. `make structure-test` runs container-structure-test against your local images of `bootstrap`, `base`, `base-app`, `php`, `php-dev` and `php-nginx`, the images that have a suite in `tests/structure-test`. It tests only the tags in `.github/workflows/build.yaml` and fails if a test fails, if `docker` fails or if no such image exists locally; run it inside `webdevops/dockerfile-build-env` with the Docker socket mounted. The CI runs the image tests for every image except `toolbox`, and container-structure-test for the six images above; to check a change by hand, start the image and try it as described below. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index efd2d5e6d..8248dd33a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -115,7 +115,9 @@ A container counts as started once its entrypoint has run its scripts and starte A runner killed with `SIGKILL` leaves its containers behind; they carry the label `webdevops.image-test`, so `docker rm --force $(docker ps --all --quiet --filter label=webdevops.image-test)` removes them. It runs in a container of `ci/image-tests/Dockerfile`, which has PHP and the `docker` command and gets the Docker socket: `make test-image` builds that image (`make test-image-runner`) and runs the tests in it (`make test-image-run`). The runner builds on the official PHP image, not on a webdevops image, so a broken `webdevops/php` cannot break the tests that find the defect. -In the CI, the job `image-test-runner` builds it once per architecture into the cache of GitHub Actions; the image jobs wait for it, load it from the cache and run `make test-image-run`. If that job fails, the image jobs still run and build the runner themselves. +In the CI, the job `image-test-runner` builds it once per architecture, with the cache of GitHub Actions, and passes it on as an artifact; the image jobs wait for it, load it with `docker load` and run `make test-image-run`. +So only that job asks Docker Hub for the images that `ci/image-tests/Dockerfile` builds on, not every image job: a build, even from the cache, would ask once per job. +If that job cannot pass the runner on, the image jobs still run and build the runner themselves, from its cache. ## PHP extension builds diff --git a/Makefile b/Makefile index fa00db98b..7c380142d 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ test: # Runs the image tests of IMAGE (webdevops/:) against a container of REFERENCE, by default IMAGE itself, # e.g. make test-image IMAGE=webdevops/php-nginx:8.5 REFERENCE=my-build. The tests run in a container of # ci/image-tests/Dockerfile, which starts the container of the image through the Docker socket. test-image builds that -# runner first; test-image-run uses the runner that is already built, as the CI does after building it with its cache. +# runner first; test-image-run uses the runner that is already there, as the CI does after loading it with docker load. DOCKER_SOCKET ?= $(if $(ROOTLESS),$(patsubst unix://%,%,$(shell docker context inspect --format '{{.Endpoints.docker.Host}}' 2>/dev/null)),/var/run/docker.sock) ifneq ($(filter test-image test-image-run,$(MAKECMDGOALS)),) ifeq ($(IMAGE),) diff --git a/ci/src/GithubJobBuilder.php b/ci/src/GithubJobBuilder.php index 5b7a0f142..766fe65ef 100644 --- a/ci/src/GithubJobBuilder.php +++ b/ci/src/GithubJobBuilder.php @@ -19,13 +19,20 @@ class GithubJobBuilder /** * Local tag of the image that runs the image tests, built from ci/image-tests/Dockerfile. The job - * IMAGE_TEST_RUNNER_JOB builds it once per architecture into the GitHub Actions cache; the image jobs load it from - * there, so Composer only runs when ci/composer.lock changes and only one job writes the cache. + * IMAGE_TEST_RUNNER_JOB builds it once per architecture, with the GitHub Actions cache, so Composer only runs when + * ci/composer.lock changes and only one job writes the cache. It passes the image on as an artifact, which the image + * jobs load with docker load: a build, even from the cache, would ask Docker Hub for the images that + * ci/image-tests/Dockerfile builds on, once per image job. */ private const string IMAGE_TEST_RUNNER = 'webdevops-image-tests'; public const string IMAGE_TEST_RUNNER_JOB = 'image-test-runner'; + /** + * The image test runner as an archive for docker load, relative to the checkout like getCiImagePath(). + */ + private const string IMAGE_TEST_RUNNER_ARCHIVE = '.ci-image-test-runner/' . self::IMAGE_TEST_RUNNER . '.tar'; + /** * PIE resolves and downloads the PHP extensions through the GitHub API. Without a token, its requests count against * the limit for anonymous requests of the runner's IP address, and PIE fails with "Could not authenticate against @@ -156,17 +163,7 @@ public function getJobsDescription(array $node): array ['build-contexts' => $this->buildContexts($imageDependencies)], ), ] : null, - $imageTests ? [ - 'name' => 'Build the image test runner', - 'uses' => 'docker/build-push-action@v7', - 'with' => [ - 'context' => '.', - 'file' => 'ci/image-tests/Dockerfile', - 'load' => true, - 'tags' => self::IMAGE_TEST_RUNNER, - 'cache-from' => $this->imageTestRunnerCache(), - ], - ] : null, + ...($imageTests ? $this->imageTestRunnerSteps() : []), $imageTests ? [ 'name' => 'run image tests', 'run' => $imageTests, @@ -492,8 +489,50 @@ private function structuredTests(array $node): array } /** - * Builds the image test runner once per architecture into the GitHub Actions cache, from which the image jobs load - * it. It runs while the first images are built. + * Steps of an image job that provide the image test runner: they load the archive of the job IMAGE_TEST_RUNNER_JOB, + * without a request to Docker Hub. Only if there is none or it does not load, e.g. because that job failed, the job + * builds the runner itself, from the cache that IMAGE_TEST_RUNNER_JOB writes. + * + * @return list> + */ + private function imageTestRunnerSteps(): array + { + return [ + [ + 'name' => 'Download the image test runner', + 'id' => 'download-image-test-runner', + 'uses' => 'actions/download-artifact@v8', + 'continue-on-error' => true, + 'with' => [ + 'name' => $this->imageTestRunnerArtifactName(), + 'path' => dirname(self::IMAGE_TEST_RUNNER_ARCHIVE), + ], + ], + [ + 'name' => 'Load the image test runner', + 'id' => 'load-image-test-runner', + 'if' => '${{ steps.download-image-test-runner.outcome == \'success\' }}', + 'continue-on-error' => true, + 'run' => 'docker load --input ' . self::IMAGE_TEST_RUNNER_ARCHIVE, + ], + [ + 'name' => 'Build the image test runner', + 'if' => '${{ steps.load-image-test-runner.outcome != \'success\' }}', + 'uses' => 'docker/build-push-action@v7', + 'with' => [ + 'context' => '.', + 'file' => 'ci/image-tests/Dockerfile', + 'load' => true, + 'tags' => self::IMAGE_TEST_RUNNER, + 'cache-from' => $this->imageTestRunnerCache(), + ], + ], + ]; + } + + /** + * Builds the image test runner once per architecture, with the GitHub Actions cache, and passes it on to the image + * jobs as an artifact. It runs while the first images are built. * * @return array */ @@ -514,21 +553,39 @@ public function getImageTestRunnerConfig(): array 'with' => ['persist-credentials' => false], ], ['uses' => 'docker/setup-buildx-action@v4'], + // If a step fails, e.g. on a transient error of the cache or of Docker Hub, the job still succeeds: + // the image jobs that need it run anyway and build the runner themselves. [ 'name' => 'Build the image test runner', + 'id' => 'build-image-test-runner', 'uses' => 'docker/build-push-action@v7', - // Only warms the cache: if it fails, e.g. on a transient error of the cache or of Docker Hub, the - // image jobs that need this job still run and build the runner themselves. 'continue-on-error' => true, 'with' => [ 'context' => '.', 'file' => 'ci/image-tests/Dockerfile', 'platforms' => '${{ matrix.platform }}', - 'outputs' => 'type=cacheonly', + 'tags' => self::IMAGE_TEST_RUNNER, + 'outputs' => 'type=docker,dest=' . self::IMAGE_TEST_RUNNER_ARCHIVE, 'cache-from' => $this->imageTestRunnerCache(), 'cache-to' => $this->imageTestRunnerCache() . ',mode=max', ], ], + [ + 'name' => 'Upload the image test runner', + 'if' => '${{ steps.build-image-test-runner.outcome == \'success\' }}', + 'uses' => 'actions/upload-artifact@v7', + 'continue-on-error' => true, + 'with' => [ + 'name' => $this->imageTestRunnerArtifactName(), + 'path' => self::IMAGE_TEST_RUNNER_ARCHIVE, + 'retention-days' => 1, + // A rerun must replace the previous attempt's runner. + 'overwrite' => true, + // The layers in the archive are compressed already. + 'compression-level' => 0, + 'if-no-files-found' => 'error', + ], + ], ], ]; } @@ -538,6 +595,14 @@ private function imageTestRunnerCache(): string return 'type=gha,scope=' . self::IMAGE_TEST_RUNNER . '-${{ matrix.arch }}'; } + /** + * Artifact name of the image test runner, one per architecture like the runner itself. + */ + private function imageTestRunnerArtifactName(): string + { + return self::IMAGE_TEST_RUNNER . '-${{ matrix.arch }}'; + } + /** * Checks the PHP code in ci/ with GrumPHP: coding standard, PHPStan, Rector, composer audit and PHPUnit. * No other job waits for it, so a finding does not stop the images from being built. diff --git a/ci/tests/Commands/GenerateGithubCiCommandTest.php b/ci/tests/Commands/GenerateGithubCiCommandTest.php index a0943d1bd..e085fe193 100644 --- a/ci/tests/Commands/GenerateGithubCiCommandTest.php +++ b/ci/tests/Commands/GenerateGithubCiCommandTest.php @@ -18,6 +18,7 @@ use function array_diff; use function array_keys; use function array_values; +use function preg_match_all; use function strpos; use function substr; @@ -107,6 +108,40 @@ public function testParentImagesArePassedOnBetweenJobs(): void self::assertArrayNotHasKey('Export image (OCI layout)', $steps('php_8-4')); } + public function testImageJobsLoadTheImageTestRunnerOfTheRunnerJob(): void + { + $jobs = $this->generate()['jobs']; + $upload = array_column($jobs['image-test-runner']['steps'], null, 'name')['Upload the image test runner']['with']; + + foreach (['base_alpine', 'php_8-4'] as $job) { + $steps = array_column($jobs[$job]['steps'], null, 'name'); + self::assertSame($upload['name'], $steps['Download the image test runner']['with']['name'], $job); + self::assertSame('docker load --input ' . $upload['path'], $steps['Load the image test runner']['run'], $job); + } + } + + public function testStepConditionsReferToEarlierStepsOfTheirJob(): void + { + $references = 0; + foreach ($this->generate()['jobs'] as $jobId => $job) { + $ids = []; + foreach ($job['steps'] as $step) { + preg_match_all('/\bsteps\.([\w-]+)\./', $step['if'] ?? '', $matches); + foreach ($matches[1] as $id) { + self::assertContains($id, $ids, $jobId . ': ' . ($step['name'] ?? $step['uses'])); + ++$references; + } + + if (isset($step['id'])) { + self::assertNotContains($step['id'], $ids, $jobId . ': step ids are unique'); + $ids[] = $step['id']; + } + } + } + + self::assertGreaterThan(0, $references); + } + public function testPublishesTheAliases(): void { $jobs = $this->generate()['jobs']; diff --git a/ci/tests/GithubJobBuilderTest.php b/ci/tests/GithubJobBuilderTest.php index f97e26797..6635a25d6 100644 --- a/ci/tests/GithubJobBuilderTest.php +++ b/ci/tests/GithubJobBuilderTest.php @@ -56,21 +56,41 @@ public function testJobWaitsForItsParentAndTheImageTestRunner(): void self::assertSame('toolbox_latest_publish', $this->jobs(['image' => 'php-nginx'])['base_alpine']['needs'], 'no image tests, no runner'); } - public function testImageTestRunnerIsBuiltOncePerArchitectureIntoTheCache(): void + public function testImageTestRunnerIsBuiltOncePerArchitectureAndPassedOn(): void { $job = new GithubJobBuilder(self::ROOT)->getImageTestRunnerConfig(); + $steps = $this->steps(['job' => $job], 'job'); self::assertSame(['fail-fast' => false, 'matrix' => ['include' => GithubJobBuilder::PLATFORMS]], $job['strategy']); self::assertSame('${{ matrix.runner }}', $job['runs-on']); + self::assertSame( + ['actions/checkout@v7', 'docker/setup-buildx-action@v4', 'Build the image test runner', 'Upload the image test runner'], + array_keys($steps), + ); + $build = $steps['Build the image test runner']; self::assertSame([ 'context' => '.', 'file' => 'ci/image-tests/Dockerfile', 'platforms' => '${{ matrix.platform }}', - 'outputs' => 'type=cacheonly', + 'tags' => 'webdevops-image-tests', + // an archive for docker load in the image jobs + 'outputs' => 'type=docker,dest=.ci-image-test-runner/webdevops-image-tests.tar', 'cache-from' => 'type=gha,scope=webdevops-image-tests-${{ matrix.arch }}', 'cache-to' => 'type=gha,scope=webdevops-image-tests-${{ matrix.arch }},mode=max', - ], $job['steps'][2]['with']); - self::assertTrue($job['steps'][2]['continue-on-error'], 'a failure must not skip the image jobs that need this job'); + ], $build['with']); + $upload = $steps['Upload the image test runner']; + self::assertSame('${{ steps.' . $build['id'] . ".outcome == 'success' }}", $upload['if']); + self::assertSame([ + 'name' => 'webdevops-image-tests-${{ matrix.arch }}', + 'path' => '.ci-image-test-runner/webdevops-image-tests.tar', + 'retention-days' => 1, + 'overwrite' => true, + 'compression-level' => 0, + 'if-no-files-found' => 'error', + ], $upload['with']); + foreach ([$build, $upload] as $step) { + self::assertTrue($step['continue-on-error'], $step['name'] . ': a failure must not skip the image jobs that need this job'); + } } public function testEveryBuildGetsTheTokenOfTheRunForPie(): void @@ -110,6 +130,8 @@ public function testImageWithoutDependenciesIsBuiltOnce(): void 'actions/checkout@v7', 'docker/setup-buildx-action@v4', 'Build (load locally)', + 'Download the image test runner', + 'Load the image test runner', 'Build the image test runner', 'run image tests', 'run structure-test', @@ -123,10 +145,33 @@ public function testImageWithoutDependenciesIsBuiltOnce(): void ); } - public function testImageTestsRunAgainstTheImageOfTheJob(): void + public function testImageJobLoadsTheImageTestRunnerOfTheRunnerJob(): void { $steps = $this->steps($this->jobs()); + $runnerJob = $this->steps(['job' => new GithubJobBuilder(self::ROOT)->getImageTestRunnerConfig()], 'job'); + $upload = $runnerJob['Upload the image test runner']['with']; + + $download = $steps['Download the image test runner']; + self::assertSame('actions/download-artifact@v8', $download['uses']); + self::assertSame(['name' => $upload['name'], 'path' => '.ci-image-test-runner'], $download['with']); + self::assertTrue($download['continue-on-error'], 'without the artifact, the job builds the runner itself'); + + $load = $steps['Load the image test runner']; + self::assertSame('${{ steps.' . $download['id'] . ".outcome == 'success' }}", $load['if']); + // the file that the runner job uploads, in the directory that the download writes to + self::assertSame('docker load --input ' . $upload['path'], $load['run']); + self::assertTrue($load['continue-on-error'], 'an archive that does not load is built instead'); + } + public function testImageJobBuildsTheImageTestRunnerOnlyIfItDoesNotLoad(): void + { + $steps = $this->steps($this->jobs()); + + self::assertSame( + '${{ steps.' . $steps['Load the image test runner']['id'] . ".outcome != 'success' }}", + $steps['Build the image test runner']['if'], + ); + self::assertArrayNotHasKey('continue-on-error', $steps['Build the image test runner']); self::assertSame([ 'context' => '.', 'file' => 'ci/image-tests/Dockerfile', @@ -135,6 +180,12 @@ public function testImageTestsRunAgainstTheImageOfTheJob(): void // the job image-test-runner writes the cache, the image jobs only read it 'cache-from' => 'type=gha,scope=webdevops-image-tests-${{ matrix.arch }}', ], $steps['Build the image test runner']['with']); + } + + public function testImageTestsRunAgainstTheImageOfTheJob(): void + { + $steps = $this->steps($this->jobs()); + self::assertSame( 'make test-image-run IMAGE=webdevops/base:alpine REFERENCE=ghcr.io/webdevops/base:sha-${{ github.sha }}-${{ matrix.arch }}-alpine', $steps['run image tests']['run'], @@ -175,6 +226,8 @@ public function testImageWithoutTestsHasNoTestSteps(): void { $steps = $this->steps($this->jobs(['image' => 'php-nginx'])); + self::assertArrayNotHasKey('Download the image test runner', $steps); + self::assertArrayNotHasKey('Load the image test runner', $steps); self::assertArrayNotHasKey('Build the image test runner', $steps); self::assertArrayNotHasKey('run image tests', $steps); self::assertArrayNotHasKey('run structure-test', $steps); @@ -195,6 +248,8 @@ public function testBranchBuildUsesTheParentImagesOfThisRun(): void 'Download parent image (OCI layout): webdevops/toolbox:latest', 'Build (load locally)', 'Build (load locally, from parent artifact)', + 'Download the image test runner', + 'Load the image test runner', 'Build the image test runner', 'run image tests', 'run structure-test', @@ -230,7 +285,7 @@ public function testParentThatIsAlsoCopiedFromIsDownloadedOnce(): void . 'webdevops/toolbox=oci-layout://.ci-oci-image/toolbox_latest:ci-parent-image', $steps['Build (load locally, from parent artifact)']['with']['build-contexts'], ); - self::assertCount(1, array_filter(array_keys($steps), fn (string $name): bool => str_starts_with($name, 'Download'))); + self::assertCount(1, array_filter(array_keys($steps), fn (string $name): bool => str_starts_with($name, 'Download parent image'))); } public function testImageWithChildrenPassesItselfOn(): void