[PATCH 0/2] testing/next: current patches (docker, test asset migration)

[PATCH 0/2] testing/next: current patches (docker, test asset migration)

[Alex Bennée]

Nothing much in my queue at the moment except a minor fix for the
container builds and migrating the last of the assets from old linaro
servers.

Alex.

Alex Bennée (2):
  tests/docker: rename wasm cross container
  tests/functional: migrate sbsa_ref test images

 .gitlab-ci.d/container-cross.yml                 |  1 -
 .gitlab-ci.d/container-template.yml              |  4 +---
 ...sm-cross.docker => emsdk-wasm64-cross.docker} |  0
 tests/functional/aarch64/test_sbsaref.py         | 16 ++++++----------
 4 files changed, 7 insertions(+), 14 deletions(-)
 rename tests/docker/dockerfiles/{emsdk-wasm-cross.docker => emsdk-wasm64-cross.docker} (100%)

-- 
2.47.3

[PATCH 1/2] tests/docker: rename wasm cross container

[Alex Bennée]

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 <pierrick.bouvier@linaro.org>
Message-ID: <20260127092745.2978371-1-alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
v2
  - also revert the DOCKERFILE bits that are no longer needed.
---
 .gitlab-ci.d/container-cross.yml                              | 1 -
 .gitlab-ci.d/container-template.yml                           | 4 +---
 .../{emsdk-wasm-cross.docker => emsdk-wasm64-cross.docker}    | 0
 3 files changed, 1 insertion(+), 4 deletions(-)
 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..2a0cea6ce1a 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 6eaa2f804df..8c7311cca57 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
-- 
2.47.3

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

[Daniel P. Berrangé]

On Wed, Jan 28, 2026 at 10:58:38AM +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.
> 
> 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 <pierrick.bouvier@linaro.org>
> Message-ID: <20260127092745.2978371-1-alex.bennee@linaro.org>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> 
> ---
> v2
>   - also revert the DOCKERFILE bits that are no longer needed.
> ---
>  .gitlab-ci.d/container-cross.yml                              | 1 -
>  .gitlab-ci.d/container-template.yml                           | 4 +---
>  .../{emsdk-wasm-cross.docker => emsdk-wasm64-cross.docker}    | 0
>  3 files changed, 1 insertion(+), 4 deletions(-)
>  rename tests/docker/dockerfiles/{emsdk-wasm-cross.docker => emsdk-wasm64-cross.docker} (100%)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


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 :|

[PATCH 2/2] tests/functional: migrate sbsa_ref test images

[Alex Bennée]

