commit 5d18a67931be05051e65a8146ac227fcc1a30334
author Tom Rini <trini@konsulko.com> Sun Dec 08 11:07:24 2024 -0600
committer Tom Rini <trini@konsulko.com> Sat Dec 21 12:27:46 2024 -0600
tree 703f30855e8b189d2586f6c1c22097eaa1d07222
parent 19d5656ad639707700f0ee2468978ede31d04da0

Docker/CI: Only test Xtensa on amd64 hosts

The xtensa architecture is interesting in that the platforms we support
are only valid on the binary-only toolchains as the DC233C instruction
set requires those toolchains (and not the FSF instruction set). Only
install the binary toolchain on amd64 hosts and only run the tests on
them as well.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

.gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57037e2..2671c3b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -144,12 +144,14 @@
         exit $ret;
       fi;
 
+# We exclude xtensa here due to not being able to build on aarch64
+# hosts but covering all platforms in the pytest section.
 build all other platforms:
   extends: .world_build
   script:
     - ret=0;
       git config --global --add safe.directory "${CI_PROJECT_DIR}";
-      ./tools/buildman/buildman -o /tmp -PEWM -x arm,powerpc || ret=$?;
+      ./tools/buildman/buildman -o /tmp -PEWM -x arm,powerpc,xtensa || ret=$?;
       if [[ $ret -ne 0 ]]; then
         ./tools/buildman/buildman -o /tmp -seP;
         exit $ret;
@@ -451,6 +453,8 @@
   variables:
     TEST_PY_BD: "qemu-xtensa-dc233c"
     TEST_PY_TEST_SPEC: "not sleep and not efi"
+  tags:
+    - all
   <<: *buildman_and_testpy_dfn
 
 r2dplus_i82557c test.py:
@@ -514,6 +518,8 @@
     TEST_PY_BD: "xtfpga"
     TEST_PY_TEST_SPEC: "not sleep"
     TEST_PY_ID: "--id qemu"
+  tags:
+    - all
   <<: *buildman_and_testpy_dfn
 
 coreboot test.py:

tools/docker/Dockerfile

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index ce1ad7c..8723834 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -320,7 +320,9 @@
 # Create the buildman config file
 RUN /bin/echo -e "[toolchain]\nroot = /usr" > ~/.buildman
 RUN /bin/echo -e "kernelorg = /opt/gcc-13.2.0-nolibc/*" >> ~/.buildman
-RUN /bin/echo -e "\n[toolchain-prefix]\nxtensa = /opt/2020.07/xtensa-dc233c-elf/bin/xtensa-dc233c-elf-" >> ~/.buildman;
+RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
+        /bin/echo -e "\n[toolchain-prefix]\nxtensa = /opt/2020.07/xtensa-dc233c-elf/bin/xtensa-dc233c-elf-" >> ~/.buildman; \
+    fi
 RUN /bin/echo -e "\n[toolchain-alias]\nsh = sh2" >> ~/.buildman
 RUN /bin/echo -e "\nx86 = i386" >> ~/.buildman;