test: verify DOCKER_ORG fix on fork PR for #8609 phase 2 manual test 12

.buildkite/perf.sh

@@ -19,6 +19,9 @@ if [[ ${BUILDKITE_MESSAGE:-} == *"[skip buildkite]"* ]] || [[ ${BUILDKITE_MESSAG
   exit 0
 fi
 
+# A changed image may still be waiting on image-push.yml's approval
+"$(dirname "$0")/../containers/wait-for-images.sh"
+
 os=$(go env GOOS)
 
 # shellcheck source=lib-provider.sh

.buildkite/test.sh

@@ -25,6 +25,9 @@ while IFS= read -r varname; do
 done < <(MSYS_NO_PATHCONV=1 git ls-tree --name-only refs/public-variables-tmp:.github/public-variables/)
 git update-ref -d refs/public-variables-tmp
 
+# A changed image may still be waiting on image-push.yml's approval
+"$(dirname "$0")/../containers/wait-for-images.sh"
+
 export PATH=$PATH:/home/linuxbrew/.linuxbrew/bin
 os=$(go env GOOS)
 

.github/public-variables/README.md

@@ -20,6 +20,9 @@ Current variables:
   - **Bats tests:** each pattern is matched as a case-sensitive substring against the bats filename (without `.bats`) or the `@test` description. E.g. `sveltekit` skips all tests in `sveltekit.bats`; `Symfony Composer` skips only the Composer-flavored test in `symfony.bats`. Go and bats patterns can be combined: `TestLagoonPull|sveltekit`.
   - `workflow_dispatch` runs skip loading the `public-variables` branch entirely, so maintainers can verify fixes without removing them from the embargo list first.
 - `DDEV_EMBARGO_PHP_VERSIONS` - comma-separated PHP versions to skip in `TestPHPConfig`, e.g. `7.0,7.1`
+- `DOCKER_ORG` - the DockerHub org images are built/pushed under, e.g. `ddev`. `vars.DOCKER_ORG` isn't
+  available to a fork PR's untrusted `detect`/`build` jobs in `image-build-push.yml`, so those jobs read
+  it from here instead.
 
 ## Adding a new variable
 
@@ -42,7 +45,8 @@ No workflow changes are needed - any file in this directory is picked up automat
 ## How it works
 
 Used in `.buildkite/test.sh`, `.github/workflows/test-reusable.yml`,
-`.github/workflows/test-wsl2-reusable.yml`, and `.github/workflows/quickstart.yml`.
+`.github/workflows/test-wsl2-reusable.yml`, `.github/workflows/quickstart.yml`, and
+`.github/workflows/image-build-push.yml`.
 
 Each CI run does `git fetch --depth=1 --no-tags https://github.com/ddev/ddev public-variables:refs/public-variables-tmp`,
 reads all files via `git ls-tree` + `git show`, then deletes the temporary ref.

.github/workflows/container-tests.yml

@@ -47,6 +47,18 @@ jobs:
       - uses: actions/checkout@v7
       - name: Run containers/autotag_test.sh
         run: containers/autotag_test.sh
+      - name: Run containers/db_variants_test.sh
+        run: containers/db_variants_test.sh
+      - name: Run containers/required_image_tag_test.sh
+        run: containers/required_image_tag_test.sh
+      - name: Run containers/registry_tag_exists_test.sh
+        run: containers/registry_tag_exists_test.sh
+      - name: Run containers/validate_image_tag_test.sh
+        run: containers/validate_image_tag_test.sh
+      - name: Run containers/validate_image_repo_test.sh
+        run: containers/validate_image_repo_test.sh
+      - name: Run containers/wait_for_images_test.sh
+        run: containers/wait_for_images_test.sh
 
   container-build-and-test:
     name: ${{ matrix.os }} - Test container ${{ matrix.containers }}