As the builds in codelinaro.org are going away migrate the binaries to
share.linaro.org. As the hotlinks don't encode the filename we need to
explicitly tell uncompress how to handle the files.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/functional/aarch64/test_sbsaref.py | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/tests/functional/aarch64/test_sbsaref.py b/tests/functional/aarch64/test_sbsaref.py
index d3402f5080a..48f1b7a86b8 100755
--- a/tests/functional/aarch64/test_sbsaref.py
+++ b/tests/functional/aarch64/test_sbsaref.py
@@ -31,10 +31,10 @@ def fetch_firmware(test):
     """
 
     # Secure BootRom (TF-A code)
-    fs0_path = test.uncompress(Aarch64SbsarefMachine.ASSET_FLASH0)
+    fs0_path = test.uncompress(Aarch64SbsarefMachine.ASSET_FLASH0, format="xz")
 
     # Non-secure rom (UEFI and EFI variables)
-    fs1_path = test.uncompress(Aarch64SbsarefMachine.ASSET_FLASH1)
+    fs1_path = test.uncompress(Aarch64SbsarefMachine.ASSET_FLASH1, format="xz")
 
     for path in [fs0_path, fs1_path]:
         with open(path, "ab+") as fd:
@@ -54,15 +54,11 @@ class Aarch64SbsarefMachine(QemuSystemTest):
 
     timeout = 180
 
-    ASSET_FLASH0 = Asset(
-        ('https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/'
-         '20241122-189881/edk2/SBSA_FLASH0.fd.xz'),
-        '76eb89d42eebe324e4395329f47447cda9ac920aabcf99aca85424609c3384a5')
+    ASSET_FLASH0 = Asset('https://share.linaro.org/downloadFile?id=kyoMLGC9zXa4oA7',
+                         '76eb89d42eebe324e4395329f47447cda9ac920aabcf99aca85424609c3384a5')
 
-    ASSET_FLASH1 = Asset(
-        ('https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/'
-         '20241122-189881/edk2/SBSA_FLASH1.fd.xz'),
-        'f850f243bd8dbd49c51e061e0f79f1697546938f454aeb59ab7d93e5f0d412fc')
+    ASSET_FLASH1 = Asset('https://share.linaro.org/downloadFile?id=Dj1HRXnDnKtU6Nj',
+                         'f850f243bd8dbd49c51e061e0f79f1697546938f454aeb59ab7d93e5f0d412fc')
 
     def test_sbsaref_edk2_firmware(self):
 
-- 
2.47.3

Re: [PATCH 2/2] tests/functional: migrate sbsa_ref test images

[Pierrick Bouvier]

On 1/28/26 2:58 AM, Alex Bennée wrote:
> As the builds in codelinaro.org are going away migrate the binaries to
> share.linaro.org. As the hotlinks don't encode the filename we need to
> explicitly tell uncompress how to handle the files.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   tests/functional/aarch64/test_sbsaref.py | 16 ++++++----------
>   1 file changed, 6 insertions(+), 10 deletions(-)
> 

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

Re: [PATCH 2/2] tests/functional: migrate sbsa_ref test images

[Peter Maydell]

On Wed, 28 Jan 2026 at 10:58, Alex Bennée <alex.bennee@linaro.org> wrote:
>
> As the builds in codelinaro.org are going away migrate the binaries to
> share.linaro.org. As the hotlinks don't encode the filename we need to
> explicitly tell uncompress how to handle the files.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> @@ -54,15 +54,11 @@ class Aarch64SbsarefMachine(QemuSystemTest):
>
>      timeout = 180
>
> -    ASSET_FLASH0 = Asset(
> -        ('https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/'
> -         '20241122-189881/edk2/SBSA_FLASH0.fd.xz'),
> -        '76eb89d42eebe324e4395329f47447cda9ac920aabcf99aca85424609c3384a5')
> +    ASSET_FLASH0 = Asset('https://share.linaro.org/downloadFile?id=kyoMLGC9zXa4oA7',
> +                         '76eb89d42eebe324e4395329f47447cda9ac920aabcf99aca85424609c3384a5')
>
> -    ASSET_FLASH1 = Asset(
> -        ('https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/'
> -         '20241122-189881/edk2/SBSA_FLASH1.fd.xz'),
> -        'f850f243bd8dbd49c51e061e0f79f1697546938f454aeb59ab7d93e5f0d412fc')
> +    ASSET_FLASH1 = Asset('https://share.linaro.org/downloadFile?id=Dj1HRXnDnKtU6Nj',
> +                         'f850f243bd8dbd49c51e061e0f79f1697546938f454aeb59ab7d93e5f0d412fc')

Is there really no way to have a human readable filename here? I know what
edk2/SBSA_FLASH1.fd.xz is; I have no idea what
f850f243bd8dbd49c51e061e0f79f1697546938f454aeb59ab7d93e5f0d412fc is
going to be.

If we can't have useful filenames, can we have comments saying what
the filenames
would be if we could have them?

thanks
-- PMM

Re: [PATCH 2/2] tests/functional: migrate sbsa_ref test images

[Alex Bennée]

Peter Maydell <peter.maydell@linaro.org> writes:

> On Wed, 28 Jan 2026 at 10:58, Alex Bennée <alex.bennee@linaro.org> wrote:
>>
>> As the builds in codelinaro.org are going away migrate the binaries to
>> share.linaro.org. As the hotlinks don't encode the filename we need to
>> explicitly tell uncompress how to handle the files.
>>
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>
>> @@ -54,15 +54,11 @@ class Aarch64SbsarefMachine(QemuSystemTest):
>>
>>      timeout = 180
>>
>> -    ASSET_FLASH0 = Asset(
>> -        ('https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/'
>> -         '20241122-189881/edk2/SBSA_FLASH0.fd.xz'),
>> -        '76eb89d42eebe324e4395329f47447cda9ac920aabcf99aca85424609c3384a5')
>> +    ASSET_FLASH0 = Asset('https://share.linaro.org/downloadFile?id=kyoMLGC9zXa4oA7',
>> +                         '76eb89d42eebe324e4395329f47447cda9ac920aabcf99aca85424609c3384a5')
>>
>> -    ASSET_FLASH1 = Asset(
>> -        ('https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/'
>> -         '20241122-189881/edk2/SBSA_FLASH1.fd.xz'),
>> -        'f850f243bd8dbd49c51e061e0f79f1697546938f454aeb59ab7d93e5f0d412fc')
>> +    ASSET_FLASH1 = Asset('https://share.linaro.org/downloadFile?id=Dj1HRXnDnKtU6Nj',
>> +                         'f850f243bd8dbd49c51e061e0f79f1697546938f454aeb59ab7d93e5f0d412fc')
>
> Is there really no way to have a human readable filename here? I know what
> edk2/SBSA_FLASH1.fd.xz is; I have no idea what
> f850f243bd8dbd49c51e061e0f79f1697546938f454aeb59ab7d93e5f0d412fc is
> going to be.

It doesn't seem so - the underlying server is:

  https://github.com/Forceu/Gokapi

>
> If we can't have useful filenames, can we have comments saying what
> the filenames
> would be if we could have them?

Yes I can add that.

>
> thanks
> -- PMM

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Re: [PATCH 2/2] tests/functional: migrate sbsa_ref test images

[Philippe Mathieu-Daudé]

On 28/1/26 17:25, Peter Maydell wrote:
> On Wed, 28 Jan 2026 at 10:58, Alex Bennée <alex.bennee@linaro.org> wrote:
>>
>> As the builds in codelinaro.org are going away migrate the binaries to
>> share.linaro.org. As the hotlinks don't encode the filename we need to
>> explicitly tell uncompress how to handle the files.
>>
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> 
>> @@ -54,15 +54,11 @@ class Aarch64SbsarefMachine(QemuSystemTest):
>>
>>       timeout = 180
>>
>> -    ASSET_FLASH0 = Asset(
>> -        ('https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/'
>> -         '20241122-189881/edk2/SBSA_FLASH0.fd.xz'),
>> -        '76eb89d42eebe324e4395329f47447cda9ac920aabcf99aca85424609c3384a5')
>> +    ASSET_FLASH0 = Asset('https://share.linaro.org/downloadFile?id=kyoMLGC9zXa4oA7',
>> +                         '76eb89d42eebe324e4395329f47447cda9ac920aabcf99aca85424609c3384a5')
>>
>> -    ASSET_FLASH1 = Asset(
>> -        ('https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/'
>> -         '20241122-189881/edk2/SBSA_FLASH1.fd.xz'),
>> -        'f850f243bd8dbd49c51e061e0f79f1697546938f454aeb59ab7d93e5f0d412fc')
>> +    ASSET_FLASH1 = Asset('https://share.linaro.org/downloadFile?id=Dj1HRXnDnKtU6Nj',
>> +                         'f850f243bd8dbd49c51e061e0f79f1697546938f454aeb59ab7d93e5f0d412fc')
> 
> Is there really no way to have a human readable filename here? I know what
> edk2/SBSA_FLASH1.fd.xz is; I have no idea what
> f850f243bd8dbd49c51e061e0f79f1697546938f454aeb59ab7d93e5f0d412fc is
> going to be.

https://share.linaro.org/downloadFile?id=kyoMLGC9zXa4oA7&filename=edk2/SBSA_FLASH1.fd.xz 
works for me.

> 
> If we can't have useful filenames, can we have comments saying what
> the filenames
> would be if we could have them?
> 
> thanks
> -- PMM

Re: [PATCH 2/2] tests/functional: migrate sbsa_ref test images

[Pierrick Bouvier]

On 1/28/26 8:25 AM, Peter Maydell wrote:
> On Wed, 28 Jan 2026 at 10:58, Alex Bennée <alex.bennee@linaro.org> wrote:
>>
>> As the builds in codelinaro.org are going away migrate the binaries to
>> share.linaro.org. As the hotlinks don't encode the filename we need to
>> explicitly tell uncompress how to handle the files.
>>
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> 
>> @@ -54,15 +54,11 @@ class Aarch64SbsarefMachine(QemuSystemTest):
>>
>>       timeout = 180
>>
>> -    ASSET_FLASH0 = Asset(
>> -        ('https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/'
>> -         '20241122-189881/edk2/SBSA_FLASH0.fd.xz'),
>> -        '76eb89d42eebe324e4395329f47447cda9ac920aabcf99aca85424609c3384a5')
>> +    ASSET_FLASH0 = Asset('https://share.linaro.org/downloadFile?id=kyoMLGC9zXa4oA7',
>> +                         '76eb89d42eebe324e4395329f47447cda9ac920aabcf99aca85424609c3384a5')
>>
>> -    ASSET_FLASH1 = Asset(
>> -        ('https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/'
>> -         '20241122-189881/edk2/SBSA_FLASH1.fd.xz'),
>> -        'f850f243bd8dbd49c51e061e0f79f1697546938f454aeb59ab7d93e5f0d412fc')
>> +    ASSET_FLASH1 = Asset('https://share.linaro.org/downloadFile?id=Dj1HRXnDnKtU6Nj',
>> +                         'f850f243bd8dbd49c51e061e0f79f1697546938f454aeb59ab7d93e5f0d412fc')
> 
> Is there really no way to have a human readable filename here? I know what
> edk2/SBSA_FLASH1.fd.xz is; I have no idea what
> f850f243bd8dbd49c51e061e0f79f1697546938f454aeb59ab7d93e5f0d412fc is
> going to be.
>

Hosting on GitHub/GitLab as a release file?
Or anywhere else than share.linaro.org and that has names instead of 
hashes for url (i.e. not Google drive).

> If we can't have useful filenames, can we have comments saying what
> the filenames
> would be if we could have them?
> 
> thanks
> -- PMM
> 

Re: [PATCH 2/2] tests/functional: migrate sbsa_ref test images

[Alex Bennée]

Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:

> On 1/28/26 8:25 AM, Peter Maydell wrote:
>> On Wed, 28 Jan 2026 at 10:58, Alex Bennée <alex.bennee@linaro.org> wrote:
>>>
>>> As the builds in codelinaro.org are going away migrate the binaries to
>>> share.linaro.org. As the hotlinks don't encode the filename we need to
>>> explicitly tell uncompress how to handle the files.
>>>
>>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> 
>>> @@ -54,15 +54,11 @@ class Aarch64SbsarefMachine(QemuSystemTest):
>>>
>>>       timeout = 180
>>>
>>> -    ASSET_FLASH0 = Asset(
>>> -        ('https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/'
>>> -         '20241122-189881/edk2/SBSA_FLASH0.fd.xz'),
>>> -        '76eb89d42eebe324e4395329f47447cda9ac920aabcf99aca85424609c3384a5')
>>> +    ASSET_FLASH0 = Asset('https://share.linaro.org/downloadFile?id=kyoMLGC9zXa4oA7',
>>> +                         '76eb89d42eebe324e4395329f47447cda9ac920aabcf99aca85424609c3384a5')
>>>
>>> -    ASSET_FLASH1 = Asset(
>>> -        ('https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/'
>>> -         '20241122-189881/edk2/SBSA_FLASH1.fd.xz'),
>>> -        'f850f243bd8dbd49c51e061e0f79f1697546938f454aeb59ab7d93e5f0d412fc')
>>> +    ASSET_FLASH1 = Asset('https://share.linaro.org/downloadFile?id=Dj1HRXnDnKtU6Nj',
>>> +                         'f850f243bd8dbd49c51e061e0f79f1697546938f454aeb59ab7d93e5f0d412fc')
>> Is there really no way to have a human readable filename here? I
>> know what
>> edk2/SBSA_FLASH1.fd.xz is; I have no idea what
>> f850f243bd8dbd49c51e061e0f79f1697546938f454aeb59ab7d93e5f0d412fc is
>> going to be.
>>
>
> Hosting on GitHub/GitLab as a release file?
> Or anywhere else than share.linaro.org and that has names instead of
> hashes for url (i.e. not Google drive).

If you can setup a build pipeline that generates releases got for it.
However for it's faults at least we have control of share.linaro.org - I
have no idea what the policy for hosting binaries on github is. I'm
almost sure it violates some policy otherwise people would spam github
for cheap hosting.

The tool does actually know the name in the schema:

  Name	string
  example: Test File.jpg

  The filename. Will be 'Encrypted file' for end-to-end encrypted files

I note it is currently running 1.0 - we could see if the later versions
allow it.

>> If we can't have useful filenames, can we have comments saying what
>> the filenames
>> would be if we could have them?
>> thanks
>> -- PMM
>> 

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Re: [PATCH 2/2] tests/functional: migrate sbsa_ref test images

[Philippe Mathieu-Daudé]

On 28/1/26 11:58, Alex Bennée wrote:
> As the builds in codelinaro.org are going away migrate the binaries to
> share.linaro.org. As the hotlinks don't encode the filename we need to
> explicitly tell uncompress how to handle the files.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   tests/functional/aarch64/test_sbsaref.py | 16 ++++++----------
>   1 file changed, 6 insertions(+), 10 deletions(-)

Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Re: [PATCH 2/2] tests/functional: migrate sbsa_ref test images

[Michael Tokarev]

On 1/28/26 13:58, Alex Bennée wrote:
> As the builds in codelinaro.org are going away migrate the binaries to
> share.linaro.org. As the hotlinks don't encode the filename we need to
> explicitly tell uncompress how to handle the files.

I'm picking this up for qemu-stable too.
Please let me know if I shouldn't.

Thanks,

/mjt

Re: [PATCH 2/2] tests/functional: migrate sbsa_ref test images

[Alex Bennée]

Michael Tokarev <mjt@tls.msk.ru> writes:

> On 1/28/26 13:58, Alex Bennée wrote:
>> As the builds in codelinaro.org are going away migrate the binaries to
>> share.linaro.org. As the hotlinks don't encode the filename we need to
>> explicitly tell uncompress how to handle the files.
>
> I'm picking this up for qemu-stable too.
> Please let me know if I shouldn't.

No that is fine, sorry I should have Cc'd stable.

>
> Thanks,
>
> /mjt

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

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

[Kohei Tokunaga]

Hi Alex,

Thank you for fixing this.

 > 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 <pierrick.bouvier@linaro.org>
 > Message-ID: <20260127092745.2978371-1-alex.bennee@linaro.org>
 > Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
 >
 > ---
 > v2
 >   - also revert the DOCKERFILE bits that are no longer needed.
 > ---
 >  .gitlab-ci.d/container-cross.yml   | 1 -
 >  .gitlab-ci.d/container-template.yml  | 4 +---
 >  .../{emsdk-wasm-cross.docker => emsdk-wasm64-cross.docker}    | 0
 >  3 files changed, 1 insertion(+), 4 deletions(-)
 >  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..2a0cea6ce1a 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 6eaa2f804df..8c7311cca57 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

Reviewed-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>

Regards,
Kohei Tokunaga