From: Alex Bennée Date: Wed, 28 Jan 2026 10:58:38 +0000 (+0000) Subject: tests/docker: rename wasm cross container X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=792d94406ab911ed637d7d770e99633b2a77a72a;p=thirdparty%2Fqemu.git tests/docker: rename wasm cross container Now we are 64 bit only there is no need to keep the generic name. This also fixes a check failure in the weekly container build which was checking containers based on the expansion of DOCKER_IMAGES which is based of the dockerfile names. Remove the DOCKERFILE bits that were added to handle multiple containers from the same dockerfile. Fixes: 4203ea0247f (gitlab-ci: Add build tests for wasm64) Reviewed-by: Pierrick Bouvier Reviewed-by: Daniel P. Berrangé Message-ID: <20260128105839.3487840-2-alex.bennee@linaro.org> Signed-off-by: Alex Bennée --- diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index d7ae57fb1f..2a0cea6ce1 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -78,4 +78,3 @@ wasm64-emsdk-cross-container: extends: .container_job_template variables: NAME: emsdk-wasm64-cross - DOCKERFILE: emsdk-wasm-cross diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-template.yml index 6eaa2f804d..8c7311cca5 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -10,14 +10,12 @@ - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest" - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" - until docker info; do sleep 1; done - - export DOCKERFILE_NAME=${DOCKERFILE:-$NAME} script: - echo "TAG:$TAG" - echo "COMMON_TAG:$COMMON_TAG" - docker build --tag "$TAG" --cache-from "$TAG" --cache-from "$COMMON_TAG" --build-arg BUILDKIT_INLINE_CACHE=1 - $BUILD_ARGS - -f "tests/docker/dockerfiles/$DOCKERFILE_NAME.docker" "." + -f "tests/docker/dockerfiles/$NAME.docker" "." - docker push "$TAG" after_script: - docker logout diff --git a/tests/docker/dockerfiles/emsdk-wasm-cross.docker b/tests/docker/dockerfiles/emsdk-wasm64-cross.docker similarity index 100% rename from tests/docker/dockerfiles/emsdk-wasm-cross.docker rename to tests/docker/dockerfiles/emsdk-wasm64-cross.docker