tests/docker: rename wasm cross container

[RFC PATCH] tests/docker: rename wasm cross container

Posted by Alex Bennée 1 week, 3 days ago

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.

Fixes: 4203ea0247f (gitlab-ci: Add build tests for wasm64)
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 .gitlab-ci.d/container-cross.yml                                | 2 +-
 .../{emsdk-wasm-cross.docker => emsdk-wasm64-cross.docker}      | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename tests/docker/dockerfiles/{emsdk-wasm-cross.docker => emsdk-wasm64-cross.docker} (100%)

diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
index d7ae57fb1f5..923044e9a12 100644
--- a/.gitlab-ci.d/container-cross.yml
+++ b/.gitlab-ci.d/container-cross.yml
@@ -78,4 +78,4 @@ wasm64-emsdk-cross-container:
   extends: .container_job_template
   variables:
     NAME: emsdk-wasm64-cross
-    DOCKERFILE: emsdk-wasm-cross
+    DOCKERFILE: emsdk-wasm64-cross
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
-- 
2.47.3

Re: [RFC PATCH] tests/docker: rename wasm cross container

Posted by Daniel P. Berrangé 1 week, 3 days ago

On Tue, Jan 27, 2026 at 09:27:45AM +0000, Alex Bennée wrote:
> 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.
> 
> Fixes: 4203ea0247f (gitlab-ci: Add build tests for wasm64)
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>  .gitlab-ci.d/container-cross.yml                                | 2 +-
>  .../{emsdk-wasm-cross.docker => emsdk-wasm64-cross.docker}      | 0
>  2 files changed, 1 insertion(+), 1 deletion(-)
>  rename tests/docker/dockerfiles/{emsdk-wasm-cross.docker => emsdk-wasm64-cross.docker} (100%)
> 
> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
> index d7ae57fb1f5..923044e9a12 100644
> --- a/.gitlab-ci.d/container-cross.yml
> +++ b/.gitlab-ci.d/container-cross.yml
> @@ -78,4 +78,4 @@ wasm64-emsdk-cross-container:
>    extends: .container_job_template
>    variables:
>      NAME: emsdk-wasm64-cross
> -    DOCKERFILE: emsdk-wasm-cross
> +    DOCKERFILE: emsdk-wasm64-cross

Drop this variable entirely, since it duplicates $NAME, which already
sets the default value for DOCKERFILE.

Given that this naming divergance broke the CI job, we should also
modify container-template.yml to revert all the changes that were
introducd as part of 4203ea0247f

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [RFC PATCH] tests/docker: rename wasm cross container

Posted by Pierrick Bouvier 1 week, 3 days ago

On 1/27/26 1:27 AM, Alex Bennée wrote:
> 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.
> 
> Fixes: 4203ea0247f (gitlab-ci: Add build tests for wasm64)
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   .gitlab-ci.d/container-cross.yml                                | 2 +-
>   .../{emsdk-wasm-cross.docker => emsdk-wasm64-cross.docker}      | 0
>   2 files changed, 1 insertion(+), 1 deletion(-)
>   rename tests/docker/dockerfiles/{emsdk-wasm-cross.docker => emsdk-wasm64-cross.docker} (100%)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>