Browse Source

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: 4203ea0247 (gitlab-ci: Add build tests for wasm64)
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20260128105839.3487840-2-alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
pull/319/head
Alex Bennée 2 months ago
parent
commit
792d94406a
  1. 1
      .gitlab-ci.d/container-cross.yml
  2. 4
      .gitlab-ci.d/container-template.yml
  3. 0
      tests/docker/dockerfiles/emsdk-wasm64-cross.docker

1
.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

4
.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

0
tests/docker/dockerfiles/emsdk-wasm-cross.docker → tests/docker/dockerfiles/emsdk-wasm64-cross.docker

Loading…
Cancel
Save