docs: Add sha256 sum for 23.2.1

Iris in general doesn't really like checking the return value of its
allocations, but in some places it does assert that those pointers are
non-NULL. We've recently investigated a bug that could have been
coming from a failed bo->deps realloc(), so add the assert() here to
help give us more confidence over things the next time we're debugging
issues.

Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
(cherry picked from commit 7c538b5ad8)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25404>

.clang-format-ignore

@@ -0,0 +1,2 @@
+# Vendored code
+src/amd/vulkan/radix_sort/*

.clang-format-include

@@ -0,0 +1,8 @@
+# The following files are opted into `ninja clang-format` and
+# enforcement in the CI.
+
+src/**/asahi/**/*
+src/**/panfrost/**/*
+src/amd/vulkan/**/*
+src/amd/compiler/**/*
+src/egl/**/*

.git-blame-ignore-revs

@@ -0,0 +1,47 @@
+# List of commits to ignore when using `git blame`.
+#
+# Per git-blame(1):
+#   Ignore revisions listed in the file, one unabbreviated object name
+#   per line, in git-blame. Whitespace and comments beginning with # are
+#   ignored.
+#
+# Please keep these in chronological order :)
+#
+# You can add a new commit with the following command:
+#   git log -1 --pretty=format:'%n# %s%n%H%n' >> .git-blame-ignore-revs $COMMIT
+
+# pvr: Fix clang-format error.
+0ad5b0a74ef73f5fcbe1406ad9d57fe5dc00a5b1
+
+# panfrost: Fix up some formatting for clang-format
+a4705afe63412498d13ded73cba969c66be67907
+
+# asahi: clang-format the world again
+26c51bb8d8a33098b1990425a391f56ffba5728c
+
+# perfetto: Add a .clang-format for the directory.
+da78d5d729b1800136dd713b68492cb339993f4a
+
+# panfrost/winsys: Clang-format
+c90f036516a5376002be6550a917e8bad6a8a3b8
+
+# panfrost: Re-run clang-format
+4ccf174009af6732cbffa5d8ebb4687da7517505
+
+# panvk: Clang-format
+c7bf3b69ebc8f2252dbf724a4de638e6bb2ac402
+
+# pan/mdg: Fix icky formatting
+133af0d6c945d3aaca8989edd15283a2b7dcc6c7
+
+# mapi: clang-format _glapi_add_dispatch()
+30332529663268a6406e910848e906e725e6fda7
+
+# radv: reformat according to its .clang-format
+8b319c6db8bd93603b18bd783eb75225fcfd51b7
+
+# aco: reformat according to its .clang-format
+6b21653ab4d3a67e711fe10e3d403128b6d26eb2
+
+# egl: re-format using clang-format
+2f670d89db038d5a29f6b72732fd7ad63dfaf4c6

.gitlab-ci.yml

@@ -1,14 +1,20 @@
 workflow:
   rules:
+    # merge pipeline
     - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_COMMIT_BRANCH == null
       variables:
         MESA_CI_PERFORMANCE_ENABLED: 1
+        VALVE_INFRA_VANGOGH_JOB_PRIORITY: ""  # Empty tags are ignored by gitlab
+    # post-merge pipeline
     - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_COMMIT_BRANCH
       variables:
         LAVA_JOB_PRIORITY: 40
+        VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
+    # any other pipeline
     - if: $GITLAB_USER_LOGIN != "marge-bot"
       variables:
         LAVA_JOB_PRIORITY: 50
+        VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
     - when: always
 
 variables:
@@ -21,30 +27,23 @@ variables:
           rm download-git-cache.sh
           set +o xtrace
   CI_JOB_JWT_FILE: /minio_jwt
-  MINIO_HOST: s3.freedesktop.org
+  S3_HOST: s3.freedesktop.org
   # per-pipeline artifact storage on MinIO
-  PIPELINE_ARTIFACTS_BASE: ${MINIO_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
+  PIPELINE_ARTIFACTS_BASE: ${S3_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
   # per-job artifact storage on MinIO
   JOB_ARTIFACTS_BASE: ${PIPELINE_ARTIFACTS_BASE}/${CI_JOB_ID}
   # reference images stored for traces
-  PIGLIT_REPLAY_REFERENCE_IMAGES_BASE: "${MINIO_HOST}/mesa-tracie-results/$FDO_UPSTREAM_REPO"
-  # Individual CI farm status, set to "offline" to disable jobs
-  # running on a particular CI farm (ie. for outages, etc):
-  FD_FARM: "online"
-  COLLABORA_FARM: "online"
-  MICROSOFT_FARM: "online"
-  LIMA_FARM: "offline"
-  IGALIA_FARM: "online"
-  ANHOLT_FARM: "online"
-  VALVE_FARM: "online"
-  AUSTRIANCODER_FARM: "online"  # only etnaviv GPUs
+  PIGLIT_REPLAY_REFERENCE_IMAGES_BASE: "${S3_HOST}/mesa-tracie-results/$FDO_UPSTREAM_REPO"
+  # For individual CI farm status see .ci-farms folder
+  # Disable farm with   `git mv .ci-farms{,-disabled}/$farm_name`
+  # Re-enable farm with `git mv .ci-farms{-disabled,}/$farm_name`
+  # NEVER MIX FARM MAINTENANCE WITH ANY OTHER CHANGE IN THE SAME MERGE REQUEST!
 
 default:
   before_script:
     - >
       export SCRIPTS_DIR=$(mktemp -d) &&
       curl -L -s --retry 4 -f --retry-all-errors --retry-delay 60 -O --output-dir "${SCRIPTS_DIR}" "${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/setup-test-env.sh" &&
-      chmod +x ${SCRIPTS_DIR}/setup-test-env.sh &&
       . ${SCRIPTS_DIR}/setup-test-env.sh &&
       echo -n "${CI_JOB_JWT}" > "${CI_JOB_JWT_FILE}" &&
       unset CI_JOB_JWT  # Unsetting vulnerable env variables
@@ -61,6 +60,16 @@ default:
   # https://gitlab.freedesktop.org/mesa/mesa/-/issues/?sort=created_date&state=opened&label_name%5B%5D=CI%20daily
   retry:
     max: 1
+    # Ignore runner_unsupported, stale_schedule, archived_failure, or
+    # unmet_prerequisites
+    when:
+      - api_failure
+      - runner_system_failure
+      - script_failure
+      - job_execution_timeout
+      - scheduler_failure
+      - data_integrity_failure
+      - unknown_failure
 
 include:
   - project: 'freedesktop/ci-templates'
@@ -78,6 +87,7 @@ include:
   - local: '.gitlab-ci/container/gitlab-ci.yml'
   - local: '.gitlab-ci/build/gitlab-ci.yml'
   - local: '.gitlab-ci/test/gitlab-ci.yml'
+  - local: '.gitlab-ci/farm-rules.yml'
   - local: '.gitlab-ci/test-source-dep.yml'
   - local: 'docs/gitlab-ci.yml'
   - local: 'src/amd/ci/gitlab-ci.yml'
@@ -156,6 +166,7 @@ stages:
       # Source code
       - include/**/*
       - src/**/*
+      - .ci-farms/*
       when: on_success
     # Otherwise, build/test jobs won't run because no rule matched.
 
@@ -214,10 +225,12 @@ make git archive:
   script:
     # Compactify the .git directory
     - git gc --aggressive
+    # Download & cache the perfetto subproject as well.
+    - rm -rf subprojects/perfetto ; mkdir -p subprojects/perfetto && curl https://android.googlesource.com/platform/external/perfetto/+archive/$(grep 'revision =' subprojects/perfetto.wrap | cut -d ' ' -f3).tar.gz | tar zxf - -C subprojects/perfetto
     # compress the current folder
     - tar -cvzf ../$CI_PROJECT_NAME.tar.gz .
 
-    - ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" ../$CI_PROJECT_NAME.tar.gz https://$MINIO_HOST/git-cache/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_PROJECT_NAME.tar.gz
+    - ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" ../$CI_PROJECT_NAME.tar.gz https://$S3_HOST/git-cache/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_PROJECT_NAME.tar.gz
 
 
 # Sanity checks of MR settings and commit logs
@@ -238,3 +251,12 @@ sanity:
     when: on_failure
     reports:
       junit: check-*.xml
+
+
+# Jobs that need to pass before spending hardware resources on further testing
+.required-for-hardware-jobs:
+  needs:
+    - job: clang-format
+      optional: true
+    - job: rustfmt
+      optional: true

.gitlab-ci/b2c/b2c.yml.jinja2.jinja2

@@ -28,9 +28,11 @@ console_patterns:
     session_end:
         regex: >-
           {{ session_end_regex }}
+{% if session_reboot_regex %}
     session_reboot:
         regex: >-
           {{ session_reboot_regex }}
+{% endif %}
     job_success:
         regex: >-
           {{ job_success_regex }}

.gitlab-ci/bare-metal/cisco-2960-poe-off.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=SC2086 # we want word splitting
 
 if [ -z "$BM_POE_INTERFACE" ]; then
     echo "Must supply the PoE Interface to power down"
@@ -11,7 +12,6 @@ if [ -z "$BM_POE_ADDRESS" ]; then
 fi
 
 SNMP_KEY="1.3.6.1.4.1.9.9.402.1.2.1.1.1.$BM_POE_INTERFACE"
-SNMP_ON="i 1"
 SNMP_OFF="i 4"
 
-snmpset -v2c -r 3 -t 30 -cmesaci $BM_POE_ADDRESS $SNMP_KEY $SNMP_OFF
+snmpset -v2c -r 3 -t 30 -cmesaci "$BM_POE_ADDRESS" "$SNMP_KEY" $SNMP_OFF

.gitlab-ci/bare-metal/cisco-2960-poe-on.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=SC2086 # we want word splitting
 
 if [ -z "$BM_POE_INTERFACE" ]; then
     echo "Must supply the PoE Interface to power up"
@@ -16,6 +17,6 @@ SNMP_KEY="1.3.6.1.4.1.9.9.402.1.2.1.1.1.$BM_POE_INTERFACE"
 SNMP_ON="i 1"
 SNMP_OFF="i 4"
 
-snmpset -v2c -r 3 -t 10 -cmesaci $BM_POE_ADDRESS $SNMP_KEY $SNMP_OFF
+snmpset -v2c -r 3 -t 10 -cmesaci "$BM_POE_ADDRESS" "$SNMP_KEY" $SNMP_OFF
 sleep 3s
-snmpset -v2c -r 3 -t 10 -cmesaci $BM_POE_ADDRESS $SNMP_KEY $SNMP_ON
+snmpset -v2c -r 3 -t 10 -cmesaci "$BM_POE_ADDRESS" "$SNMP_KEY" $SNMP_ON

.gitlab-ci/bare-metal/cros-servo.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+# shellcheck disable=SC1091 # The relative paths in this file only become valid at runtime.
+# shellcheck disable=SC2034
+# shellcheck disable=SC2086 # we want word splitting
 
 # Boot script for Chrome OS devices attached to a servo debug connector, using
 # NFS and TFTP to boot.

.gitlab-ci/bare-metal/eth008-power-down.sh

@@ -7,4 +7,4 @@ if [ -z "$relay" ]; then
     exit 1
 fi
 
-$CI_PROJECT_DIR/install/bare-metal/eth008-power-relay.py $ETH_HOST $ETH_PORT off $relay
+"$CI_PROJECT_DIR"/install/bare-metal/eth008-power-relay.py "$ETH_HOST" "$ETH_PORT" off "$relay"

.gitlab-ci/bare-metal/eth008-power-up.sh

@@ -7,6 +7,6 @@ if [ -z "$relay" ]; then
     exit 1
 fi
 
-$CI_PROJECT_DIR/install/bare-metal/eth008-power-relay.py $ETH_HOST $ETH_PORT off $relay
+"$CI_PROJECT_DIR"/install/bare-metal/eth008-power-relay.py "$ETH_HOST" "$ETH_PORT" off "$relay"
 sleep 5
-$CI_PROJECT_DIR/install/bare-metal/eth008-power-relay.py $ETH_HOST $ETH_PORT on $relay
+"$CI_PROJECT_DIR"/install/bare-metal/eth008-power-relay.py "$ETH_HOST" "$ETH_PORT" on "$relay"

.gitlab-ci/bare-metal/expect-output.sh

@@ -5,26 +5,27 @@ set -e
 STRINGS=$(mktemp)
 ERRORS=$(mktemp)
 
-trap "rm $STRINGS; rm $ERRORS;" EXIT
+trap 'rm $STRINGS; rm $ERRORS;' EXIT
 
 FILE=$1
 shift 1
 
 while getopts "f:e:" opt; do
   case $opt in
-    f) echo "$OPTARG" >> $STRINGS;;
-    e) echo "$OPTARG" >> $STRINGS ; echo "$OPTARG" >> $ERRORS;;
+    f) echo "$OPTARG" >> "$STRINGS";;
+    e) echo "$OPTARG" >> "$STRINGS" ; echo "$OPTARG" >> "$ERRORS";;
+    *) exit
   esac
 done
 shift $((OPTIND -1))
 
 echo "Waiting for $FILE to say one of following strings"
-cat $STRINGS
+cat "$STRINGS"
 
-while ! egrep -wf $STRINGS $FILE; do
+while ! grep -E -wf "$STRINGS" "$FILE"; do
   sleep 2
 done
 
-if egrep -wf $ERRORS $FILE; then
+if grep -E -wf "$ERRORS" "$FILE"; then
   exit 1
 fi

.gitlab-ci/bare-metal/fastboot.sh

@@ -1,11 +1,14 @@
 #!/bin/bash
+# shellcheck disable=SC1091 # The relative paths in this file only become valid at runtime.
+# shellcheck disable=SC2034
+# shellcheck disable=SC2086 # we want word splitting
 
 . "$SCRIPTS_DIR"/setup-test-env.sh
 
 BM=$CI_PROJECT_DIR/install/bare-metal
 CI_COMMON=$CI_PROJECT_DIR/install/common
 
-if [ -z "$BM_SERIAL" -a -z "$BM_SERIAL_SCRIPT" ]; then
+if [ -z "$BM_SERIAL" ] && [ -z "$BM_SERIAL_SCRIPT" ]; then
   echo "Must set BM_SERIAL OR BM_SERIAL_SCRIPT in your gitlab-runner config.toml [[runners]] environment"
   echo "BM_SERIAL:"
   echo "  This is the serial device to talk to for waiting for fastboot to be ready and logging from the kernel."
@@ -84,10 +87,10 @@ else
   fi
 
   pushd rootfs
-  find -H | \
-    egrep -v "external/(openglcts|vulkancts|amber|glslang|spirv-tools)" |
-    egrep -v "traces-db|apitrace|renderdoc" | \
-    egrep -v $EXCLUDE_FILTER | \
+  find -H . | \
+    grep -E -v "external/(openglcts|vulkancts|amber|glslang|spirv-tools)" |
+    grep -E -v "traces-db|apitrace|renderdoc" | \
+    grep -E -v $EXCLUDE_FILTER | \
     cpio -H newc -o | \
     xz --check=crc32 -T4 - > $CI_PROJECT_DIR/rootfs.cpio.gz
   popd

.gitlab-ci/bare-metal/google-power-down.sh

@@ -7,4 +7,4 @@ if [ -z "$relay" ]; then
     exit 1
 fi
 
-$CI_PROJECT_DIR/install/bare-metal/google-power-relay.py off $relay
+"$CI_PROJECT_DIR"/install/bare-metal/google-power-relay.py off "$relay"

.gitlab-ci/bare-metal/google-power-up.sh

@@ -7,6 +7,6 @@ if [ -z "$relay" ]; then
     exit 1
 fi
 
-$CI_PROJECT_DIR/install/bare-metal/google-power-relay.py off $relay
+"$CI_PROJECT_DIR"/install/bare-metal/google-power-relay.py off "$relay"
 sleep 5
-$CI_PROJECT_DIR/install/bare-metal/google-power-relay.py on $relay
+"$CI_PROJECT_DIR"/install/bare-metal/google-power-relay.py on "$relay"

.gitlab-ci/bare-metal/poe-off

@@ -10,8 +10,7 @@ if [ -z "$BM_POE_ADDRESS" ]; then
     exit 1
 fi
 
-SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.`expr 48 + $BM_POE_INTERFACE`"
-SNMP_ON="i 1"
+SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.$((48 + BM_POE_INTERFACE))"
 SNMP_OFF="i 2"
 
 flock /var/run/poe.lock -c "snmpset -v2c -r 3 -t 30 -cmesaci $BM_POE_ADDRESS $SNMP_KEY $SNMP_OFF"

.gitlab-ci/bare-metal/poe-on

@@ -10,7 +10,7 @@ if [ -z "$BM_POE_ADDRESS" ]; then
     exit 1
 fi
 
-SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.`expr 48 + $BM_POE_INTERFACE`"
+SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.$((48 + BM_POE_INTERFACE))"
 SNMP_ON="i 1"
 SNMP_OFF="i 2"
 

.gitlab-ci/bare-metal/poe-powered.sh

@@ -1,4 +1,8 @@
 #!/bin/bash
+# shellcheck disable=SC1091
+# shellcheck disable=SC2034
+# shellcheck disable=SC2059
+# shellcheck disable=SC2086 # we want word splitting
 
 . "$SCRIPTS_DIR"/setup-test-env.sh
 

.gitlab-ci/bare-metal/rootfs-setup.sh

@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+# shellcheck disable=SC2086 # we want word splitting
 
 rootfs_dst=$1
 
@@ -23,10 +24,8 @@ cp "$SCRIPTS_DIR/setup-test-env.sh" "$rootfs_dst/"
 set +x
 
 # Pass through relevant env vars from the gitlab job to the baremetal init script
-"$CI_COMMON"/generate-env.sh > $rootfs_dst/set-job-env-vars.sh
-chmod +x $rootfs_dst/set-job-env-vars.sh
 echo "Variables passed through:"
-cat $rootfs_dst/set-job-env-vars.sh
+"$CI_COMMON"/generate-env.sh | tee $rootfs_dst/set-job-env-vars.sh
 
 set -x
 

.gitlab-ci/build/compiler-wrapper-clang++-15.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+# shellcheck disable=SC1091
+
+set -e
+
+_COMPILER=clang++-15
+. compiler-wrapper.sh

.gitlab-ci/build/compiler-wrapper-clang++.sh

@@ -1,3 +1,7 @@
 #!/bin/sh
+# shellcheck disable=SC1091
+
+set -e
+
 _COMPILER=clang++
 . compiler-wrapper.sh

.gitlab-ci/build/compiler-wrapper-clang-15.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+# shellcheck disable=SC1091
+
+set -e
+
+_COMPILER=clang-15
+. compiler-wrapper.sh

.gitlab-ci/build/compiler-wrapper-clang.sh

@@ -1,3 +1,7 @@
 #!/bin/sh
+# shellcheck disable=SC1091
+
+set -e
+
 _COMPILER=clang
 . compiler-wrapper.sh

.gitlab-ci/build/compiler-wrapper-g++.sh

@@ -1,3 +1,7 @@
 #!/bin/sh
+# shellcheck disable=SC1091
+
+set -e
+
 _COMPILER=g++
 . compiler-wrapper.sh

.gitlab-ci/build/compiler-wrapper-gcc.sh

@@ -1,3 +1,7 @@
 #!/bin/sh
+# shellcheck disable=SC1091
+
+set -e
+
 _COMPILER=gcc
 . compiler-wrapper.sh

.gitlab-ci/build/compiler-wrapper.sh

@@ -1,13 +1,13 @@
-#!/bin/sh -e
-
+# shellcheck disable=SC1091
+# shellcheck disable=SC2086 # we want word splitting
 if command -V ccache >/dev/null 2>/dev/null; then
   CCACHE=ccache
 else
   CCACHE=
 fi
 
-if [ "$(ps -p $(ps -p $PPID -o ppid --no-headers) -o comm --no-headers)" != ninja ]; then
-    # Not invoked by ninja (e.g. for a meson feature check)
+if echo "$@" | grep -E 'meson-private/tmp[^ /]*/testfile.c' >/dev/null; then
+    # Invoked for meson feature check
     exec $CCACHE $_COMPILER "$@"
 fi
 

.gitlab-ci/build/gitlab-ci.yml

@@ -31,7 +31,7 @@
         section_end ccache_before
       fi
   after_script:
-    - if test -x /usr/bin/ccache; then ccache --show-stats | grep "cache hit rate"; fi
+    - if test -x /usr/bin/ccache; then ccache --show-stats | grep "Hits:"; fi
     - !reference [default, after_script]
 
 .build-windows:
@@ -49,17 +49,17 @@
 .meson-build:
   extends:
     - .build-linux
-    - .use-debian/x86_build
+    - .use-debian/x86_64_build
   stage: build-x86_64
   variables:
-    LLVM_VERSION: 11
+    LLVM_VERSION: 15
   script:
     - .gitlab-ci/meson/build.sh
 
 .meson-build_mingw:
   extends:
     - .build-linux
-    - .use-debian/x86_build_mingw
+    - .use-debian/x86_64_build_mingw
     - .use-wine
   stage: build-x86_64
   script:
@@ -80,14 +80,15 @@ debian-testing:
       -D dri3=enabled
       -D gallium-va=enabled
     GALLIUM_DRIVERS: "swrast,virgl,radeonsi,zink,crocus,iris,i915"
-    VULKAN_DRIVERS: "swrast,amd,intel,intel_hasvk,virtio-experimental"
+    VULKAN_DRIVERS: "swrast,amd,intel,intel_hasvk,virtio"
     BUILDTYPE: "debugoptimized"
     EXTRA_OPTION: >
       -D spirv-to-dxil=true
       -D valgrind=disabled
       -D perfetto=true
-    MINIO_ARTIFACT_NAME: mesa-amd64
-    LLVM_VERSION: "13"
+      -D tools=drm-shim
+    S3_ARTIFACT_NAME: mesa-x86_64-default-${BUILDTYPE}
+    LLVM_VERSION: 15
   script:
     - .gitlab-ci/meson/build.sh
     - .gitlab-ci/prepare-artifacts.sh
@@ -105,10 +106,12 @@ debian-testing-asan:
       -D b_sanitize=address
       -D valgrind=disabled
       -D tools=dlclose-skip
-    MINIO_ARTIFACT_NAME: ""
+    S3_ARTIFACT_NAME: ""
     ARTIFACTS_DEBUG_SYMBOLS: 1
 
 debian-testing-msan:
+  # https://github.com/google/sanitizers/wiki/MemorySanitizerLibcxxHowTo
+  # msan cannot fully work until it's used together with msan libc
   extends:
     - debian-clang
   variables:
@@ -116,22 +119,21 @@ debian-testing-msan:
     EXTRA_OPTION:
       -D b_sanitize=memory
       -D b_lundef=false
-    MINIO_ARTIFACT_NAME: ""
+    S3_ARTIFACT_NAME: ""
     ARTIFACTS_DEBUG_SYMBOLS: 1
     # Don't run all the tests yet:
     # GLSL has some issues in sexpression reading.
     # gtest has issues in its test initialization.
-    MESON_TEST_ARGS: "--suite glcpp --suite gallium  --suite format"
-    # Freedreno dropped because freedreno tools fail at msan.
-    GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus"
-    VULKAN_DRIVERS: intel,amd,broadcom,virtio-experimental
+    MESON_TEST_ARGS: "--suite glcpp --suite format"
+    GALLIUM_DRIVERS: "freedreno,iris,nouveau,kmsro,r300,r600,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus"
+    VULKAN_DRIVERS: intel,amd,broadcom,virtio
 
 .debian-cl-testing:
   extends:
     - .meson-build
     - .ci-deqp-artifacts
   variables:
-    LLVM_VERSION: "13"
+    LLVM_VERSION: 15
     UNWIND: "enabled"
     DRI_LOADERS: >
       -D glx=disabled
@@ -165,6 +167,7 @@ debian-rusticl-testing:
 debian-build-testing:
   extends: .meson-build
   variables:
+    BUILDTYPE: debug
     UNWIND: "enabled"
     DRI_LOADERS: >
       -D glx=dri
@@ -188,7 +191,7 @@ debian-build-testing:
       -D osmesa=true
       -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,lima,panfrost,asahi
       -D b_lto=true
-    LLVM_VERSION: 13
+    LLVM_VERSION: 15
   script: |
     section_start lava-pytest "lava-pytest"
     .gitlab-ci/lava/lava-pytest.sh
@@ -205,8 +208,10 @@ debian-build-testing:
 debian-release:
   extends: .meson-build
   variables:
-    LLVM_VERSION: "13"
+    LLVM_VERSION: 15
     UNWIND: "enabled"
+    C_ARGS: >
+      -Wno-error=stringop-overread
     DRI_LOADERS: >
       -D glx=dri
       -D gbm=enabled
@@ -232,7 +237,7 @@ debian-release:
       -D intel-clc=enabled
       -D imagination-srv=true
     BUILDTYPE: "release"
-    MINIO_ARTIFACT_NAME: "mesa-amd64-${BUILDTYPE}"
+    S3_ARTIFACT_NAME: "mesa-x86_64-default-${BUILDTYPE}"
   script:
     - .gitlab-ci/meson/build.sh
     - 'if [ -n "$MESA_CI_PERFORMANCE_ENABLED" ]; then .gitlab-ci/prepare-artifacts.sh; fi'
@@ -240,7 +245,7 @@ debian-release:
 alpine-build-testing:
   extends:
     - .meson-build
-    - .use-alpine/x86_build
+    - .use-alpine/x86_64_build
   stage: build-x86_64
   variables:
     BUILDTYPE: "release"
@@ -278,15 +283,16 @@ alpine-build-testing:
 fedora-release:
   extends:
     - .meson-build
-    - .use-fedora/x86_build
+    - .use-fedora/x86_64_build
   variables:
     BUILDTYPE: "release"
     C_LINK_ARGS: >
-      -Wno-error=array-bounds
       -Wno-error=stringop-overflow
       -Wno-error=stringop-overread
+    CPP_ARGS: >
+      -Wno-error=dangling-reference
+      -Wno-error=overloaded-virtual
     CPP_LINK_ARGS: >
-      -Wno-error=array-bounds
       -Wno-error=stringop-overflow
       -Wno-error=stringop-overread
     DRI_LOADERS: >
@@ -313,7 +319,7 @@ fedora-release:
       -D gallium-xa=enabled
       -D gallium-nine=false
       -D gallium-opencl=icd
-      -D gallium-rusticl=false
+      -D gallium-rusticl=true
       -D gles1=disabled
       -D gles2=enabled
       -D llvm=enabled
@@ -331,6 +337,7 @@ debian-android:
     - .use-debian/android_build
     - .ci-deqp-artifacts
   variables:
+    BUILDTYPE: debug
     UNWIND: "disabled"
     C_ARGS: >
       -Wno-error=asm-operand-widths
@@ -367,9 +374,9 @@ debian-android:
     LLVM_VERSION: ""
     PKG_CONFIG_LIBDIR: "/disable/non/android/system/pc/files"
     ARTIFACTS_DEBUG_SYMBOLS: 1
-    MINIO_ARTIFACT_NAME: mesa-x86_64-android
+    S3_ARTIFACT_NAME: mesa-x86_64-android-${BUILDTYPE}
   script:
-    - CROSS=aarch64-linux-android GALLIUM_DRIVERS=etnaviv,freedreno,lima,panfrost,vc4,v3d VULKAN_DRIVERS=freedreno,broadcom,virtio-experimental .gitlab-ci/meson/build.sh
+    - CROSS=aarch64-linux-android GALLIUM_DRIVERS=etnaviv,freedreno,lima,panfrost,vc4,v3d VULKAN_DRIVERS=freedreno,broadcom,virtio .gitlab-ci/meson/build.sh
     # x86_64 build:
     # Can't do Intel because gen_decoder.c currently requires libexpat, which
     # is not a dependency that AOSP wants to accept.  Can't do Radeon Gallium
@@ -401,9 +408,9 @@ debian-android:
 .meson-arm:
   extends:
     - .meson-cross
-    - .use-debian/arm_build
+    - .use-debian/arm64_build
   needs:
-    - debian/arm_build
+    - debian/arm64_build
   variables:
     VULKAN_DRIVERS: freedreno,broadcom
     GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,swrast,tegra,v3d,vc4,zink"
@@ -411,7 +418,7 @@ debian-android:
   tags:
     - aarch64
 
-debian-armhf:
+debian-arm32:
   extends:
     - .meson-arm
     - .ci-deqp-artifacts
@@ -420,7 +427,7 @@ debian-armhf:
     EXTRA_OPTION: >
       -D llvm=disabled
       -D valgrind=disabled
-    MINIO_ARTIFACT_NAME: mesa-armhf
+    S3_ARTIFACT_NAME: mesa-arm32-default-${BUILDTYPE}
     # The strip command segfaults, failing to strip the binary and leaving
     # tempfiles in our artifacts.
     ARTIFACTS_DEBUG_SYMBOLS: 1
@@ -428,18 +435,34 @@ debian-armhf:
     - .gitlab-ci/meson/build.sh
     - .gitlab-ci/prepare-artifacts.sh
 
+debian-arm32-asan:
+  extends:
+    - debian-arm32
+  variables:
+    EXTRA_OPTION: >
+      -D llvm=disabled
+      -D b_sanitize=address
+      -D valgrind=disabled
+      -D tools=dlclose-skip
+    ARTIFACTS_DEBUG_SYMBOLS: 1
+    S3_ARTIFACT_NAME: mesa-arm32-asan-${BUILDTYPE}
+    MESON_TEST_ARGS: "--no-suite mesa:compiler --no-suite mesa:util"
+
 debian-arm64:
   extends:
     - .meson-arm
     - .ci-deqp-artifacts
   variables:
+    C_ARGS: >
+      -Wno-error=array-bounds
+      -Wno-error=stringop-truncation
     VULKAN_DRIVERS: "freedreno,broadcom,panfrost,imagination-experimental"
     EXTRA_OPTION: >
       -D llvm=disabled
       -D valgrind=disabled
       -D imagination-srv=true
       -D perfetto=true
-    MINIO_ARTIFACT_NAME: mesa-arm64
+    S3_ARTIFACT_NAME: mesa-arm64-default-${BUILDTYPE}
   script:
     - .gitlab-ci/meson/build.sh
     - .gitlab-ci/prepare-artifacts.sh
@@ -454,7 +477,7 @@ debian-arm64-asan:
       -D valgrind=disabled
       -D tools=dlclose-skip
     ARTIFACTS_DEBUG_SYMBOLS: 1
-    MINIO_ARTIFACT_NAME: mesa-arm64-asan
+    S3_ARTIFACT_NAME: mesa-arm64-asan-${BUILDTYPE}
     MESON_TEST_ARGS: "--no-suite mesa:compiler"
 
 debian-arm64-build-test:
@@ -473,9 +496,11 @@ debian-arm64-release:
     - debian-arm64
   variables:
     BUILDTYPE: release
-    MINIO_ARTIFACT_NAME: mesa-arm64-${BUILDTYPE}
+    S3_ARTIFACT_NAME: mesa-arm64-default-${BUILDTYPE}
     C_ARGS: >
+      -Wno-error=array-bounds
       -Wno-error=stringop-truncation
+      -Wno-error=stringop-overread
   script:
     - .gitlab-ci/meson/build.sh
     - 'if [ -n "$MESA_CI_PERFORMANCE_ENABLED" ]; then .gitlab-ci/prepare-artifacts.sh; fi'
@@ -483,7 +508,8 @@ debian-arm64-release:
 debian-clang:
   extends: .meson-build
   variables:
-    LLVM_VERSION: "13"
+    BUILDTYPE: debug
+    LLVM_VERSION: 15
     UNWIND: "enabled"
     GALLIUM_DUMP_CPU: "true"
     C_ARGS: >
@@ -516,11 +542,12 @@ debian-clang:
       -D gles1=enabled
       -D gles2=enabled
       -D llvm=enabled
-      -D microsoft-clc=enabled
+      -D microsoft-clc=disabled
       -D shared-llvm=enabled
       -D opencl-spirv=true
+      -D shared-glapi=enabled
     GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus,i915,asahi"
-    VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio-experimental,swrast,panfrost,imagination-experimental,microsoft-experimental
+    VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,swrast,panfrost,imagination-experimental,microsoft-experimental
     EXTRA_OPTION:
       -D spirv-to-dxil=true
       -D osmesa=true
@@ -530,8 +557,8 @@ debian-clang:
       -D build-aco-tests=true
       -D intel-clc=enabled
       -D imagination-srv=true
-    CC: clang
-    CXX: clang++
+    CC: clang-${LLVM_VERSION}
+    CXX: clang++-${LLVM_VERSION}
 
 debian-clang-release:
   extends: debian-clang
@@ -540,6 +567,22 @@ debian-clang-release:
     DRI_LOADERS: >
       -D glx=xlib
       -D platforms=x11,wayland
+    GALLIUM_ST: >
+      -D dri3=enabled
+      -D gallium-extra-hud=true
+      -D gallium-vdpau=enabled
+      -D gallium-omx=bellagio
+      -D gallium-va=enabled
+      -D gallium-xa=enabled
+      -D gallium-nine=true
+      -D gallium-opencl=icd
+      -D gles1=disabled
+      -D gles2=disabled
+      -D llvm=enabled
+      -D microsoft-clc=disabled
+      -D shared-llvm=enabled
+      -D opencl-spirv=true
+      -D shared-glapi=disabled
 
 windows-vs2019:
   extends:
@@ -557,7 +600,7 @@ windows-vs2019:
 .debian-cl:
   extends: .meson-build
   variables:
-    LLVM_VERSION: "13"
+    LLVM_VERSION: 15
     UNWIND: "enabled"
     DRI_LOADERS: >
       -D glx=disabled
@@ -584,6 +627,7 @@ windows-vs2019:
 debian-rusticl:
   extends: .debian-cl
   variables:
+    BUILDTYPE: debug
     GALLIUM_DRIVERS: "iris,swrast"
     GALLIUM_ST: >
       -D dri3=disabled
@@ -594,11 +638,13 @@ debian-rusticl:
       -D gallium-nine=false
       -D gallium-opencl=disabled
       -D gallium-rusticl=true
+    RUSTC: clippy-driver
 
 debian-vulkan:
   extends: .meson-build
   variables:
-    LLVM_VERSION: "13"
+    BUILDTYPE: debug
+    LLVM_VERSION: 15
     UNWIND: "disabled"
     DRI_LOADERS: >
       -D glx=disabled
@@ -619,22 +665,23 @@ debian-vulkan:
       -D c_args=-fno-sanitize-recover=all
       -D cpp_args=-fno-sanitize-recover=all
     UBSAN_OPTIONS: "print_stacktrace=1"
-    VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio-experimental,imagination-experimental,microsoft-experimental
+    VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,imagination-experimental,microsoft-experimental
     EXTRA_OPTION: >
       -D vulkan-layers=device-select,overlay
       -D build-aco-tests=true
       -D intel-clc=disabled
       -D imagination-srv=true
 
-debian-i386:
+debian-x86_32:
   extends:
     - .meson-cross
-    - .use-debian/i386_build
+    - .use-debian/x86_32_build
   variables:
+    BUILDTYPE: debug
     CROSS: i386
-    VULKAN_DRIVERS: intel,amd,swrast,virtio-experimental
+    VULKAN_DRIVERS: intel,amd,swrast,virtio
     GALLIUM_DRIVERS: "iris,nouveau,r300,r600,radeonsi,swrast,virgl,zink,crocus"
-    LLVM_VERSION: 13
+    LLVM_VERSION: 15
     EXTRA_OPTION: >
       -D vulkan-layers=device-select,overlay
 
@@ -648,7 +695,7 @@ debian-s390x:
   variables:
     CROSS: s390x
     GALLIUM_DRIVERS: "swrast,zink"
-    LLVM_VERSION: 13
+    LLVM_VERSION: 15
     VULKAN_DRIVERS: "swrast"
 
 debian-ppc64el:
@@ -657,6 +704,7 @@ debian-ppc64el:
     - .use-debian/ppc64el_build
     - .ppc64el-rules
   variables:
+    BUILDTYPE: debug
     CROSS: ppc64el
     GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl,zink"
     VULKAN_DRIVERS: "amd,swrast"
@@ -684,6 +732,7 @@ debian-ppc64el:
       -D opencl-spirv=true
       -D microsoft-clc=enabled
       -D static-libclc=all
+      -D opencl-external-clang-headers=disabled
       -D llvm=enabled
       -D gallium-va=enabled
       -D video-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec

.gitlab-ci/common/capture-devcoredump.sh

@@ -1,7 +1,10 @@
-#!/bin/sh
+#!/usr/bin/env bash
+# shellcheck disable=SC2035
+# shellcheck disable=SC2061
+# shellcheck disable=SC2086 # we want word splitting
 
 while true; do
-  devcds=`find /sys/devices/virtual/devcoredump/ -name data 2>/dev/null`
+  devcds=$(find /sys/devices/virtual/devcoredump/ -name data 2>/dev/null)
   for i in $devcds; do
     echo "Found a devcoredump at $i."
     if cp $i /results/first.devcore; then
@@ -10,5 +13,23 @@ while true; do
       exit 0
     fi
   done
+  i915_error_states=$(find /sys/devices/ -path */drm/card*/error)
+  for i in $i915_error_states; do
+    tmpfile=$(mktemp)
+    cp "$i" "$tmpfile"
+    filesize=$(stat --printf="%s" "$tmpfile")
+    # Does the file contain "No error state collected" ?
+    if [ "$filesize" = 25 ]; then
+        rm "$tmpfile"
+    else
+        echo "Found an i915 error state at $i size=$filesize."
+        if cp "$tmpfile" /results/first.i915_error_state; then
+            rm "$tmpfile"
+            echo 1 > "$i"
+            echo "Saved to the job artifacts at /first.i915_error_state"
+            exit 0
+        fi
+    fi
+  done
   sleep 10
 done

.gitlab-ci/common/generate-env.sh

@@ -85,9 +85,8 @@ for var in \
     MESA_LOADER_DRIVER_OVERRIDE \
     MESA_TEMPLATES_COMMIT \
     MESA_VK_IGNORE_CONFORMANCE_WARNING \
-    MESA_SPIRV_LOG_LEVEL \
-    MINIO_HOST \
-    MINIO_RESULTS_UPLOAD \
+    S3_HOST \
+    S3_RESULTS_UPLOAD \
     NIR_DEBUG \
     PAN_I_WANT_A_BROKEN_VULKAN_DRIVER \
     PAN_MESA_DEBUG \
@@ -111,13 +110,16 @@ for var in \
     SKQP_ASSETS_DIR \
     SKQP_BACKENDS \
     TU_DEBUG \
+    USE_ANGLE \
     VIRGL_HOST_API \
     WAFFLE_PLATFORM \
     VK_CPU \
     VK_DRIVER \
     VK_ICD_FILENAMES \
     VKD3D_PROTON_RESULTS \
+    VKD3D_CONFIG \
     ZINK_DESCRIPTORS \
+    ZINK_DEBUG \
     LVP_POISON_MEMORY \
     ; do
   if [ -n "${!var+x}" ]; then

.gitlab-ci/common/init-stage1.sh

@@ -13,6 +13,8 @@ mount -t debugfs none /sys/kernel/debug
 mount -t devtmpfs none /dev || echo possibly already mounted
 mkdir -p /dev/pts
 mount -t devpts devpts /dev/pts
+mkdir /dev/shm
+mount -t tmpfs -o noexec,nodev,nosuid tmpfs /dev/shm
 mount -t tmpfs tmpfs /tmp
 
 echo "nameserver 8.8.8.8" > /etc/resolv.conf
@@ -20,4 +22,4 @@ echo "nameserver 8.8.8.8" > /etc/resolv.conf
 
 # Set the time so we can validate certificates before we fetch anything;
 # however as not all DUTs have network, make this non-fatal.
-for i in 1 2 3; do sntp -sS pool.ntp.org && break || sleep 2; done || true
+for _ in 1 2 3; do sntp -sS pool.ntp.org && break || sleep 2; done || true

.gitlab-ci/common/init-stage2.sh

@@ -1,4 +1,11 @@
 #!/bin/bash
+# shellcheck disable=SC1090
+# shellcheck disable=SC1091
+# shellcheck disable=SC2086 # we want word splitting
+# shellcheck disable=SC2155
+
+# Second-stage init, used to set up devices and our job environment before
+# running tests.
 
 # Make sure to kill itself and all the children process from this script on
 # exiting, since any console output may interfere with LAVA signals handling,
@@ -33,10 +40,7 @@ trap cleanup INT TERM EXIT
 BACKGROUND_PIDS=
 
 
-# Second-stage init, used to set up devices and our job environment before
-# running tests.
-
-for path in '/set-job-env-vars.sh' './set-job-env-vars.sh'; do
+for path in '/dut-env-vars.sh' '/set-job-env-vars.sh' './set-job-env-vars.sh'; do
     [ -f "$path" ] && source "$path"
 done
 . "$SCRIPTS_DIR"/setup-test-env.sh
@@ -50,7 +54,7 @@ set -ex
 
 # Set up ZRAM
 HWCI_ZRAM_SIZE=2G
-if zramctl --find --size $HWCI_ZRAM_SIZE -a zstd; then
+if /sbin/zramctl --find --size $HWCI_ZRAM_SIZE -a zstd; then
     mkswap /dev/zram0
     swapon /dev/zram0
     echo "zram: $HWCI_ZRAM_SIZE activated"
@@ -67,12 +71,16 @@ fi
 #
 if [ "$HWCI_KVM" = "true" ]; then
     unset KVM_KERNEL_MODULE
-    grep -qs '\bvmx\b' /proc/cpuinfo && KVM_KERNEL_MODULE=kvm_intel || {
-        grep -qs '\bsvm\b' /proc/cpuinfo && KVM_KERNEL_MODULE=kvm_amd
+    {
+      grep -qs '\bvmx\b' /proc/cpuinfo && KVM_KERNEL_MODULE=kvm_intel
+    } || {
+      grep -qs '\bsvm\b' /proc/cpuinfo && KVM_KERNEL_MODULE=kvm_amd
     }
 
-    [ -z "${KVM_KERNEL_MODULE}" ] && \
-        echo "WARNING: Failed to detect CPU virtualization extensions" || \
+    {
+      [ -z "${KVM_KERNEL_MODULE}" ] && \
+      echo "WARNING: Failed to detect CPU virtualization extensions"
+    } || \
         modprobe ${KVM_KERNEL_MODULE}
 
     mkdir -p /lava-files
@@ -87,6 +95,11 @@ ln -sf $CI_PROJECT_DIR/install /install
 export LD_LIBRARY_PATH=/install/lib
 export LIBGL_DRIVERS_PATH=/install/lib/dri
 
+# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22495#note_1876691
+# The navi21 boards seem to have trouble with ld.so.cache, so try explicitly
+# telling it to look in /usr/local/lib.
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
+
 # Store Mesa's disk cache under /tmp, rather than sending it out over NFS.
 export XDG_CACHE_HOME=/tmp
 
@@ -98,20 +111,20 @@ if [ "$HWCI_FREQ_MAX" = "true" ]; then
   head -0 /dev/dri/renderD128
 
   # Disable GPU frequency scaling
-  DEVFREQ_GOVERNOR=`find /sys/devices -name governor | grep gpu || true`
+  DEVFREQ_GOVERNOR=$(find /sys/devices -name governor | grep gpu || true)
   test -z "$DEVFREQ_GOVERNOR" || echo performance > $DEVFREQ_GOVERNOR || true
 
   # Disable CPU frequency scaling
   echo performance | tee -a /sys/devices/system/cpu/cpufreq/policy*/scaling_governor || true
 
   # Disable GPU runtime power management
-  GPU_AUTOSUSPEND=`find /sys/devices -name autosuspend_delay_ms | grep gpu | head -1`
+  GPU_AUTOSUSPEND=$(find /sys/devices -name autosuspend_delay_ms | grep gpu | head -1)
   test -z "$GPU_AUTOSUSPEND" || echo -1 > $GPU_AUTOSUSPEND || true
   # Lock Intel GPU frequency to 70% of the maximum allowed by hardware
   # and enable throttling detection & reporting.
   # Additionally, set the upper limit for CPU scaling frequency to 65% of the
   # maximum permitted, as an additional measure to mitigate thermal throttling.
-  ./intel-gpu-freq.sh -s 70% --cpu-set-max 65% -g all -d
+  /intel-gpu-freq.sh -s 70% --cpu-set-max 65% -g all -d
 fi
 
 # Increase freedreno hangcheck timer because it's right at the edge of the
@@ -122,8 +135,10 @@ fi
 
 # Start a little daemon to capture the first devcoredump we encounter.  (They
 # expire after 5 minutes, so we poll for them).
-/capture-devcoredump.sh &
-BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
+if [ -x /capture-devcoredump.sh ]; then
+  /capture-devcoredump.sh &
+  BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
+fi
 
 # If we want Xorg to be running for the test, then we start it up before the
 # HWCI_TEST_SCRIPT because we need to use xinit to start X (otherwise
@@ -132,12 +147,12 @@ BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
 if [ -n "$HWCI_START_XORG" ]; then
   echo "touch /xorg-started; sleep 100000" > /xorg-script
   env \
-    VK_ICD_FILENAMES=/install/share/vulkan/icd.d/${VK_DRIVER}_icd.`uname -m`.json \
+    VK_ICD_FILENAMES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
     xinit /bin/sh /xorg-script -- /usr/bin/Xorg -noreset -s 0 -dpms -logfile /Xorg.0.log &
   BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
 
   # Wait for xorg to be ready for connections.
-  for i in 1 2 3 4 5; do
+  for _ in 1 2 3 4 5; do
     if [ -e /xorg-started ]; then
       break
     fi
@@ -182,9 +197,9 @@ mv -f ${CI_PROJECT_DIR}/results ./ 2>/dev/null || true
 cleanup
 
 # upload artifacts
-if [ -n "$MINIO_RESULTS_UPLOAD" ]; then
+if [ -n "$S3_RESULTS_UPLOAD" ]; then
   tar --zstd -cf results.tar.zst results/;
-  ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" results.tar.zst https://"$MINIO_RESULTS_UPLOAD"/results.tar.zst;
+  ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" results.tar.zst https://"$S3_RESULTS_UPLOAD"/results.tar.zst;
 fi
 
 # We still need to echo the hwci: mesa message, as some scripts rely on it, such

.gitlab-ci/common/intel-gpu-freq.sh

@@ -1,4 +1,14 @@
-#!/bin/sh
+#!/usr/bin/env bash
+# shellcheck disable=SC2013
+# shellcheck disable=SC2015
+# shellcheck disable=SC2034
+# shellcheck disable=SC2046
+# shellcheck disable=SC2059
+# shellcheck disable=SC2086 # we want word splitting
+# shellcheck disable=SC2154
+# shellcheck disable=SC2155
+# shellcheck disable=SC2162
+# shellcheck disable=SC2229
 #
 # This is an utility script to manage Intel GPU frequencies.
 # It can be used for debugging performance problems or trying to obtain a stable
@@ -193,7 +203,7 @@ compute_freq_set() {
         val=${FREQ_RPn}
         ;;
     *%)
-        val=$((${1%?} * ${FREQ_RP0} / 100))
+        val=$((${1%?} * FREQ_RP0 / 100))
         # Adjust freq to comply with 50 MHz increments
         val=$((val / 50 * 50))
         ;;
@@ -242,12 +252,12 @@ set_freq_max() {
 
     [ -z "${DRY_RUN}" ] || return 0
 
-    printf "%s" ${SET_MAX_FREQ} | tee $(print_freq_sysfs_path max) \
-        $(print_freq_sysfs_path boost) > /dev/null
-    [ $? -eq 0 ] || {
+    if ! printf "%s" ${SET_MAX_FREQ} | tee $(print_freq_sysfs_path max) \
+        $(print_freq_sysfs_path boost) > /dev/null;
+    then
         log ERROR "Failed to set GPU max frequency"
         return 1
-    }
+    fi
 }
 
 #
@@ -272,11 +282,11 @@ set_freq_min() {
 
     [ -z "${DRY_RUN}" ] || return 0
 
-    printf "%s" ${SET_MIN_FREQ} > $(print_freq_sysfs_path min)
-    [ $? -eq 0 ] || {
+    if ! printf "%s" ${SET_MIN_FREQ} > $(print_freq_sysfs_path min);
+    then
         log ERROR "Failed to set GPU min frequency"
         return 1
-    }
+    fi
 }
 
 #
@@ -495,7 +505,7 @@ compute_cpu_freq_set() {
         val=${CPU_FREQ_cpuinfo_min}
         ;;
     *%)
-        val=$((${1%?} * ${CPU_FREQ_cpuinfo_max} / 100))
+        val=$((${1%?} * CPU_FREQ_cpuinfo_max / 100))
         ;;
     *[!0-9]*)
         log ERROR "Cannot set CPU freq to invalid value: %s" "$1"
@@ -538,11 +548,11 @@ set_cpu_freq_max() {
     local pstate_info=$(printf "${CPU_PSTATE_SYSFS_PATTERN}" max_perf_pct)
     [ -e "${pstate_info}" ] && {
         log INFO "Setting intel_pstate max perf to %s" "${target_freq}%"
-        printf "%s" "${target_freq}" > "${pstate_info}"
-        [ $? -eq 0 ] || {
+        if ! printf "%s" "${target_freq}" > "${pstate_info}";
+	then
             log ERROR "Failed to set intel_pstate max perf"
             res=1
-        }
+	fi
     }
 
     local cpu_index
@@ -555,11 +565,11 @@ set_cpu_freq_max() {
         log INFO "Setting CPU%s max scaling freq to %s Hz" ${cpu_index} "${target_freq}"
         [ -n "${DRY_RUN}" ] && continue
 
-        printf "%s" ${target_freq} > $(print_cpu_freq_sysfs_path scaling_max ${cpu_index})
-        [ $? -eq 0 ] || {
+        if ! printf "%s" ${target_freq} > $(print_cpu_freq_sysfs_path scaling_max ${cpu_index});
+	then
             res=1
             log ERROR "Failed to set CPU%s max scaling frequency" ${cpu_index}
-        }
+	fi
     done
 
     return ${res}

.gitlab-ci/common/start-x.sh

@@ -13,7 +13,7 @@ fi
 xinit /bin/sh "${_XORG_SCRIPT}" -- /usr/bin/Xorg vt45 -noreset -s 0 -dpms -logfile /Xorg.0.log &
 
 # Wait for xorg to be ready for connections.
-for i in 1 2 3 4 5; do
+for _ in 1 2 3 4 5; do
     if [ -e "${_FLAG_FILE}" ]; then
         break
     fi

.gitlab-ci/container/0001-Fix-build-for-the-surfaceless-and-null-WS-target-pla.patch

@@ -1,161 +0,0 @@
-From 6d99990e93869e361035b7c06c05183041dec8b4 Mon Sep 17 00:00:00 2001
-From: Ricardo Garcia <rgarcia@igalia.com>
-Date: Mon, 20 Feb 2023 13:57:53 +0100
-Subject: [PATCH] Fix build for the surfaceless and null-WS target platforms
-
-Both platforms should not be considered for building Vulkan Video, which
-is only available in the normal Linux and Win32 targets, and their
-createLibrary platform methods do not take a library type argument.
-
-No test results should be affected by these changes.
-
-Components: Framework
-VK-GL-CTS issue: 4295
-
-Change-Id: I4de5b42685899099a9cfcf7da64fe299fef61ffc
----
- external/vulkancts/framework/vulkan/vkPlatform.hpp          | 2 +-
- .../vulkancts/modules/vulkan/api/vktApiVersionCheck.cpp     | 2 +-
- external/vulkancts/modules/vulkan/video/CMakeLists.txt      | 2 +-
- .../modules/vulkan/video/vktVideoSessionNvUtils.cpp         | 2 +-
- external/vulkancts/modules/vulkan/vktTestPackage.cpp        | 2 +-
- external/vulkancts/vkscpc/vkscpc.cpp                        | 2 +-
- external/vulkancts/vkscserver/vksServices.cpp               | 2 +-
- framework/delibs/debase/deDefs.h                            | 6 ++++++
- framework/platform/CMakeLists.txt                           | 1 +
- targets/nullws/nullws.cmake                                 | 1 +
- 10 files changed, 15 insertions(+), 7 deletions(-)
-
-diff --git a/external/vulkancts/framework/vulkan/vkPlatform.hpp b/external/vulkancts/framework/vulkan/vkPlatform.hpp
-index bec39d326..7574166b9 100644
---- a/external/vulkancts/framework/vulkan/vkPlatform.hpp
-+++ b/external/vulkancts/framework/vulkan/vkPlatform.hpp
-@@ -399,7 +399,7 @@ public:
- 
- 							Platform			(void) {}
- 							~Platform			(void) {}
--#if (DE_OS == DE_OS_WIN32) || (DE_OS == DE_OS_UNIX)
-+#ifdef DE_PLATFORM_USE_LIBRARY_TYPE
- 	virtual Library*		createLibrary		(LibraryType libraryType = LIBRARY_TYPE_VULKAN, const char* libraryPath = DE_NULL) const = 0;
- #else
- 	virtual Library*		createLibrary		(const char* libraryPath = DE_NULL) const = 0;
-diff --git a/external/vulkancts/modules/vulkan/api/vktApiVersionCheck.cpp b/external/vulkancts/modules/vulkan/api/vktApiVersionCheck.cpp
-index 5f6d884f4..af6bf6938 100644
---- a/external/vulkancts/modules/vulkan/api/vktApiVersionCheck.cpp
-+++ b/external/vulkancts/modules/vulkan/api/vktApiVersionCheck.cpp
-@@ -133,7 +133,7 @@ public:
- 		tcu::TestLog&						log				= m_context.getTestContext().getLog();
- 		const deUint32						apiVersion		= m_context.getUsedApiVersion();
- 		const vk::Platform&					platform		= m_context.getTestContext().getPlatform().getVulkanPlatform();
--#if (DE_OS == DE_OS_WIN32) || (DE_OS == DE_OS_UNIX)
-+#ifdef DE_PLATFORM_USE_LIBRARY_TYPE
- 		de::MovePtr<vk::Library>			vkLibrary		= de::MovePtr<vk::Library>(platform.createLibrary(vk::Platform::LibraryType::LIBRARY_TYPE_VULKAN, m_context.getTestContext().getCommandLine().getVkLibraryPath()));
- #else
- 		de::MovePtr<vk::Library>			vkLibrary		= de::MovePtr<vk::Library>(platform.createLibrary(m_context.getTestContext().getCommandLine().getVkLibraryPath()));
-diff --git a/external/vulkancts/modules/vulkan/video/CMakeLists.txt b/external/vulkancts/modules/vulkan/video/CMakeLists.txt
-index 464adb1e2..f9a2044e7 100644
---- a/external/vulkancts/modules/vulkan/video/CMakeLists.txt
-+++ b/external/vulkancts/modules/vulkan/video/CMakeLists.txt
-@@ -1,5 +1,5 @@
- include_directories(..)
--if (DE_OS_IS_WIN32 OR DE_OS_IS_UNIX)
-+if ((DE_OS_IS_WIN32 OR DE_OS_IS_UNIX) AND NOT DEQP_USE_SURFACELESS AND NOT DEQP_USE_NULLWS)
- 	include_directories(${FFMPEG_INCLUDE_PATH})
- 	add_compile_definitions(DE_BUILD_VIDEO)
- endif()
-diff --git a/external/vulkancts/modules/vulkan/video/vktVideoSessionNvUtils.cpp b/external/vulkancts/modules/vulkan/video/vktVideoSessionNvUtils.cpp
-index 00491930c..9323278be 100644
---- a/external/vulkancts/modules/vulkan/video/vktVideoSessionNvUtils.cpp
-+++ b/external/vulkancts/modules/vulkan/video/vktVideoSessionNvUtils.cpp
-@@ -148,7 +148,7 @@ private:
- };
- 
- NvFunctions::NvFunctions (const vk::Platform& platform)
--#ifdef DE_BUILD_VIDEO
-+#ifdef DE_PLATFORM_USE_LIBRARY_TYPE
- 	: m_library	(de::MovePtr<vk::Library>(platform.createLibrary(vk::Platform::LIBRARY_TYPE_VULKAN_VIDEO_DECODE_PARSER, DE_NULL)))
- #else
- 	: m_library	(de::MovePtr<vk::Library>(platform.createLibrary()))
-diff --git a/external/vulkancts/modules/vulkan/vktTestPackage.cpp b/external/vulkancts/modules/vulkan/vktTestPackage.cpp
-index 959a9d368..cac454c71 100644
---- a/external/vulkancts/modules/vulkan/vktTestPackage.cpp
-+++ b/external/vulkancts/modules/vulkan/vktTestPackage.cpp
-@@ -204,7 +204,7 @@ static void		restoreStandardOutput	()												{ qpRedirectOut(openWrite, open
- 
- static MovePtr<vk::Library> createLibrary (tcu::TestContext& testCtx)
- {
--#if (DE_OS == DE_OS_WIN32) || (DE_OS == DE_OS_UNIX)
-+#ifdef DE_PLATFORM_USE_LIBRARY_TYPE
- 	return MovePtr<vk::Library>(testCtx.getPlatform().getVulkanPlatform().createLibrary(vk::Platform::LIBRARY_TYPE_VULKAN, testCtx.getCommandLine().getVkLibraryPath()));
- #else
- 	return MovePtr<vk::Library>(testCtx.getPlatform().getVulkanPlatform().createLibrary(testCtx.getCommandLine().getVkLibraryPath()));
-diff --git a/external/vulkancts/vkscpc/vkscpc.cpp b/external/vulkancts/vkscpc/vkscpc.cpp
-index 55b5665c8..91725633a 100644
---- a/external/vulkancts/vkscpc/vkscpc.cpp
-+++ b/external/vulkancts/vkscpc/vkscpc.cpp
-@@ -288,7 +288,7 @@ int main (int argc, char** argv)
- 		tcu::DirArchive					archive			{""};
- 		tcu::TestLog					log				{ cmdLine.getOption<opt::LogFile>().c_str() }; log.supressLogging(true);
- 		de::SharedPtr<tcu::Platform>	platform		{createPlatform()};
--#if (DE_OS == DE_OS_WIN32) || (DE_OS == DE_OS_UNIX)
-+#ifdef DE_PLATFORM_USE_LIBRARY_TYPE
- 		de::SharedPtr<vk::Library>		library			{platform->getVulkanPlatform().createLibrary(vk::Platform::LIBRARY_TYPE_VULKAN, DE_NULL)};
- #else
- 		de::SharedPtr<vk::Library>		library			{platform->getVulkanPlatform().createLibrary(DE_NULL)};
-diff --git a/external/vulkancts/vkscserver/vksServices.cpp b/external/vulkancts/vkscserver/vksServices.cpp
-index 461c7a349..fe1160edc 100644
---- a/external/vulkancts/vkscserver/vksServices.cpp
-+++ b/external/vulkancts/vkscserver/vksServices.cpp
-@@ -163,7 +163,7 @@ VkscServer* createServerVKSC(const std::string& logFile)
- 	tcu::DirArchive					archive		{""};
- 	tcu::TestLog					log			{ logFile.c_str() }; log.supressLogging(true);
- 	tcu::Platform*					platform	{createPlatform()};
--#if (DE_OS == DE_OS_WIN32) || (DE_OS == DE_OS_UNIX)
-+#ifdef DE_PLATFORM_USE_LIBRARY_TYPE
- 	vk::Library*					library		{platform->getVulkanPlatform().createLibrary(vk::Platform::LIBRARY_TYPE_VULKAN, DE_NULL)};
- #else
- 	vk::Library*					library		{platform->getVulkanPlatform().createLibrary(DE_NULL)};
-diff --git a/framework/delibs/debase/deDefs.h b/framework/delibs/debase/deDefs.h
-index 39cd65d0b..2885fe5c5 100644
---- a/framework/delibs/debase/deDefs.h
-+++ b/framework/delibs/debase/deDefs.h
-@@ -101,6 +101,12 @@
- #	error Unknown operating system.
- #endif
- 
-+#if ((DE_OS == DE_OS_WIN32) || (DE_OS == DE_OS_UNIX)) && !defined(DEQP_SURFACELESS) && !defined(NULLWS)
-+#	define DE_PLATFORM_USE_LIBRARY_TYPE 1
-+#else
-+#	undef DE_PLATFORM_USE_LIBRARY_TYPE
-+#endif
-+
- /* CPUs */
- #define DE_CPU_VANILLA	0
- #define DE_CPU_X86		1
-diff --git a/framework/platform/CMakeLists.txt b/framework/platform/CMakeLists.txt
-index 00c53e3c9..b2a1d57b6 100644
---- a/framework/platform/CMakeLists.txt
-+++ b/framework/platform/CMakeLists.txt
-@@ -113,6 +113,7 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS)
- 		endif()
- 
- 	elseif (DE_OS_IS_UNIX AND DEQP_USE_SURFACELESS)
-+		add_definitions(-DDEQP_SURFACELESS=1)
- 		set(TCUTIL_PLATFORM_SRCS
- 			surfaceless/tcuSurfacelessPlatform.hpp
- 			surfaceless/tcuSurfacelessPlatform.cpp
-diff --git a/targets/nullws/nullws.cmake b/targets/nullws/nullws.cmake
-index 81a7f9ea2..5f6f9b773 100644
---- a/targets/nullws/nullws.cmake
-+++ b/targets/nullws/nullws.cmake
-@@ -1,6 +1,7 @@
- message("*** Using nullws target")
- set(DEQP_TARGET_NAME "nullws")
- 
-+set(DEQP_USE_NULLWS ON)
- add_definitions(-DNULLWS)
- 
- find_library(GLES2_LIBRARY		NAMES libGLESv2 GLESv2)
--- 
-2.39.1
-

.gitlab-ci/container/alpine/x86_64_build.sh

@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC1091
+set -e
+set -o xtrace
+
+EPHEMERAL=(
+    autoconf
+    automake
+    bzip2
+    libtool
+    libepoxy-dev
+    libtbb-dev
+    make
+    openssl-dev
+    unzip
+)
+
+
+DEPS=(
+    bash
+    bison
+    ccache
+    cmake
+    clang-dev
+    coreutils
+    curl
+    flex
+    gcc
+    g++
+    git
+    gettext
+    glslang
+    linux-headers
+    llvm16-dev
+    meson
+    expat-dev
+    elfutils-dev
+    libdrm-dev
+    libselinux-dev
+    libva-dev
+    libpciaccess-dev
+    zlib-dev
+    python3-dev
+    py3-mako
+    py3-ply
+    vulkan-headers
+    spirv-tools-dev
+    util-macros
+    wayland-dev
+    wayland-protocols
+)
+
+apk add "${DEPS[@]}" "${EPHEMERAL[@]}"
+
+. .gitlab-ci/container/container_pre_build.sh
+
+pushd /usr/local
+git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
+rm -rf shader-db/.git
+cd shader-db
+make
+popd
+
+
+############### Uninstall the build software
+
+apk del "${EPHEMERAL[@]}"
+
+. .gitlab-ci/container/container_post_build.sh

.gitlab-ci/container/alpine/x86_64_lava_ssh_client.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+# This is a ci-templates build script to generate a container for LAVA SSH client.
+
+# shellcheck disable=SC1091
+set -e
+set -o xtrace
+
+EPHEMERAL=(
+)
+
+# We only need these very basic packages to run the tests.
+DEPS=(
+    openssh-client  # for ssh
+    iputils         # for ping
+    bash
+    curl
+)
+
+
+apk add "${DEPS[@]}" "${EPHEMERAL[@]}"
+
+. .gitlab-ci/container/container_pre_build.sh
+
+############### Uninstall the build software
+
+apk del "${EPHEMERAL[@]}"
+
+. .gitlab-ci/container/container_post_build.sh

.gitlab-ci/container/alpine/x86_build.sh

@@ -1,72 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC2086 # we want word splitting
-
-set -e
-set -o xtrace
-
-
-EPHEMERAL="
-        autoconf
-        automake
-        bzip2
-        cmake
-        git
-        libtool
-        libepoxy-dev
-        libtbb-dev
-        make
-        openssl-dev
-        unzip
-        xz
-	zstd-dev
-        "
-
-apk add \
-    bash \
-    bison \
-    ccache \
-    clang-dev \
-    coreutils \
-    curl \
-    flex \
-    gcc \
-    g++ \
-    gettext \
-    glslang \
-    linux-headers \
-    llvm15-dev \
-    meson \
-    expat-dev \
-    elfutils-dev \
-    libselinux-dev \
-    libva-dev \
-    libpciaccess-dev \
-    zlib-dev \
-    python3-dev \
-    py3-mako \
-    py3-ply \
-    vulkan-headers \
-    spirv-tools-dev \
-    util-macros \
-    $EPHEMERAL
-
-
-. .gitlab-ci/container/container_pre_build.sh
-
-. .gitlab-ci/container/build-libdrm.sh
-
-. .gitlab-ci/container/build-wayland.sh
-
-pushd /usr/local
-git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
-rm -rf shader-db/.git
-cd shader-db
-make
-popd
-
-
-############### Uninstall the build software
-
-apk del $EPHEMERAL
-
-. .gitlab-ci/container/container_post_build.sh

.gitlab-ci/container/arm64.config

@@ -43,6 +43,7 @@ CONFIG_TYPEC_TCPM=y
 # For CONFIG_QCOM_LMH
 CONFIG_OF=y
 
+CONFIG_ARM_SMMU_QCOM=y
 CONFIG_QCOM_COMMAND_DB=y
 CONFIG_QCOM_RPMHPD=y
 CONFIG_QCOM_RPMPD=y
@@ -72,12 +73,20 @@ CONFIG_INTERCONNECT_QCOM_SDM845=y
 CONFIG_INTERCONNECT_QCOM_MSM8916=y
 CONFIG_INTERCONNECT_QCOM_OSM_L3=y
 CONFIG_INTERCONNECT_QCOM_SC7180=y
+CONFIG_INTERCONNECT_QCOM_SM8350=y
 CONFIG_CRYPTO_DEV_QCOM_RNG=y
 CONFIG_SC_DISPCC_7180=y
 CONFIG_SC_GPUCC_7180=y
+CONFIG_SM_GPUCC_8350=y
 CONFIG_QCOM_SPMI_ADC5=y
 CONFIG_DRM_PARADE_PS8640=y
+CONFIG_DRM_LONTIUM_LT9611UXC=y
 CONFIG_PHY_QCOM_USB_HS=y
+CONFIG_QCOM_GPI_DMA=y
+CONFIG_USB_ONBOARD_HUB=y
+CONFIG_NVMEM_QCOM_QFPROM=y
+CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=y
+
 
 # db410c ethernet
 CONFIG_USB_RTL8152=y
@@ -85,6 +94,8 @@ CONFIG_USB_RTL8152=y
 CONFIG_ATL1C=y
 # Chromebooks ethernet
 CONFIG_USB_ONBOARD_HUB=y
+# 888 HDK ethernet
+CONFIG_USB_LAN78XX=y
 
 CONFIG_ARCH_ALPINE=n
 CONFIG_ARCH_BCM2835=n

.gitlab-ci/container/baremetal_build.sh

@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 set -o xtrace
 
-# Fetch the arm-built rootfs image and unpack it in our x86 container (saves
+# Fetch the arm-built rootfs image and unpack it in our x86_64 container (saves
 # network transfer, disk usage, and runtime on test jobs)
 
 # shellcheck disable=SC2154 # arch is assigned in previous scripts

.gitlab-ci/container/build-angle.sh

@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+
+set -ex
+
+ANGLE_REV="82f1cee01a9ea24960e8f23b24d348fccbe0aae0"
+
+# DEPOT tools
+git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
+PWD=$(pwd)
+export PATH=$PWD/depot_tools:$PATH
+export DEPOT_TOOLS_UPDATE=0
+
+mkdir /angle-build
+pushd /angle-build
+git init
+git remote add origin https://chromium.googlesource.com/angle/angle.git
+git fetch --depth 1 origin "$ANGLE_REV"
+git checkout FETCH_HEAD
+
+# source preparation
+python3 scripts/bootstrap.py
+mkdir -p build/config
+gclient sync
+
+sed -i "/catapult/d" testing/BUILD.gn
+
+mkdir -p out/Release
+echo '
+is_debug = false
+angle_enable_swiftshader = false
+angle_enable_null = false
+angle_enable_gl = false
+angle_enable_vulkan = true
+angle_has_histograms = false
+build_angle_trace_perf_tests = false
+build_angle_deqp_tests = false
+angle_use_custom_libvulkan = false
+dcheck_always_on=true
+' > out/Release/args.gn
+
+if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
+  build/linux/sysroot_scripts/install-sysroot.py --arch=arm64
+fi
+
+gn gen out/Release
+# depot_tools overrides ninja with a version that doesn't work.  We want
+# ninja with FDO_CI_CONCURRENT anyway.
+/usr/local/bin/ninja -C out/Release/
+
+mkdir /angle
+cp out/Release/lib*GL*.so /angle/
+ln -s libEGL.so /angle/libEGL.so.1
+ln -s libGLESv2.so /angle/libGLESv2.so.2
+
+rm -rf out
+
+popd
+rm -rf ./depot_tools

.gitlab-ci/container/build-apitrace.sh

@@ -1,9 +1,15 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting
 
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_X86_64_TEST_VK_TAG
+# KERNEL_ROOTFS_TAG
+
 set -ex
 
-APITRACE_VERSION="790380e05854d5c9d315555444ffcc7acb8f4037"
+APITRACE_VERSION="0a6506433e1f9f7b69757b4e5730326970c4321a"
 
 git clone https://github.com/apitrace/apitrace.git --single-branch --no-checkout /apitrace
 pushd /apitrace

.gitlab-ci/container/build-crosvm.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting
 
 set -ex
@@ -6,29 +6,32 @@ set -ex
 git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"
 
-CROSVM_VERSION=00af43e1b565e1ae0047ba84b970da5e089e4f48
+CROSVM_VERSION=d0cbf0b23eb4bd2355b011184025c7c5d8749376
 git clone --single-branch -b main --no-checkout https://chromium.googlesource.com/crosvm/crosvm /platform/crosvm
 pushd /platform/crosvm
 git checkout "$CROSVM_VERSION"
 git submodule update --init
 
-VIRGLRENDERER_VERSION=fc2ad36998f8af8ea3cc68fb9c747dfec9cb4635
+VIRGLRENDERER_VERSION=45bb2449b81336b88c267b1c1735f3b4946c7b3a
 rm -rf third_party/virglrenderer
-git clone --single-branch -b master --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer
+git clone --single-branch -b main --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer
 pushd third_party/virglrenderer
 git checkout "$VIRGLRENDERER_VERSION"
-meson build/ -Drender-server-worker=process -Dvenus-experimental=true $EXTRA_MESON_ARGS
-ninja -C build install
+meson setup build/ -D libdir=lib -D render-server-worker=process -D venus=true $EXTRA_MESON_ARGS
+meson install -C build
 popd
 
+cargo update -p pkg-config@0.3.26 --precise 0.3.27
+
 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
   bindgen-cli \
+  --locked \
   -j ${FDO_CI_CONCURRENT:-4} \
   --root /usr/local \
-  --version 0.63.0 \
+  --version 0.65.1 \
   $EXTRA_CARGO_ARGS
 
-RUSTFLAGS='-L native=/usr/local/lib' cargo install \
+CROSVM_USE_SYSTEM_VIRGLRENDERER=1 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
   -j ${FDO_CI_CONCURRENT:-4} \
   --locked \
   --features 'default-no-sandbox gpu x virgl_renderer virgl_renderer_next' \

.gitlab-ci/container/build-deqp.sh

@@ -1,31 +1,92 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting
 
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_X86_64_TEST_ANDROID_TAG
+# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_X86_64_TEST_VK_TAG
+# KERNEL_ROOTFS_TAG
+
 set -ex
 
 git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"
 git clone \
     https://github.com/KhronosGroup/VK-GL-CTS.git \
-    -b vulkan-cts-1.3.5.0 \
+    -b vulkan-cts-1.3.5.2 \
     --depth 1 \
     /VK-GL-CTS
 pushd /VK-GL-CTS
 
-cts_commits_to_backport=()
+# Patches to VulkanCTS may come from commits in their repo (listed in
+# cts_commits_to_backport) or patch files stored in our repo (in the patch
+# directory `$OLDPWD/.gitlab-ci/container/patches/` listed in cts_patch_files).
+# Both list variables would have comments explaining the reasons behind the
+# patches.
+
+cts_commits_to_backport=(
+        # sync fix for SSBO writes
+        44f1be32fe6bd2a7de7b9169fc71cc44e0b26124
+
+        # sync fix for KHR-GL46.multi_bind.dispatch_bind_image_textures
+        db6c9e295ab38054ace425cb75ff966719ccc609
+
+        # VK robustness barriers fix
+        6052f21c4d6077438d644f525c10cc58dcdf25bf
+
+        # correctness fixes for zink validation fails
+        1923cbc89ed3969a3afe7c6926124b51157902e1
+        af3a979c49dc65f8809c27660405ae3a76c7da4a
+
+        # GL/GLES vertex_attrib_binding.advanced-largeStrideAndOffsetsNewAndLegacyAPI fix
+        bdb456dcf85e34fced872ebdaf06f6b73451f99c
+
+        # KHR-GLES31.core.compute_shader.max fix
+        7aa3ebb49d07982f5c44edd4799edb5a894567e9
+
+        # GL arrays_of_arrays perf fix
+        b481dada59734e8e34050fe884ba6d627d9e5c54
+
+        # GL shadow samplers require depth compares fix
+        a8bc242ec234bf8d7df8b4eec1eeccab4e401288
+
+        # GL PolygonOffsetClamp fix
+        1f2feb2388da88b4e46eba55547d50856467cc20
+
+        # KHR-GL46.texture_view.view_sampling fix
+        aca29fb9553ebe28094513ce18bb46bad138cf46
+
+        # video validation fails
+        4cc3980a86ba5b7fe6e76b559cc1a9cb5fd1b253
+        a7a2ce442db51ca058ce051de7e09d62db44ae81
+
+        # Check for robustness before testing it
+        ee7138d8adf5ed3c4845e5ac2553c4f9697be9d8
+
+        # dEQP-VK.wsi.acquire_drm_display.*invalid_fd
+        98ad9402e7d94030d1689fd59135da7a2f52384c
+)
 
 for commit in "${cts_commits_to_backport[@]}"
 do
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    "https://github.com/KhronosGroup/VK-GL-CTS/commit/$commit.patch" | git am -
+  PATCH_URL="https://github.com/KhronosGroup/VK-GL-CTS/commit/$commit.patch"
+  echo "Apply patch to VK-GL-CTS from $PATCH_URL"
+  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 $PATCH_URL | \
+    git am -
 done
 
-# Fix surfaceless build.
-git am < $OLDPWD/.gitlab-ci/container/0001-Fix-build-for-the-surfaceless-and-null-WS-target-pla.patch
+cts_patch_files=(
+  # Android specific patches.
+  build-deqp_Allow-running-on-Android-from-the-command-line.patch
+  build-deqp_Android-prints-to-stdout-instead-of-logcat.patch
+)
 
-# Android specific patches.
-git am < $OLDPWD/.gitlab-ci/container/0001-Allow-running-on-Android-from-the-command-line.patch
-git am < $OLDPWD/.gitlab-ci/container/0002-Android-prints-to-stdout-instead-of-logcat.patch
+for patch in "${cts_patch_files[@]}"
+do
+  echo "Apply patch to VK-GL-CTS from $patch"
+  git am < $OLDPWD/.gitlab-ci/container/patches/$patch
+done
 
 # --insecure is due to SSL cert failures hitting sourceforge for zlib and
 # libpng (sigh).  The archives get their checksums checked anyway, and git
@@ -48,14 +109,14 @@ if [ "${DEQP_TARGET}" != 'android' ]; then
         -DCMAKE_BUILD_TYPE=Release \
         $EXTRA_CMAKE_ARGS
     ninja modules/egl/deqp-egl
-    cp /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-x11
+    mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-x11
 
     cmake -S /VK-GL-CTS -B . -G Ninja \
         -DDEQP_TARGET=wayland \
         -DCMAKE_BUILD_TYPE=Release \
         $EXTRA_CMAKE_ARGS
     ninja modules/egl/deqp-egl
-    cp /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-wayland
+    mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-wayland
 fi
 
 cmake -S /VK-GL-CTS -B . -G Ninja \
@@ -64,8 +125,8 @@ cmake -S /VK-GL-CTS -B . -G Ninja \
       $EXTRA_CMAKE_ARGS
 ninja
 
-if [ "${DEQP_TARGET}" != 'android' ]; then
-    mv /deqp/modules/egl/deqp-egl-x11 /deqp/modules/egl/deqp-egl
+if [ "${DEQP_TARGET}" = 'android' ]; then
+    mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-android
 fi
 
 # Copy out the mustpass lists we want.

.gitlab-ci/container/build-gfxreconstruct.sh

@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -ex
 
-GFXRECONSTRUCT_VERSION=5ed3caeecc46e976c4df31e263df8451ae176c26
+GFXRECONSTRUCT_VERSION=761837794a1e57f918a85af7000b12e531b178ae
 
 git clone https://github.com/LunarG/gfxreconstruct.git \
     --single-branch \

.gitlab-ci/container/build-libclc.sh

@@ -1,8 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -ex
 
-export LLVM_CONFIG="llvm-config-11"
+export LLVM_CONFIG="llvm-config-${LLVM_VERSION:?"llvm unset!"}"
+LLVM_TAG="llvmorg-15.0.7"
 
 $LLVM_CONFIG --version
 
@@ -11,12 +12,12 @@ git config --global user.name "Mesa CI"
 git clone \
     https://github.com/llvm/llvm-project \
     --depth 1 \
-    -b llvmorg-12.0.0-rc3 \
+    -b "${LLVM_TAG}" \
     /llvm-project
 
 mkdir /libclc
 pushd /libclc
-cmake -S /llvm-project/libclc -B . -G Ninja -DLLVM_CONFIG=$LLVM_CONFIG -DLIBCLC_TARGETS_TO_BUILD="spirv-mesa3d-;spirv64-mesa3d-" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DLLVM_SPIRV=/usr/bin/llvm-spirv
+cmake -S /llvm-project/libclc -B . -G Ninja -DLLVM_CONFIG="$LLVM_CONFIG" -DLIBCLC_TARGETS_TO_BUILD="spirv-mesa3d-;spirv64-mesa3d-" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DLLVM_SPIRV=/usr/bin/llvm-spirv
 ninja
 ninja install
 popd

.gitlab-ci/container/build-libdrm.sh

@@ -1,15 +1,15 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting
 
 set -ex
 
-export LIBDRM_VERSION=libdrm-2.4.110
+export LIBDRM_VERSION=libdrm-2.4.114
 
 curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \
     https://dri.freedesktop.org/libdrm/"$LIBDRM_VERSION".tar.xz
 tar -xvf "$LIBDRM_VERSION".tar.xz && rm "$LIBDRM_VERSION".tar.xz
 cd "$LIBDRM_VERSION"
-meson build -D vc4=false -D freedreno=false -D etnaviv=false $EXTRA_MESON_ARGS
-ninja -C build install
+meson setup build -D vc4=disabled -D freedreno=disabled -D etnaviv=disabled $EXTRA_MESON_ARGS
+meson install -C build
 cd ..
 rm -rf "$LIBDRM_VERSION"

.gitlab-ci/container/build-llvm-spirv.sh

@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -ex
 
-VER="13.0.0"
+VER="${LLVM_VERSION:?llvm not set}.0.0"
 
 curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
     -O "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v${VER}.tar.gz"

.gitlab-ci/container/build-mold.sh

@@ -2,12 +2,14 @@
 
 set -ex
 
-MOLD_VERSION="1.10.0"
+MOLD_VERSION="1.11.0"
 
 git clone -b v"$MOLD_VERSION" --single-branch --depth 1 https://github.com/rui314/mold.git
 pushd mold
+
 cmake -DCMAKE_BUILD_TYPE=Release -D BUILD_TESTING=OFF -D MOLD_LTO=ON
 cmake --build . --parallel
 cmake --install .
+
 popd
 rm -rf mold

.gitlab-ci/container/build-piglit.sh

@@ -3,7 +3,7 @@
 
 set -ex
 
-REV="355ad6bcb2cb3d9e030b7c6eef2b076b0dfb4d63"
+REV="5036601c43fff63f7be5cd8ad7b319a5c1f6652c"
 
 git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
 pushd /piglit

.gitlab-ci/container/build-rust.sh

@@ -11,11 +11,11 @@ set -ex
 mkdir -p "$HOME"/.cargo
 ln -s /usr/local/bin "$HOME"/.cargo/bin
 
-# Rusticl requires at least Rust 1.59.0
+# Rusticl requires at least Rust 1.60.0
 #
-# Also, oick a specific snapshot from rustup so the compiler doesn't drift on
+# Also, pick a specific snapshot from rustup so the compiler doesn't drift on
 # us.
-RUST_VERSION=1.59.0-2022-02-24
+RUST_VERSION=1.60.0-2022-04-07
 
 # For rust in Mesa, we use rustup to install.  This lets us pick an arbitrary
 # version of the compiler, rather than whatever the container's Debian comes
@@ -26,7 +26,7 @@ curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
       --profile minimal \
       -y
 
-rustup component add rustfmt
+rustup component add clippy rustfmt
 
 # Set up a config script for cross compiling -- cargo needs your system cc for
 # linking in cross builds, but doesn't know what you want to use for system cc.

.gitlab-ci/container/build-skqp.sh

@@ -1,27 +1,20 @@
-#!/bin/bash
+#!/usr/bin/env bash
+# SPDX-License-Identifier: MIT
 #
-# Copyright (C) 2022 Collabora Limited
+# Copyright © 2022 Collabora Limited
 # Author: Guilherme Gallo <guilherme.gallo@collabora.com>
 #
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# KERNEL_ROOTFS_TAG
 
+SKQP_BRANCH=android-cts-12.1_r5
+
+# hack for skqp see the clang
+pushd /usr/bin/
+ln -s ../lib/llvm-15/bin/clang clang
+ln -s ../lib/llvm-15/bin/clang++ clang++
+popd
 
 create_gn_args() {
     # gn can be configured to cross-compile skia and its tools
@@ -41,7 +34,6 @@ download_skia_source() {
     # Skia cloned from https://android.googlesource.com/platform/external/skqp
     # has all needed assets tracked on git-fs
     SKQP_REPO=https://android.googlesource.com/platform/external/skqp
-    SKQP_BRANCH=android-cts-11.0_r7
 
     git clone --branch "${SKQP_BRANCH}" --depth 1 "${SKQP_REPO}" "${SKIA_DIR}"
 }

.gitlab-ci/container/build-skqp_base.gn

@@ -1,7 +1,12 @@
 cc = "clang"
 cxx = "clang++"
 
-extra_cflags = [ "-DSK_ENABLE_DUMP_GPU", "-DSK_BUILD_FOR_SKQP" ]
+extra_cflags = [
+        "-Wno-error",
+
+        "-DSK_ENABLE_DUMP_GPU",
+        "-DSK_BUILD_FOR_SKQP"
+    ]
 extra_cflags_cc = [
         "-Wno-error",
 
@@ -22,6 +27,13 @@ extra_cflags_cc = [
         "-Wno-suggest-destructor-override",
         "-Wno-return-std-move-in-c++11",
         "-Wno-extra-semi-stmt",
+        "-Wno-reserved-identifier",
+        "-Wno-bitwise-instead-of-logical",
+        "-Wno-reserved-identifier",
+        "-Wno-psabi",
+        "-Wno-unused-but-set-variable",
+        "-Wno-sizeof-array-div",
+        "-Wno-string-concatenation",
     ]
 
 cc_wrapper = "ccache"

.gitlab-ci/container/build-va-tools.sh

@@ -1,18 +1,25 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# KERNEL_ROOTFS_TAG
 
 set -ex
 
 git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"
+
 git clone \
     https://github.com/intel/libva-utils.git \
-    -b 2.13.0 \
+    -b 2.18.1 \
     --depth 1 \
     /va-utils
 
 pushd /va-utils
-meson build -D tests=true  -Dprefix=/va $EXTRA_MESON_ARGS
-ninja -C build install
+# Too old libva in Debian 11. TODO: when this PR gets in, refer to the patch.
+curl -L https://github.com/intel/libva-utils/pull/329.patch | git am
+
+meson setup build -D tests=true -Dprefix=/va $EXTRA_MESON_ARGS
+meson install -C build
 popd
 rm -rf /va-utils

.gitlab-ci/container/build-vkd3d-proton.sh

@@ -1,8 +1,12 @@
 #!/bin/bash
 
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_X86_64_TEST_VK_TAG
+# KERNEL_ROOTFS_TAG
 set -ex
 
-VKD3D_PROTON_COMMIT="507cb3195bae32395c69763afec2b1ac078d509a"
+VKD3D_PROTON_COMMIT="6365efeba253807beecaed0eaa963295522c6b70"
 
 VKD3D_PROTON_DST_DIR="/vkd3d-proton-tests"
 VKD3D_PROTON_SRC_DIR="/vkd3d-proton-src"

.gitlab-ci/container/build-vulkan-validation.sh

@@ -1,15 +1,18 @@
 #!/usr/bin/env bash
 
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_X86_64_TEST_GL_TAG
+# KERNEL_ROOTFS_TAG:
+
 set -ex
 
-VALIDATION_TAG="v1.3.238"
+VALIDATION_TAG="v1.3.251"
 
 git clone -b "$VALIDATION_TAG" --single-branch --depth 1 https://github.com/KhronosGroup/Vulkan-ValidationLayers.git
 pushd Vulkan-ValidationLayers
-mkdir build
-pushd build
-python3 ../scripts/update_deps.py --dir ../external --arch x64 --config debug
-cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTS=OFF -DBUILD_WERROR=OFF -C ../external/helper.cmake  ..
-ninja install
+python3 scripts/update_deps.py --dir external --config debug
+cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTS=OFF -DBUILD_WERROR=OFF -C external/helper.cmake -S . -B build
+ninja -C build install
 popd
 rm -rf Vulkan-ValidationLayers

.gitlab-ci/container/build-wayland.sh

@@ -1,23 +1,23 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting
 
 set -ex
 
-export LIBWAYLAND_VERSION="1.18.0"
-export WAYLAND_PROTOCOLS_VERSION="1.24"
+export LIBWAYLAND_VERSION="1.21.0"
+export WAYLAND_PROTOCOLS_VERSION="1.31"
 
 git clone https://gitlab.freedesktop.org/wayland/wayland
 cd wayland
 git checkout "$LIBWAYLAND_VERSION"
-meson -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true _build $EXTRA_MESON_ARGS
-ninja -C _build install
+meson setup -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true _build $EXTRA_MESON_ARGS
+meson install -C _build
 cd ..
 rm -rf wayland
 
 git clone https://gitlab.freedesktop.org/wayland/wayland-protocols
 cd wayland-protocols
 git checkout "$WAYLAND_PROTOCOLS_VERSION"
-meson _build $EXTRA_MESON_ARGS
-ninja -C _build install
+meson setup _build $EXTRA_MESON_ARGS
+meson install -C _build
 cd ..
 rm -rf wayland-protocols

.gitlab-ci/container/create-android-cross-file.sh

@@ -22,7 +22,7 @@ cpp = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}${sdk_v
 c_ld = 'lld'
 cpp_ld = 'lld'
 strip = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip'
-pkgconfig = ['/usr/bin/pkg-config']
+pkgconfig = ['/usr/bin/pkgconf']
 
 [host_machine]
 system = 'android'

.gitlab-ci/container/create-cross-file.sh

@@ -47,7 +47,8 @@ if [[ -n "$GCC_ARCH" ]]; then
         echo "set(CMAKE_SYSTEM_PROCESSOR arm)";
         echo "set(CMAKE_C_COMPILER /usr/lib/ccache/$GCC_ARCH-gcc)";
         echo "set(CMAKE_CXX_COMPILER /usr/lib/ccache/$GCC_ARCH-g++)";
-        echo "set(ENV{PKG_CONFIG} \"/usr/bin/$GCC_ARCH-pkg-config\")";
+        echo "set(CMAKE_CXX_FLAGS_INIT \"-Wno-psabi\")";  # makes ABI warnings quiet for ARMv7
+        echo "set(ENV{PKG_CONFIG} \"/usr/bin/$GCC_ARCH-pkgconf\")";
         echo "set(DE_CPU $DE_CPU)";
     } > "$toolchain_file"
 fi

.gitlab-ci/container/create-rootfs.sh

@@ -1,325 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC2140  # ugly array, remove later
-# shellcheck disable=SC2288  # ugly array, remove later
-# shellcheck disable=SC2086 # we want word splitting
-
-set -ex
-
-if [ $DEBIAN_ARCH = arm64 ]; then
-    ARCH_PACKAGES="firmware-qcom-media
-                   firmware-linux-nonfree
-                   libfontconfig1
-                   libgl1
-                   libglu1-mesa
-                   libvulkan-dev
-    "
-elif [ $DEBIAN_ARCH = amd64 ]; then
-    # Add llvm 13 to the build image
-    apt-get -y install --no-install-recommends curl gnupg2 software-properties-common
-    apt-key add /llvm-snapshot.gpg.key
-    add-apt-repository "deb https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-13 main"
-    # Debian bullseye has older wine 5.0, we want >= 7.0 for traces.
-    apt-key add /winehq.gpg.key
-    apt-add-repository https://dl.winehq.org/wine-builds/debian/
-
-
-    ARCH_PACKAGES="firmware-amd-graphics
-                   inetutils-syslogd
-                   iptables
-                   libcap2
-                   libfontconfig1
-                   libelf1
-                   libfdt1
-                   libgl1
-                   libglu1-mesa
-                   libllvm13
-                   libllvm11
-                   libva2
-                   libva-drm2
-                   libvulkan-dev
-                   socat
-                   spirv-tools
-                   sysvinit-core
-                  "
-
-elif [ $DEBIAN_ARCH = armhf ]; then
-    ARCH_PACKAGES="firmware-misc-nonfree
-                  "
-fi
-
-INSTALL_CI_FAIRY_PACKAGES="git
-                           python3-dev
-                           python3-pip
-                           python3-setuptools
-                           python3-wheel
-                           "
-
-apt-get update
-apt-get -y install --no-install-recommends \
-    $ARCH_PACKAGES \
-    $INSTALL_CI_FAIRY_PACKAGES \
-    $EXTRA_LOCAL_PACKAGES \
-    bash \
-    ca-certificates \
-    curl \
-    firmware-realtek \
-    initramfs-tools \
-    jq \
-    libasan6 \
-    libexpat1 \
-    libpng16-16 \
-    libpython3.9 \
-    libsensors5 \
-    libvulkan1 \
-    libwaffle-1-0 \
-    libx11-6 \
-    libx11-xcb1 \
-    libxcb-dri2-0 \
-    libxcb-dri3-0 \
-    libxcb-glx0 \
-    libxcb-present0 \
-    libxcb-randr0 \
-    libxcb-shm0 \
-    libxcb-sync1 \
-    libxcb-xfixes0 \
-    libxdamage1 \
-    libxext6 \
-    libxfixes3 \
-    libxkbcommon0 \
-    libxrender1 \
-    libxshmfence1 \
-    libxxf86vm1 \
-    netcat-openbsd \
-    python3 \
-    python3-lxml \
-    python3-mako \
-    python3-numpy \
-    python3-packaging \
-    python3-pil \
-    python3-renderdoc \
-    python3-requests \
-    python3-simplejson \
-    python3-yaml \
-    sntp \
-    strace \
-    waffle-utils \
-    weston \
-    xinit \
-    xserver-xorg-core \
-    xwayland \
-    zstd
-
-
-if [ "$DEBIAN_ARCH" = "amd64" ]; then
-  # workaround wine needing 32-bit
-  # https://bugs.winehq.org/show_bug.cgi?id=53393
-  apt-get install -y --no-remove wine-stable-amd64  # a requirement for wine-stable
-  WINE_PKG="wine-stable"
-  WINE_PKG_DROP="wine-stable-i386"
-  apt download "${WINE_PKG}"
-  dpkg --ignore-depends="${WINE_PKG_DROP}" -i "${WINE_PKG}"*.deb
-  rm "${WINE_PKG}"*.deb
-  sed -i "/${WINE_PKG_DROP}/d" /var/lib/dpkg/status
-  apt-get install -y --no-remove winehq-stable  # symlinks-only, depends on wine-stable
-fi
-
-# Needed for ci-fairy, this revision is able to upload files to
-# MinIO and doesn't depend on git
-pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
-
-# Needed for manipulation with traces yaml files.
-pip3 install yq
-
-apt-get purge -y \
-        $INSTALL_CI_FAIRY_PACKAGES
-
-passwd root -d
-chsh -s /bin/sh
-
-cat > /init <<EOF
-#!/bin/sh
-export PS1=lava-shell:
-exec sh
-EOF
-chmod +x  /init
-
-#######################################################################
-# Strip the image to a small minimal system without removing the debian
-# toolchain.
-
-# Copy timezone file and remove tzdata package
-rm -rf /etc/localtime
-cp /usr/share/zoneinfo/Etc/UTC /etc/localtime
-
-UNNEEDED_PACKAGES="
-        libfdisk1
-        "
-
-export DEBIAN_FRONTEND=noninteractive
-
-# Removing unused packages
-for PACKAGE in ${UNNEEDED_PACKAGES}
-do
-	echo ${PACKAGE}
-	if ! apt-get remove --purge --yes "${PACKAGE}"
-	then
-		echo "WARNING: ${PACKAGE} isn't installed"
-	fi
-done
-
-apt-get autoremove --yes || true
-
-# Dropping logs
-rm -rf /var/log/*
-
-# Dropping documentation, localization, i18n files, etc
-rm -rf /usr/share/doc/*
-rm -rf /usr/share/locale/*
-rm -rf /usr/share/X11/locale/*
-rm -rf /usr/share/man
-rm -rf /usr/share/i18n/*
-rm -rf /usr/share/info/*
-rm -rf /usr/share/lintian/*
-rm -rf /usr/share/common-licenses/*
-rm -rf /usr/share/mime/*
-
-# Dropping reportbug scripts
-rm -rf /usr/share/bug
-
-# Drop udev hwdb not required on a stripped system
-rm -rf /lib/udev/hwdb.bin /lib/udev/hwdb.d/*
-
-# Drop all gconv conversions && binaries
-rm -rf usr/bin/iconv
-rm -rf usr/sbin/iconvconfig
-rm -rf usr/lib/*/gconv/
-
-# Remove libusb database
-rm -rf usr/sbin/update-usbids
-rm -rf var/lib/usbutils/usb.ids
-rm -rf usr/share/misc/usb.ids
-
-rm -rf /root/.pip
-
-#######################################################################
-# Crush into a minimal production image to be deployed via some type of image
-# updating system.
-# IMPORTANT: The Debian system is not longer functional at this point,
-# for example, apt and dpkg will stop working
-
-UNNEEDED_PACKAGES="apt libapt-pkg6.0 "\
-"ncurses-bin ncurses-base libncursesw6 libncurses6 "\
-"perl-base "\
-"debconf libdebconfclient0 "\
-"e2fsprogs e2fslibs libfdisk1 "\
-"insserv "\
-"udev "\
-"init-system-helpers "\
-"cpio "\
-"passwd "\
-"libsemanage1 libsemanage-common "\
-"libsepol1 "\
-"gpgv "\
-"hostname "\
-"adduser "\
-"debian-archive-keyring "\
-"libegl1-mesa-dev "\
-"libegl-mesa0 "\
-"libgl1-mesa-dev "\
-"libgl1-mesa-dri "\
-"libglapi-mesa "\
-"libgles2-mesa-dev "\
-"libglx-mesa0 "\
-"mesa-common-dev "\
-"gnupg2 "\
-"software-properties-common " \
-
-# Removing unneeded packages
-for PACKAGE in ${UNNEEDED_PACKAGES}
-do
-	echo "Forcing removal of ${PACKAGE}"
-	if ! dpkg --purge --force-remove-essential --force-depends "${PACKAGE}"
-	then
-		echo "WARNING: ${PACKAGE} isn't installed"
-	fi
-done
-
-# Show what's left package-wise before dropping dpkg itself
-COLUMNS=300 dpkg-query -W --showformat='${Installed-Size;10}\t${Package}\n' | sort -k1,1n
-
-# Drop dpkg
-dpkg --purge --force-remove-essential --force-depends  dpkg
-
-# No apt or dpkg, no need for its configuration archives
-rm -rf etc/apt
-rm -rf etc/dpkg
-
-# Drop directories not part of ostree
-# Note that /var needs to exist as ostree bind mounts the deployment /var over
-# it
-rm -rf var/* srv share
-
-# ca-certificates are in /etc drop the source
-rm -rf usr/share/ca-certificates
-
-# No need for completions
-rm -rf usr/share/bash-completion
-
-# No zsh, no need for comletions
-rm -rf usr/share/zsh/vendor-completions
-
-# drop gcc python helpers
-rm -rf usr/share/gcc
-
-# Drop sysvinit leftovers
-rm -rf etc/init.d
-rm -rf etc/rc[0-6S].d
-
-# Drop upstart helpers
-rm -rf etc/init
-
-# Various xtables helpers
-rm -rf usr/lib/xtables
-
-# Drop all locales
-# TODO: only remaining locale is actually "C". Should we really remove it?
-rm -rf usr/lib/locale/*
-
-# partition helpers
-rm -rf usr/sbin/*fdisk
-
-# local compiler
-rm -rf usr/bin/localedef
-
-# Systemd dns resolver
-find usr etc -name '*systemd-resolve*' -prune -exec rm -r {} \;
-
-# Systemd network configuration
-find usr etc -name '*networkd*' -prune -exec rm -r {} \;
-
-# systemd ntp client
-find usr etc -name '*timesyncd*' -prune -exec rm -r {} \;
-
-# systemd hw database manager
-find usr etc -name '*systemd-hwdb*' -prune -exec rm -r {} \;
-
-# No need for fuse
-find usr etc -name '*fuse*' -prune -exec rm -r {} \;
-
-# lsb init function leftovers
-rm -rf usr/lib/lsb
-
-# Only needed when adding libraries
-rm -rf usr/sbin/ldconfig*
-
-# Games, unused
-rmdir usr/games
-
-# Remove pam module to authenticate against a DB
-# plus libdb-5.3.so that is only used by this pam module
-rm -rf usr/lib/*/security/pam_userdb.so
-rm -rf usr/lib/*/libdb-5.3.so
-
-# remove NSS support for nis, nisplus and hesiod
-rm -rf usr/lib/*/libnss_hesiod*
-rm -rf usr/lib/*/libnss_nis*

.gitlab-ci/container/cross_build.sh

@@ -1,10 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting
 
 set -e
 set -o xtrace
 
 export DEBIAN_FRONTEND=noninteractive
+export LLVM_VERSION="${LLVM_VERSION:=15}"
 
 # Ephemeral packages (installed for this script and removed again at the end)
 STABLE_EPHEMERAL=" \
@@ -15,8 +16,10 @@ apt-get update
 
 apt-get install -y --no-remove \
         $STABLE_EPHEMERAL \
-	curl \
         crossbuild-essential-$arch \
+        pkgconf:$arch \
+        libasan8:$arch \
+        libdrm-dev:$arch \
         libelf-dev:$arch \
         libexpat1-dev:$arch \
         libffi-dev:$arch \
@@ -40,27 +43,20 @@ apt-get install -y --no-remove \
         libwayland-dev:$arch
 
 if [[ $arch != "armhf" ]]; then
-    # See the list of available architectures in https://apt.llvm.org/bullseye/dists/llvm-toolchain-bullseye-13/main/
-    if [[ $arch == "s390x" ]] || [[ $arch == "i386" ]] || [[ $arch == "arm64" ]]; then
-        LLVM=13
-    else
-        LLVM=11
-    fi
-
     # We don't need clang-format for the crossbuilds, but the installed amd64
     # package will conflict with libclang. Uninstall clang-format (and its
     # problematic dependency) to fix.
-    apt-get remove -y clang-format-13 libclang-cpp13
+    apt-get remove -y clang-format-${LLVM_VERSION} libclang-cpp${LLVM_VERSION}
 
     # llvm-*-tools:$arch conflicts with python3:amd64. Install dependencies only
     # with apt-get, then force-install llvm-*-{dev,tools}:$arch with dpkg to get
     # around this.
     apt-get install -y --no-remove --no-install-recommends \
-            libclang-cpp${LLVM}:$arch \
+            libclang-cpp${LLVM_VERSION}:$arch \
             libgcc-s1:$arch \
             libtinfo-dev:$arch \
             libz3-dev:$arch \
-            llvm-${LLVM}:$arch \
+            llvm-${LLVM_VERSION}:$arch \
             zlib1g
 fi
 
@@ -83,7 +79,7 @@ apt-get purge -y \
 
 # This needs to be done after container_post_build.sh, or apt-get breaks in there
 if [[ $arch != "armhf" ]]; then
-    apt-get download llvm-${LLVM}-{dev,tools}:$arch
-    dpkg -i --force-depends llvm-${LLVM}-*_${arch}.deb
-    rm llvm-${LLVM}-*_${arch}.deb
+    apt-get download llvm-${LLVM_VERSION}-{dev,tools}:$arch
+    dpkg -i --force-depends llvm-${LLVM_VERSION}-*_${arch}.deb
+    rm llvm-${LLVM_VERSION}-*_${arch}.deb
 fi

.gitlab-ci/container/debian/android_build.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting
 
 set -ex
@@ -32,7 +32,7 @@ sh .gitlab-ci/container/create-android-cross-file.sh /$ndk arm-linux-androideabi
 
 # Not using build-libdrm.sh because we don't want its cleanup after building
 # each arch.  Fetch and extract now.
-export LIBDRM_VERSION=libdrm-2.4.110
+export LIBDRM_VERSION=libdrm-2.4.114
 curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
   -O https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz
 tar -xf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz
@@ -45,18 +45,17 @@ for arch in \
 
     cd $LIBDRM_VERSION
     rm -rf build-$arch
-    meson build-$arch \
+    meson setup build-$arch \
           --cross-file=/cross_file-$arch.txt \
           --libdir=lib/$arch \
-          -Dlibkms=false \
-          -Dnouveau=false \
-          -Dvc4=false \
-          -Detnaviv=false \
-          -Dfreedreno=false \
-          -Dintel=false \
-          -Dcairo-tests=false \
-          -Dvalgrind=false
-    ninja -C build-$arch install
+          -Dnouveau=disabled \
+          -Dvc4=disabled \
+          -Detnaviv=disabled \
+          -Dfreedreno=disabled \
+          -Dintel=disabled \
+          -Dcairo-tests=disabled \
+          -Dvalgrind=disabled
+    meson install -C build-$arch
     cd ..
 done
 

.gitlab-ci/container/debian/arm64_build.sh

@@ -1,12 +1,13 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting
 
 set -e
 set -o xtrace
 
+export LLVM_VERSION="${LLVM_VERSION:=15}"
+
 apt-get -y install ca-certificates
-sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
-echo 'deb https://deb.debian.org/debian buster main' >/etc/apt/sources.list.d/buster.list
+sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list.d/*
 apt-get update
 
 # Ephemeral packages (installed for this script and removed again at
@@ -16,8 +17,9 @@ STABLE_EPHEMERAL=" \
         "
 
 apt-get -y install \
-	${EXTRA_LOCAL_PACKAGES} \
 	${STABLE_EPHEMERAL} \
+	apt-utils \
+	android-libext4-utils \
 	autoconf \
 	automake \
 	bc \
@@ -32,7 +34,7 @@ apt-get -y install \
 	git \
 	glslang-tools \
 	kmod \
-	libasan6 \
+	libasan8 \
 	libdrm-dev \
 	libelf-dev \
 	libexpat1-dev \
@@ -52,9 +54,12 @@ apt-get -y install \
 	libxshmfence-dev \
 	libxxf86vm-dev \
 	libwayland-dev \
-	llvm-11-dev \
+	libwayland-egl-backend-dev \
+	llvm-${LLVM_VERSION}-dev \
 	ninja-build \
-	pkg-config \
+	meson \
+	openssh-server \
+	pkgconf \
 	python3-mako \
 	python3-pil \
 	python3-pip \
@@ -65,14 +70,7 @@ apt-get -y install \
 	zlib1g-dev \
 	zstd
 
-# Not available anymore in bullseye
-apt-get install -y --no-remove -t buster \
-        android-sdk-ext4-utils
-
-pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
-
-# We need at least 0.61.4 for proper Rust; 0.62 for modern meson env2mfile
-pip3 install meson==0.63.3
+pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
 
 arch=armhf
 . .gitlab-ci/container/cross_build.sh
@@ -81,10 +79,6 @@ arch=armhf
 
 . .gitlab-ci/container/build-mold.sh
 
-# dependencies where we want a specific version
-EXTRA_MESON_ARGS=
-. .gitlab-ci/container/build-libdrm.sh
-
 . .gitlab-ci/container/build-wayland.sh
 
 apt-get purge -y $STABLE_EPHEMERAL

.gitlab-ci/container/debian/arm_test.sh

@@ -1,19 +1,24 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # shellcheck disable=SC2154 # arch is assigned in previous scripts
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_BASE_TAG
+# KERNEL_ROOTFS_TAG
 
 set -e
 set -o xtrace
 
 ############### Install packages for baremetal testing
 apt-get install -y ca-certificates
-sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
+sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list.d/*
 apt-get update
 
 apt-get install -y --no-remove \
         cpio \
         curl \
         fastboot \
-        netcat \
+        netcat-openbsd \
+        openssh-server \
         procps \
         python3-distutils \
         python3-minimal \
@@ -29,13 +34,6 @@ curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
 
 . .gitlab-ci/container/baremetal_build.sh
 
-if [[ "$arch" == "arm64" ]]; then
-    # This firmware file from Debian bullseye causes hangs
-    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-      "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/qcom/a530_pfp.fw?id=d5f9eea5a251d43412b07f5295d03e97b89ac4a5" \
-      -o /rootfs-arm64/lib/firmware/qcom/a530_pfp.fw
-fi
-
 mkdir -p /baremetal-files/jetson-nano/boot/
 ln -s \
     /baremetal-files/Image \

.gitlab-ci/container/debian/x86_64_build-base-wine.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 set -o xtrace
@@ -12,5 +12,4 @@ apt-get install -y --no-remove \
       xvfb
 
 # Used to initialize the Wine environment to reduce build time
-wine64 whoami.exe
-
+wine wineboot.exe --init

.gitlab-ci/container/debian/x86_64_build-base.sh

@@ -5,30 +5,25 @@ set -e
 set -o xtrace
 
 export DEBIAN_FRONTEND=noninteractive
+export LLVM_VERSION="${LLVM_VERSION:=15}"
 
-apt-get install -y ca-certificates gnupg2 software-properties-common
-
-# Add llvm 13 to the build image
-apt-key add .gitlab-ci/container/debian/llvm-snapshot.gpg.key
-add-apt-repository "deb https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-13 main"
-
-sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
+apt-get install -y ca-certificates
+sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list.d/*
 
 # Ephemeral packages (installed for this script and removed again at
 # the end)
 STABLE_EPHEMERAL=" \
-        python3-pip \
-        python3-setuptools \
         "
 
 apt-get update
 
 apt-get install -y --no-remove \
         $STABLE_EPHEMERAL \
+        apt-utils \
         bison \
         ccache \
-	curl \
-        clang-format-13 \
+        curl \
+        clang-format-${LLVM_VERSION} \
         dpkg-cross \
         findutils \
         flex \
@@ -38,14 +33,14 @@ apt-get install -y --no-remove \
         git \
         glslang-tools \
         kmod \
-        libclang-13-dev \
-        libclang-11-dev \
+        libclang-${LLVM_VERSION}-dev \
+        libclang-cpp${LLVM_VERSION}-dev \
+        libclang-common-${LLVM_VERSION}-dev \
         libelf-dev \
         libepoxy-dev \
         libexpat1-dev \
         libgtk-3-dev \
-        libllvm13 \
-        libllvm11 \
+        libllvm${LLVM_VERSION} \
         libomxil-bellagio-dev \
         libpciaccess-dev \
         libunwind-dev \
@@ -60,13 +55,18 @@ apt-get install -y --no-remove \
         libxrender-dev \
         libxshmfence-dev \
         libxxf86vm-dev \
+        libwayland-egl-backend-dev \
         make \
+        meson \
         ninja-build \
-        pkg-config \
+        openssh-server \
+        pkgconf \
         python3-mako \
         python3-pil \
+        python3-pip \
         python3-ply \
         python3-requests \
+        python3-setuptools \
         qemu-user \
         valgrind \
         x11proto-dri2-dev \
@@ -74,17 +74,14 @@ apt-get install -y --no-remove \
         x11proto-randr-dev \
         xz-utils \
         zlib1g-dev \
-	zstd
+        zstd
 
-# Needed for ci-fairy, this revision is able to upload files to MinIO
-pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
-
-# We need at least 1.0.0 for proper Rust; 0.62 for modern meson env2mfile
-pip3 install meson==1.0.0
+# Needed for ci-fairy, this revision is able to upload files to S3
+pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
 
 . .gitlab-ci/container/build-rust.sh
 
-. .gitlab-ci/container/debian/x86_build-base-wine.sh
+. .gitlab-ci/container/debian/x86_64_build-base-wine.sh
 
 ############### Uninstall ephemeral packages
 

.gitlab-ci/container/debian/x86_64_build-mingw-source-deps.sh

@@ -64,10 +64,10 @@ ninja install
 popd
 
 # Building LLVM
-git clone -b release/14.x --depth=1 \
+git clone -b release/15.x --depth=1 \
 https://github.com/llvm/llvm-project llvm-project
 
-git clone -b v14.0.0 --depth=1 \
+git clone -b v15.0.0 --depth=1 \
 https://github.com/KhronosGroup/SPIRV-LLVM-Translator llvm-project/llvm/projects/SPIRV-LLVM-Translator
 
 mkdir llvm-project/build

.gitlab-ci/container/debian/x86_64_build-mingw.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 set -o xtrace
@@ -9,5 +9,5 @@ apt-get install -y --no-remove \
         g++-mingw-w64-i686 \
         g++-mingw-w64-x86-64
 
-. .gitlab-ci/container/debian/x86_build-mingw-patch.sh
-. .gitlab-ci/container/debian/x86_build-mingw-source-deps.sh
+. .gitlab-ci/container/debian/x86_64_build-mingw-patch.sh
+. .gitlab-ci/container/debian/x86_64_build-mingw-source-deps.sh

.gitlab-ci/container/debian/x86_64_build.sh

@@ -1,10 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting
 
 set -e
 set -o xtrace
 
 export DEBIAN_FRONTEND=noninteractive
+export LLVM_VERSION="${LLVM_VERSION:=15}"
 
 # Ephemeral packages (installed for this script and removed again at the end)
 STABLE_EPHEMERAL=" \
@@ -21,11 +22,11 @@ apt-get update
 apt-get install -y --no-remove \
       $STABLE_EPHEMERAL \
       check \
-      clang \
-      libasan6 \
+      clang-${LLVM_VERSION} \
+      libasan8 \
       libarchive-dev \
-      libclang-cpp13-dev \
-      libclang-cpp11-dev \
+      libdrm-dev \
+      libclang-cpp${LLVM_VERSION}-dev \
       libgbm-dev \
       libglvnd-dev \
       liblua5.3-dev \
@@ -39,8 +40,7 @@ apt-get install -y --no-remove \
       libxcb-xfixes0-dev \
       libxcb1-dev \
       libxml2-dev \
-      llvm-13-dev \
-      llvm-11-dev \
+      llvm-${LLVM_VERSION}-dev \
       ocl-icd-opencl-dev \
       python3-pip \
       python3-venv \
@@ -72,8 +72,6 @@ rm -rf $XORGMACROS_VERSION
 
 . .gitlab-ci/container/build-libclc.sh
 
-. .gitlab-ci/container/build-libdrm.sh
-
 . .gitlab-ci/container/build-wayland.sh
 
 pushd /usr/local
@@ -83,20 +81,18 @@ cd shader-db
 make
 popd
 
-git clone https://github.com/microsoft/DirectX-Headers -b v1.606.4 --depth 1
-mkdir -p DirectX-Headers/build
-pushd DirectX-Headers/build
-meson .. --backend=ninja --buildtype=release -Dbuild-test=false
-ninja
-ninja install
+git clone https://github.com/microsoft/DirectX-Headers -b v1.711.3-preview --depth 1
+pushd DirectX-Headers
+meson setup build --backend=ninja --buildtype=release -Dbuild-test=false
+meson install -C build
 popd
 rm -rf DirectX-Headers
 
-python3 -m pip install -r .gitlab-ci/lava/requirements.txt
+python3 -m pip install --break-system-packages -r .gitlab-ci/lava/requirements.txt
 
 # install bindgen
 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
-  bindgen --version 0.59.2 \
+  bindgen-cli --version 0.62.0 \
   -j ${FDO_CI_CONCURRENT:-4} \
   --root /usr/local
 

.gitlab-ci/container/debian/x86_64_mingw-toolchain.cmake

@@ -2,7 +2,7 @@ set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSTEM_PROCESSOR x86_64)
 
 set(CMAKE_SYSROOT /usr/x86_64-w64-mingw32/)
-set(ENV{PKG_CONFIG} /usr/x86_64-w64-mingw32/bin/pkg-config)
+set(ENV{PKG_CONFIG} /usr/x86_64-w64-mingw32/bin/pkgconf)
 
 set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc-posix)
 set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++-posix)

.gitlab-ci/container/debian/x86_64_test-base.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting
 
 set -e
@@ -8,7 +8,9 @@ export DEBIAN_FRONTEND=noninteractive
 
 apt-get install -y ca-certificates gnupg2 software-properties-common
 
-sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
+sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list.d/*
+
+export LLVM_VERSION="${LLVM_VERSION:=15}"
 
 # Ephemeral packages (installed for this script and removed again at
 # the end)
@@ -20,13 +22,14 @@ STABLE_EPHEMERAL=" \
       bzip2 \
       ccache \
       cmake \
-      clang-11 \
+      clang-${LLVM_VERSION} \
       flex \
       glslang-tools \
       g++ \
       libasound2-dev \
       libcap-dev \
-      libclang-cpp11-dev \
+      libclang-cpp${LLVM_VERSION}-dev \
+      libdrm-dev \
       libegl-dev \
       libelf-dev \
       libepoxy-dev \
@@ -36,12 +39,12 @@ STABLE_EPHEMERAL=" \
       libwayland-dev \
       libx11-xcb-dev \
       libxext-dev \
-      llvm-13-dev \
-      llvm-11-dev \
+      llvm-${LLVM_VERSION}-dev \
       make \
       meson \
+      openssh-server \
       patch \
-      pkg-config \
+      pkgconf \
       protobuf-compiler \
       python3-dev \
       python3-pip \
@@ -52,30 +55,27 @@ STABLE_EPHEMERAL=" \
       xz-utils \
       "
 
-# Add llvm 13 to the build image
-apt-key add .gitlab-ci/container/debian/llvm-snapshot.gpg.key
-add-apt-repository "deb https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-13 main"
-
 apt-get update
 apt-get dist-upgrade -y
 
-apt-get install -y \
-      sysvinit-core
+apt-get install --purge -y \
+      sysvinit-core libelogind0
 
 apt-get install -y --no-remove \
+      apt-utils \
       curl \
       git \
       git-lfs \
       inetutils-syslogd \
       iptables \
       jq \
-      libasan6 \
+      libasan8 \
+      libdrm2 \
       libexpat1 \
-      libllvm13 \
-      libllvm11 \
+      libllvm${LLVM_VERSION} \
       liblz4-1 \
       libpng16-16 \
-      libpython3.9 \
+      libpython3.11 \
       libvulkan1 \
       libwayland-client0 \
       libwayland-server0 \
@@ -118,13 +118,10 @@ mkdir -p /lava-files/
 
 # Needed for ci-fairy, this revision is able to upload files to MinIO
 # and doesn't depend on git
-pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
+pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
 
 # Needed for manipulation with traces yaml files.
-pip3 install yq
-
-# Needed for crosvm compilation.
-update-alternatives --install /usr/bin/clang clang /usr/bin/clang-11 100
+pip3 install --break-system-packages yq
 
 ############### Build LLVM-SPIRV translator
 
@@ -134,10 +131,6 @@ update-alternatives --install /usr/bin/clang clang /usr/bin/clang-11 100
 
 . .gitlab-ci/container/build-libclc.sh
 
-############### Build libdrm
-
-. .gitlab-ci/container/build-libdrm.sh
-
 ############### Build Wayland
 
 . .gitlab-ci/container/build-wayland.sh

.gitlab-ci/container/debian/x86_64_test-gl.sh

@@ -1,24 +1,26 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting
 
 set -e
 set -o xtrace
 
 export DEBIAN_FRONTEND=noninteractive
+export LLVM_VERSION="${LLVM_VERSION:=15}"
+
+apt-get install -y libelogind0  # this interfere with systemd deps, install separately
 
 # Ephemeral packages (installed for this script and removed again at the end)
 STABLE_EPHEMERAL=" \
       bzip2 \
       ccache \
-      clang-13 \
-      clang-11 \
+      clang-${LLVM_VERSION} \
       cmake \
       g++ \
       glslang-tools \
       libasound2-dev \
       libcap-dev \
-      libclang-cpp13-dev \
-      libclang-cpp11-dev \
+      libclang-cpp${LLVM_VERSION}-dev \
+      libdrm-dev \
       libgles2-mesa-dev \
       libpciaccess-dev \
       libpng-dev \
@@ -31,13 +33,12 @@ STABLE_EPHEMERAL=" \
       libxkbcommon-dev \
       libxrandr-dev \
       libxrender-dev \
-      llvm-13-dev \
-      llvm-11-dev \
+      llvm-${LLVM_VERSION}-dev \
       make \
       meson \
       ocl-icd-opencl-dev \
       patch \
-      pkg-config \
+      pkgconf \
       python3-distutils \
       xz-utils \
       "
@@ -48,10 +49,8 @@ apt-get install -y --no-remove \
       $STABLE_EPHEMERAL \
       clinfo \
       iptables \
-      libclang-common-13-dev \
-      libclang-common-11-dev \
-      libclang-cpp13 \
-      libclang-cpp11 \
+      libclang-common-${LLVM_VERSION}-dev \
+      libclang-cpp${LLVM_VERSION} \
       libcap2 \
       libegl1 \
       libepoxy0 \
@@ -62,6 +61,7 @@ apt-get install -y --no-remove \
       python3-renderdoc \
       python3-simplejson \
       spirv-tools \
+      sysvinit-core \
       weston
 
 

.gitlab-ci/container/debian/x86_64_test-vk.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # The relative paths in this file only become valid at runtime.
 # shellcheck disable=SC1091
 # shellcheck disable=SC2086 # we want word splitting
@@ -8,6 +8,8 @@ set -o xtrace
 
 export DEBIAN_FRONTEND=noninteractive
 
+apt-get install -y libelogind0  # this interfere with systemd deps, install separately
+
 # Ephemeral packages (installed for this script and removed again at the end)
 STABLE_EPHEMERAL=" \
       ccache \
@@ -18,6 +20,7 @@ STABLE_EPHEMERAL=" \
       glslang-tools \
       libexpat1-dev \
       gnupg2 \
+      libdrm-dev \
       libgbm-dev \
       libgles2-mesa-dev \
       liblz4-dev \
@@ -38,7 +41,7 @@ STABLE_EPHEMERAL=" \
       mingw-w64-x86-64-dev \
       p7zip \
       patch \
-      pkg-config \
+      pkgconf \
       python3-dev \
       python3-distutils \
       python3-pip \
@@ -57,26 +60,17 @@ apt-get install -y --no-remove --no-install-recommends \
       pciutils \
       python3-lxml \
       python3-simplejson \
+      sysvinit-core \
+      weston \
+      xwayland \
+      wine \
+      wine64 \
       xinit \
       xserver-xorg-video-amdgpu \
       xserver-xorg-video-ati
 
-# Install a more recent version of Wine than exists in Debian.
-apt-key add .gitlab-ci/container/debian/winehq.gpg.key
-apt-add-repository https://dl.winehq.org/wine-builds/debian/
 apt-get update -q
 
-# workaround wine needing 32-bit
-# https://bugs.winehq.org/show_bug.cgi?id=53393
-apt-get install -y --no-remove wine-stable-amd64  # a requirement for wine-stable
-WINE_PKG="wine-stable"
-WINE_PKG_DROP="wine-stable-i386"
-apt-get download "${WINE_PKG}"
-dpkg --ignore-depends="${WINE_PKG_DROP}" -i "${WINE_PKG}"*.deb
-rm "${WINE_PKG}"*.deb
-sed -i "/${WINE_PKG_DROP}/d" /var/lib/dpkg/status
-apt-get install -y --no-remove winehq-stable  # symlinks-only, depends on wine-stable
-
 ############### Install DXVK
 
 . .gitlab-ci/container/setup-wine.sh "/dxvk-wine64"
@@ -86,7 +80,7 @@ apt-get install -y --no-remove winehq-stable  # symlinks-only, depends on wine-s
 
 . .gitlab-ci/container/install-wine-apitrace.sh
 # Add the apitrace path to the registry
-wine64 \
+wine \
     reg add "HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment" \
     /v Path \
     /t REG_EXPAND_SZ \
@@ -135,3 +129,5 @@ apt-get purge -y \
       $STABLE_EPHEMERAL
 
 apt-get autoremove -y --purge
+
+#dpkg -r --force-depends "mesa-vulkan-drivers" "mesa-vdpau-drivers" "mesa-va-drivers" "libgl1-mesa-dri" "libglx-mesa0" "vdpau-driver-all" "va-driver-all" "libglx0" "libgl1" "libvdpau-va-gl1" "libglu1-mesa" "libegl-mesa0" "libgl1-mesa-dri" "libglapi-mesa" "libosmesa6"

.gitlab-ci/container/fedora/x86_64_build.sh

@@ -0,0 +1,111 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC1091
+set -e
+set -o xtrace
+
+
+EPHEMERAL=(
+        autoconf
+        automake
+        bzip2
+        cmake
+        git
+        libtool
+        "pkgconfig(epoxy)"
+        "pkgconfig(gbm)"
+        "pkgconfig(openssl)"
+        unzip
+        xz
+)
+
+DEPS=(
+    bindgen
+    bison
+    ccache
+    clang-devel
+    flex
+    gcc
+    gcc-c++
+    gettext
+    glslang
+    kernel-headers
+    llvm-devel
+    meson
+    "pkgconfig(LLVMSPIRVLib)"
+    "pkgconfig(SPIRV-Tools)"
+    "pkgconfig(dri2proto)"
+    "pkgconfig(expat)"
+    "pkgconfig(glproto)"
+    "pkgconfig(libclc)"
+    "pkgconfig(libelf)"
+    "pkgconfig(libglvnd)"
+    "pkgconfig(libomxil-bellagio)"
+    "pkgconfig(libselinux)"
+    "pkgconfig(libva)"
+    "pkgconfig(pciaccess)"
+    "pkgconfig(vdpau)"
+    "pkgconfig(vulkan)"
+    "pkgconfig(x11)"
+    "pkgconfig(x11-xcb)"
+    "pkgconfig(xcb)"
+    "pkgconfig(xcb-dri2)"
+    "pkgconfig(xcb-dri3)"
+    "pkgconfig(xcb-glx)"
+    "pkgconfig(xcb-present)"
+    "pkgconfig(xcb-randr)"
+    "pkgconfig(xcb-sync)"
+    "pkgconfig(xcb-xfixes)"
+    "pkgconfig(xdamage)"
+    "pkgconfig(xext)"
+    "pkgconfig(xfixes)"
+    "pkgconfig(xrandr)"
+    "pkgconfig(xshmfence)"
+    "pkgconfig(xxf86vm)"
+    "pkgconfig(zlib)"
+    procps-ng
+    python-unversioned-command
+    python3-devel
+    python3-mako
+    python3-ply
+    rust-packaging
+    vulkan-headers
+    spirv-tools-devel
+    spirv-llvm-translator-devel
+)
+
+dnf install -y --setopt=install_weak_deps=False "${DEPS[@]}" "${EPHEMERAL[@]}"
+
+
+. .gitlab-ci/container/container_pre_build.sh
+
+
+# dependencies where we want a specific version
+export              XORG_RELEASES=https://xorg.freedesktop.org/releases/individual
+
+export         XORGMACROS_VERSION=util-macros-1.19.0
+
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+    -O $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
+tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
+cd $XORGMACROS_VERSION; ./configure; make install; cd ..
+rm -rf $XORGMACROS_VERSION
+
+. .gitlab-ci/container/build-mold.sh
+
+. .gitlab-ci/container/build-libdrm.sh
+
+. .gitlab-ci/container/build-wayland.sh
+
+pushd /usr/local
+git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
+rm -rf shader-db/.git
+cd shader-db
+make
+popd
+
+
+############### Uninstall the build software
+
+dnf remove -y "${EPHEMERAL[@]}"
+
+. .gitlab-ci/container/container_post_build.sh

.gitlab-ci/container/fedora/x86_build.sh

@@ -1,105 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC2086 # we want word splitting
-
-set -e
-set -o xtrace
-
-
-EPHEMERAL="
-        autoconf
-        automake
-        bzip2
-        cmake
-        git
-        libtool
-        pkgconfig(epoxy)
-        pkgconfig(gbm)
-        pkgconfig(openssl)
-        unzip
-        xz
-        "
-
-dnf install -y --setopt=install_weak_deps=False \
-    bison \
-    clang-devel \
-    flex \
-    gcc \
-    gcc-c++ \
-    gettext \
-    glslang \
-    kernel-headers \
-    llvm-devel \
-    meson \
-    "pkgconfig(dri2proto)" \
-    "pkgconfig(expat)" \
-    "pkgconfig(glproto)" \
-    "pkgconfig(libclc)" \
-    "pkgconfig(libelf)" \
-    "pkgconfig(libglvnd)" \
-    "pkgconfig(libomxil-bellagio)" \
-    "pkgconfig(libselinux)" \
-    "pkgconfig(libva)" \
-    "pkgconfig(pciaccess)" \
-    "pkgconfig(vdpau)" \
-    "pkgconfig(vulkan)" \
-    "pkgconfig(x11)" \
-    "pkgconfig(x11-xcb)" \
-    "pkgconfig(xcb)" \
-    "pkgconfig(xcb-dri2)" \
-    "pkgconfig(xcb-dri3)" \
-    "pkgconfig(xcb-glx)" \
-    "pkgconfig(xcb-present)" \
-    "pkgconfig(xcb-randr)" \
-    "pkgconfig(xcb-sync)" \
-    "pkgconfig(xcb-xfixes)" \
-    "pkgconfig(xdamage)" \
-    "pkgconfig(xext)" \
-    "pkgconfig(xfixes)" \
-    "pkgconfig(xrandr)" \
-    "pkgconfig(xshmfence)" \
-    "pkgconfig(xxf86vm)" \
-    "pkgconfig(zlib)" \
-    procps-ng \
-    python-unversioned-command \
-    python3-devel \
-    python3-mako \
-    python3-ply \
-    vulkan-headers \
-    spirv-tools-devel \
-    spirv-llvm-translator-devel \
-    $EPHEMERAL
-
-
-. .gitlab-ci/container/container_pre_build.sh
-
-
-# dependencies where we want a specific version
-export              XORG_RELEASES=https://xorg.freedesktop.org/releases/individual
-
-export         XORGMACROS_VERSION=util-macros-1.19.0
-
-curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    -O $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
-tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
-cd $XORGMACROS_VERSION; ./configure; make install; cd ..
-rm -rf $XORGMACROS_VERSION
-
-. .gitlab-ci/container/build-mold.sh
-
-. .gitlab-ci/container/build-libdrm.sh
-
-. .gitlab-ci/container/build-wayland.sh
-
-pushd /usr/local
-git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
-rm -rf shader-db/.git
-cd shader-db
-make
-popd
-
-
-############### Uninstall the build software
-
-dnf remove -y $EPHEMERAL
-
-. .gitlab-ci/container/container_post_build.sh

.gitlab-ci/container/gitlab-ci.yml

@@ -51,7 +51,7 @@
     - .incorporate-templates-commit
     - .use-wine
   variables:
-    FDO_DISTRIBUTION_VERSION: bullseye-slim
+    FDO_DISTRIBUTION_VERSION: bookworm-slim
     FDO_REPO_SUFFIX: $CI_JOB_NAME
     FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
     # no need to pull the whole repo to build the container image
@@ -64,80 +64,81 @@
     # Don't want the .container rules
     - .build-rules
 
-# Debian 11 based x86 build image base
-debian/x86_build-base:
+# Debian based x86_64 build image base
+debian/x86_64_build-base:
   extends:
     - .fdo.container-build@debian
     - .container
   variables:
-    MESA_IMAGE_TAG: &debian-x86_build-base ${DEBIAN_BASE_TAG}
+    MESA_IMAGE_TAG: &debian-x86_64_build-base ${DEBIAN_BASE_TAG}
 
-.use-debian/x86_build-base:
+.use-debian/x86_64_build-base:
   extends:
     - .fdo.container-build@debian
     - .use-base-image
   variables:
-    MESA_BASE_IMAGE: ${DEBIAN_X86_BUILD_BASE_IMAGE}
-    MESA_BASE_TAG: *debian-x86_build-base
-    MESA_ARTIFACTS_BASE_TAG: *debian-x86_build-base
+    MESA_BASE_IMAGE: ${DEBIAN_X86_64_BUILD_BASE_IMAGE}
+    MESA_BASE_TAG: *debian-x86_64_build-base
+    MESA_ARTIFACTS_BASE_TAG: *debian-x86_64_build-base
   needs:
-    - debian/x86_build-base
+    - debian/x86_64_build-base
 
-# Debian 11 based x86 main build image
-debian/x86_build:
+# Debian based x86_64 main build image
+debian/x86_64_build:
   extends:
-    - .use-debian/x86_build-base
+    - .use-debian/x86_64_build-base
   variables:
-    MESA_IMAGE_TAG: &debian-x86_build ${DEBIAN_BUILD_TAG}
+    MESA_IMAGE_TAG: &debian-x86_64_build ${DEBIAN_BUILD_TAG}
 
-.use-debian/x86_build:
+.use-debian/x86_64_build:
   extends:
     - .set-image-base-tag
   variables:
-    MESA_BASE_TAG: *debian-x86_build-base
-    MESA_IMAGE_PATH: ${DEBIAN_X86_BUILD_IMAGE_PATH}
-    MESA_IMAGE_TAG: *debian-x86_build
+    MESA_BASE_TAG: *debian-x86_64_build-base
+    MESA_IMAGE_PATH: ${DEBIAN_X86_64_BUILD_IMAGE_PATH}
+    MESA_IMAGE_TAG: *debian-x86_64_build
   needs:
-    - debian/x86_build
+    - debian/x86_64_build
 
-# Debian 11 based i386 cross-build image
-debian/i386_build:
+# Debian based x86_32 cross-build image
+debian/x86_32_build:
   extends:
-    - .use-debian/x86_build-base
+    - .use-debian/x86_64_build-base
   variables:
-    MESA_IMAGE_TAG: &debian-i386_build ${DEBIAN_BUILD_TAG}
+    MESA_IMAGE_TAG: &debian-x86_32_build ${DEBIAN_BUILD_TAG}
 
-.use-debian/i386_build:
+.use-debian/x86_32_build:
   extends:
     - .set-image-base-tag
   variables:
-    MESA_BASE_TAG: *debian-x86_build-base
-    MESA_IMAGE_PATH: "debian/i386_build"
-    MESA_IMAGE_TAG: *debian-i386_build
+    MESA_BASE_TAG: *debian-x86_64_build-base
+    MESA_IMAGE_PATH: "debian/x86_32_build"
+    MESA_IMAGE_TAG: *debian-x86_32_build
   needs:
-    - debian/i386_build
+    - debian/x86_32_build
 
-# Debian 11 based x86-mingw cross main build image
-debian/x86_build-mingw:
+# Debian based x86_64-mingw cross main build image
+# FIXME: Until gets fixed on Debian 12, disabled.
+.debian/x86_64_build-mingw:
   extends:
-    - .use-debian/x86_build-base
+    - .use-debian/x86_64_build-base
   variables:
-    MESA_IMAGE_TAG: &debian-x86_build_mingw ${DEBIAN_BUILD_MINGW_TAG}
+    MESA_IMAGE_TAG: &debian-x86_64_build_mingw ${DEBIAN_BUILD_MINGW_TAG}
 
-.use-debian/x86_build_mingw:
+.use-debian/x86_64_build_mingw:
   extends:
     - .set-image-base-tag
   variables:
-    MESA_BASE_TAG: *debian-x86_build-base
-    MESA_IMAGE_PATH: ${DEBIAN_X86_BUILD_MINGW_IMAGE_PATH}
-    MESA_IMAGE_TAG: *debian-x86_build_mingw
+    MESA_BASE_TAG: *debian-x86_64_build-base
+    MESA_IMAGE_PATH: ${DEBIAN_X86_64_BUILD_MINGW_IMAGE_PATH}
+    MESA_IMAGE_TAG: *debian-x86_64_build_mingw
   needs:
-    - debian/x86_build-mingw
+    - .debian/x86_64_build-mingw
 
-# Debian 11 based ppc64el cross-build image
+# Debian based ppc64el cross-build image
 debian/ppc64el_build:
   extends:
-    - .use-debian/x86_build-base
+    - .use-debian/x86_64_build-base
   variables:
     MESA_IMAGE_TAG: &debian-ppc64el_build ${DEBIAN_BUILD_TAG}
 
@@ -145,16 +146,16 @@ debian/ppc64el_build:
   extends:
     - .set-image-base-tag
   variables:
-    MESA_BASE_TAG: *debian-x86_build-base
+    MESA_BASE_TAG: *debian-x86_64_build-base
     MESA_IMAGE_PATH: "debian/ppc64el_build"
     MESA_IMAGE_TAG: *debian-ppc64el_build
   needs:
     - debian/ppc64el_build
 
-# Debian 11 based s390x cross-build image
+# Debian based s390x cross-build image
 debian/s390x_build:
   extends:
-    - .use-debian/x86_build-base
+    - .use-debian/x86_64_build-base
   variables:
     MESA_IMAGE_TAG: &debian-s390x_build ${DEBIAN_BUILD_TAG}
 
@@ -162,7 +163,7 @@ debian/s390x_build:
   extends:
     - .set-image-base-tag
   variables:
-    MESA_BASE_TAG: *debian-x86_build-base
+    MESA_BASE_TAG: *debian-x86_64_build-base
     MESA_IMAGE_PATH: "debian/s390x_build"
     MESA_IMAGE_TAG: *debian-s390x_build
   needs:
@@ -171,7 +172,7 @@ debian/s390x_build:
 # Android NDK cross-build image
 debian/android_build:
   extends:
-    - .use-debian/x86_build-base
+    - .use-debian/x86_64_build-base
   variables:
     MESA_IMAGE_TAG: &debian-android_build ${DEBIAN_BUILD_TAG}
     ANDROID_SDK_VERSION: 33
@@ -181,134 +182,147 @@ debian/android_build:
   extends:
     - .set-image-base-tag
   variables:
-    MESA_BASE_TAG: *debian-x86_build-base
+    MESA_BASE_TAG: *debian-x86_64_build-base
     MESA_IMAGE_PATH: "debian/android_build"
     MESA_IMAGE_TAG: *debian-android_build
   needs:
     - debian/android_build
 
-# Debian 11 based x86 test image base
-debian/x86_test-base:
-  extends: debian/x86_build-base
+# Debian based x86_64 test image base
+debian/x86_64_test-base:
+  extends: debian/x86_64_build-base
   variables:
-    KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v6.1-for-mesa-ci-439f86d0051b/linux-v6.1-for-mesa-ci-439f86d0051b.tar.bz2"
-    MESA_IMAGE_TAG: &debian-x86_test-base ${DEBIAN_BASE_TAG}
+    KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v6.3-for-mesa-ci-43c973a8ff91/linux-v6.3-for-mesa-ci-6fc749a2a59a.tar.bz2"
+    MESA_IMAGE_TAG: &debian-x86_64_test-base ${DEBIAN_BASE_TAG}
 
-.use-debian/x86_test-base:
+.use-debian/x86_64_test-base:
   extends:
     - .fdo.container-build@debian
     - .use-base-image
   variables:
-    MESA_BASE_IMAGE: ${DEBIAN_X86_TEST_BASE_IMAGE}
-    MESA_BASE_TAG: *debian-x86_test-base
+    MESA_BASE_IMAGE: ${DEBIAN_X86_64_TEST_BASE_IMAGE}
+    MESA_BASE_TAG: *debian-x86_64_test-base
   needs:
-    - debian/x86_test-base
+    - debian/x86_64_test-base
 
-# Debian 11 based x86 test image for GL
-debian/x86_test-gl:
-  extends: .use-debian/x86_test-base
+# Debian based x86_64 test image for GL
+debian/x86_64_test-gl:
+  extends: .use-debian/x86_64_test-base
   variables:
-    MESA_IMAGE_TAG: &debian-x86_test-gl ${DEBIAN_X86_TEST_GL_TAG}
+    MESA_IMAGE_TAG: &debian-x86_64_test-gl ${DEBIAN_X86_64_TEST_GL_TAG}
 
-.use-debian/x86_test-gl:
+.use-debian/x86_64_test-gl:
   extends:
     - .set-image-base-tag
   variables:
-    MESA_BASE_TAG: *debian-x86_test-base
-    MESA_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_GL_PATH}
-    MESA_IMAGE_TAG: *debian-x86_test-gl
+    MESA_BASE_TAG: *debian-x86_64_test-base
+    MESA_IMAGE_PATH: ${DEBIAN_X86_64_TEST_IMAGE_GL_PATH}
+    MESA_IMAGE_TAG: *debian-x86_64_test-gl
   needs:
-    - debian/x86_test-gl
+    - debian/x86_64_test-gl
 
-# Debian 11 based x86 test image for VK
-debian/x86_test-vk:
-  extends: .use-debian/x86_test-base
+# Debian based x86_64 test image for VK
+debian/x86_64_test-vk:
+  extends: .use-debian/x86_64_test-base
   variables:
-    MESA_IMAGE_TAG: &debian-x86_test-vk ${DEBIAN_X86_TEST_VK_TAG}
+    MESA_IMAGE_TAG: &debian-x86_64_test-vk ${DEBIAN_X86_64_TEST_VK_TAG}
 
-.use-debian/x86_test-vk:
+.use-debian/x86_64_test-vk:
   extends:
     - .set-image-base-tag
   variables:
-    MESA_BASE_TAG: *debian-x86_test-base
-    MESA_IMAGE_PATH: ${DEBIAN_X86_TEST_IMAGE_VK_PATH}
-    MESA_IMAGE_TAG: *debian-x86_test-vk
+    MESA_BASE_TAG: *debian-x86_64_test-base
+    MESA_IMAGE_PATH: ${DEBIAN_X86_64_TEST_IMAGE_VK_PATH}
+    MESA_IMAGE_TAG: *debian-x86_64_test-vk
   needs:
-    - debian/x86_test-vk
+    - debian/x86_64_test-vk
 
-# Debian 11 based x86 test image for Android
-debian/x86_test-android:
-  extends: .use-debian/x86_test-base
+# Debian based x86_64 test image for Android
+debian/x86_64_test-android:
+  extends: .use-debian/x86_64_test-base
   variables:
-    MESA_IMAGE_TAG: &debian-x86_test-android ${DEBIAN_X86_TEST_ANDROID_TAG}
+    MESA_IMAGE_TAG: &debian-x86_64_test-android ${DEBIAN_X86_64_TEST_ANDROID_TAG}
     ANDROID_NDK: android-ndk-r25b
 
-.use-debian/x86_test-android:
+.use-debian/x86_64_test-android:
   extends:
     - .set-image-base-tag
   variables:
-    MESA_BASE_TAG: *debian-x86_test-base
-    MESA_IMAGE_PATH: ${DEBIAN_X86_TEST_ANDROID_IMAGE_PATH}
-    MESA_IMAGE_TAG: *debian-x86_test-android
+    MESA_BASE_TAG: *debian-x86_64_test-base
+    MESA_IMAGE_PATH: ${DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH}
+    MESA_IMAGE_TAG: *debian-x86_64_test-android
   needs:
-    - debian/x86_test-android
+    - debian/x86_64_test-android
 
-# Debian 11 based ARM build image
-debian/arm_build:
+# Debian based ARM build image
+debian/arm64_build:
   extends:
     - .fdo.container-build@debian
     - .container
   tags:
     - aarch64
   variables:
-    MESA_IMAGE_TAG: &debian-arm_build ${DEBIAN_BASE_TAG}
+    MESA_IMAGE_TAG: &debian-arm64_build ${DEBIAN_BASE_TAG}
 
-.use-debian/arm_build:
+.use-debian/arm64_build:
   extends:
     - .set-image
   variables:
-    MESA_IMAGE_PATH: "debian/arm_build"
-    MESA_IMAGE_TAG: *debian-arm_build
-    MESA_ARTIFACTS_TAG: *debian-arm_build
+    MESA_IMAGE_PATH: "debian/arm64_build"
+    MESA_IMAGE_TAG: *debian-arm64_build
+    MESA_ARTIFACTS_TAG: *debian-arm64_build
   needs:
-    - debian/arm_build
+    - debian/arm64_build
 
 
-# Alpine based x86 build image
-alpine/x86_build:
+# Alpine based x86_64 build image
+.alpine/x86_64_build-base:
   extends:
     - .fdo.container-build@alpine
     - .container
   variables:
-    FDO_DISTRIBUTION_VERSION: "3.17"
-    MESA_IMAGE_TAG: &alpine-x86_build ${ALPINE_X86_BUILD_TAG}
+    FDO_DISTRIBUTION_VERSION: "3.18"
 
-.use-alpine/x86_build:
+# Alpine based x86_64 build image
+alpine/x86_64_build:
+  extends:
+    - .alpine/x86_64_build-base
+  variables:
+    MESA_IMAGE_TAG: &alpine-x86_64_build ${ALPINE_X86_64_BUILD_TAG}
+
+.use-alpine/x86_64_build:
   extends:
     - .set-image
   variables:
-    MESA_IMAGE_PATH: "alpine/x86_build"
-    MESA_IMAGE_TAG: *alpine-x86_build
+    MESA_IMAGE_PATH: "alpine/x86_64_build"
+    MESA_IMAGE_TAG: *alpine-x86_64_build
   needs:
-    - alpine/x86_build
+    - alpine/x86_64_build
 
-# Fedora 36 based x86 build image
-fedora/x86_build:
+# Alpine based x86_64 image for LAVA SSH dockerized client
+alpine/x86_64_lava_ssh_client:
+  extends:
+    - .alpine/x86_64_build-base
+  variables:
+    MESA_IMAGE_TAG: &alpine-x86_64_lava_ssh_client ${ALPINE_X86_64_LAVA_SSH_TAG}
+
+# Fedora based x86_64 build image
+fedora/x86_64_build:
   extends:
     - .fdo.container-build@fedora
     - .container
   variables:
-    FDO_DISTRIBUTION_VERSION: 36
-    MESA_IMAGE_TAG: &fedora-x86_build ${FEDORA_X86_BUILD_TAG}
+    FDO_DISTRIBUTION_VERSION: 38
+    MESA_IMAGE_TAG: &fedora-x86_64_build ${FEDORA_X86_64_BUILD_TAG}
 
-.use-fedora/x86_build:
+.use-fedora/x86_64_build:
   extends:
     - .set-image
   variables:
-    MESA_IMAGE_PATH: "fedora/x86_build"
-    MESA_IMAGE_TAG: *fedora-x86_build
+    MESA_IMAGE_PATH: "fedora/x86_64_build"
+    MESA_IMAGE_TAG: *fedora-x86_64_build
   needs:
-    - fedora/x86_build
+    - fedora/x86_64_build
 
 
 .kernel+rootfs:
@@ -323,25 +337,25 @@ fedora/x86_build:
   script:
     - .gitlab-ci/container/lava_build.sh
 
-kernel+rootfs_amd64:
+kernel+rootfs_x86_64:
   extends:
-    - .use-debian/x86_build-base
+    - .use-debian/x86_64_build-base
     - .kernel+rootfs
   image: "$FDO_BASE_IMAGE"
   variables:
     DEBIAN_ARCH: "amd64"
-    DISTRIBUTION_TAG: &distribution-tag-amd64 "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_BASE_TAG}--${MESA_TEMPLATES_COMMIT}"
+    DISTRIBUTION_TAG: &distribution-tag-x86_64 "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_BASE_TAG}--${MESA_TEMPLATES_COMMIT}"
 
 kernel+rootfs_arm64:
   extends:
-    - .use-debian/arm_build
+    - .use-debian/arm64_build
     - .kernel+rootfs
   tags:
     - aarch64
   variables:
     DEBIAN_ARCH: "arm64"
 
-kernel+rootfs_armhf:
+kernel+rootfs_arm32:
   extends:
     - kernel+rootfs_arm64
   variables:
@@ -353,12 +367,12 @@ kernel+rootfs_armhf:
     DISTRIBUTION_TAG: *distribution-tag-arm
     MESA_ROOTFS_TAG: *kernel-rootfs
 
-.use-kernel+rootfs-amd64:
+.use-kernel+rootfs-x86_64:
   variables:
-    DISTRIBUTION_TAG: *distribution-tag-amd64
+    DISTRIBUTION_TAG: *distribution-tag-x86_64
     MESA_ROOTFS_TAG: *kernel-rootfs
 
-# x86 image with ARM64 & armhf kernel & rootfs for baremetal testing
+# x86_64 image with ARM64 & ARM32 kernel & rootfs for baremetal testing
 .debian/arm_test:
   extends:
     - .fdo.container-build@debian
@@ -367,18 +381,18 @@ kernel+rootfs_armhf:
     - .build-rules
   variables:
     FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_TEMPLATES_COMMIT}"
-    ARTIFACTS_PREFIX: "https://${MINIO_HOST}/mesa-lava"
+    ARTIFACTS_PREFIX: "https://${S3_HOST}/mesa-lava"
     ARTIFACTS_SUFFIX: "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
-    MESA_ARTIFACTS_TAG: *debian-arm_build
+    MESA_ARTIFACTS_TAG: *debian-arm64_build
     MESA_ROOTFS_TAG: *kernel-rootfs
 
-debian/armhf_test:
+debian/arm32_test:
   extends:
     - .debian/arm_test
   needs:
-    - kernel+rootfs_armhf
+    - kernel+rootfs_arm32
   variables:
-    MESA_IMAGE_TAG: &debian-armhf_test ${DEBIAN_BASE_TAG}
+    MESA_IMAGE_TAG: &debian-arm32_test ${DEBIAN_BASE_TAG}
 
 debian/arm64_test:
   extends:
@@ -392,13 +406,13 @@ debian/arm64_test:
   variables:
     MESA_ROOTFS_TAG: *kernel-rootfs
 
-.use-debian/armhf_test:
+.use-debian/arm32_test:
   image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_TEMPLATES_COMMIT}"
   extends:
     - .use-debian/arm_test
   variables:
-    MESA_IMAGE_PATH: "debian/armhf_test"
-    MESA_IMAGE_TAG: *debian-armhf_test
+    MESA_IMAGE_PATH: "debian/arm32_test"
+    MESA_IMAGE_TAG: *debian-arm32_test
   needs:
     - debian/arm_test
 
@@ -436,8 +450,7 @@ debian/arm64_test:
     - .container
     - .windows-docker-vs2019
   rules:
-    - if: '$MICROSOFT_FARM == "offline"'
-      when: never
+    - !reference [.microsoft-farm-container-rules, rules]
     - !reference [.container-rules, rules]
   variables:
     GIT_STRATEGY: fetch # we do actually need the full repository though
@@ -467,8 +480,7 @@ windows_build_vs2019:
   extends:
     - .windows_container_build
   rules:
-    - if: '$MICROSOFT_FARM == "offline"'
-      when: never
+    - !reference [.microsoft-farm-rules, rules]
     - !reference [.build-rules, rules]
   variables:
     MESA_IMAGE_PATH: &windows_build_image_path ${WINDOWS_X64_BUILD_PATH}
@@ -487,8 +499,7 @@ windows_test_vs2019:
   extends:
     - .windows_container_build
   rules:
-    - if: '$MICROSOFT_FARM == "offline"'
-      when: never
+    - !reference [.microsoft-farm-rules, rules]
     - !reference [.build-rules, rules]
   variables:
     MESA_IMAGE_PATH: &windows_test_image_path ${WINDOWS_X64_TEST_PATH}

.gitlab-ci/container/install-wine-dxvk.sh

@@ -1,40 +1,27 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
+overrideDll() {
+  if ! wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "$1" /d native /f; then
+    echo -e "Failed to add override for $1"
+    exit 1
+  fi
+}
+
 dxvk_install_release() {
-    local DXVK_VERSION=${1:-"1.10.3"}
+    local DXVK_VERSION=${1:?}
 
     curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
 	-O "https://github.com/doitsujin/dxvk/releases/download/v${DXVK_VERSION}/dxvk-${DXVK_VERSION}.tar.gz"
     tar xzpf dxvk-"${DXVK_VERSION}".tar.gz
-    # https://github.com/doitsujin/dxvk/issues/2921
-    sed -i 's/wine="wine"/wine="wine32"/' "dxvk-${DXVK_VERSION}"/setup_dxvk.sh
-    "dxvk-${DXVK_VERSION}"/setup_dxvk.sh install
+    cp "dxvk-${DXVK_VERSION}"/x64/*.dll "$WINEPREFIX/drive_c/windows/system32/"
+    overrideDll d3d9
+    overrideDll d3d10core
+    overrideDll d3d11
+    overrideDll dxgi
     rm -rf "dxvk-${DXVK_VERSION}"
     rm dxvk-"${DXVK_VERSION}".tar.gz
 }
 
-# Install from a Github PR number
-dxvk_install_pr() {
-    local __prnum=$1
-
-    # NOTE: Clone all the ensite history of the repo so as not to think
-    # harder about cloning just enough for 'git describe' to work.  'git
-    # describe' is used by the dxvk build system to generate a
-    # dxvk_version Meson variable, which is nice-to-have.
-    git clone https://github.com/doitsujin/dxvk
-    pushd dxvk
-    git fetch origin pull/"$__prnum"/head:pr
-    git checkout pr
-    ./package-release.sh pr ../dxvk-build --no-package
-    popd
-    pushd ./dxvk-build/dxvk-pr
-    ./setup_dxvk.sh install
-    popd
-    rm -rf ./dxvk-build ./dxvk
-}
-
-dxvk_install_release "1.10.1"
-#dxvk_install_pr 2359
-
+dxvk_install_release "2.1"

.gitlab-ci/container/lava_build.sh

@@ -1,23 +1,27 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # shellcheck disable=SC1091 # The relative paths in this file only become valid at runtime.
 # shellcheck disable=SC2034 # Variables are used in scripts called from here
 # shellcheck disable=SC2086 # we want word splitting
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# KERNEL_ROOTFS_TAG
 
 set -e
 set -o xtrace
 
 export DEBIAN_FRONTEND=noninteractive
+export LLVM_VERSION="${LLVM_VERSION:=15}"
 
 check_minio()
 {
-    MINIO_PATH="${MINIO_HOST}/mesa-lava/$1/${DISTRIBUTION_TAG}/${DEBIAN_ARCH}"
-    if curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -s -X HEAD \
-      "https://${MINIO_PATH}/done"; then
+    S3_PATH="${S3_HOST}/mesa-lava/$1/${DISTRIBUTION_TAG}/${DEBIAN_ARCH}"
+    if curl -L --retry 4 -f --retry-delay 60 -s -X HEAD \
+      "https://${S3_PATH}/done"; then
+        echo "Remote files are up-to-date, skip rebuilding them."
         exit
     fi
 }
 
-# If remote files are up-to-date, skip rebuilding them
 check_minio "${FDO_UPSTREAM_REPO}"
 check_minio "${CI_PROJECT_PATH}"
 
@@ -32,18 +36,19 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
     SKQP_ARCH="arm64"
     DEFCONFIG="arch/arm64/configs/defconfig"
     DEVICE_TREES="arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb"
-    DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb"
-    DEVICE_TREES+=" arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dtb"
-    DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb"
-    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/apq8016-sbc.dtb"
-    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/apq8096-db820c.dtb"
     DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dtb"
-    DEVICE_TREES+=" arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper-sku16.dtb"
-    DEVICE_TREES+=" arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dtb"
-    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dtb"
-    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r1.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dtb"
     DEVICE_TREES+=" arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dtb"
     DEVICE_TREES+=" arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper-sku16.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/apq8016-sbc.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/apq8096-db820c.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r1.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/sm8350-hdk.dtb"
     KERNEL_IMAGE_NAME="Image"
 
 elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then
@@ -90,10 +95,10 @@ apt-get install -y --no-remove \
                    ${ARCH_PACKAGES} \
                    automake \
                    bc \
-                   clang \
+                   clang-${LLVM_VERSION} \
                    cmake \
 		   curl \
-                   debootstrap \
+                   mmdebstrap \
                    git \
                    glslang-tools \
                    libdrm-dev \
@@ -116,6 +121,7 @@ apt-get install -y --no-remove \
                    libxkbcommon-dev \
                    libwayland-dev \
                    ninja-build \
+                   openssh-server \
                    patch \
                    protobuf-compiler \
                    python-is-python3 \
@@ -142,76 +148,148 @@ if [[ "$DEBIAN_ARCH" = "armhf" ]]; then
                        libxkbcommon-dev:armhf
 fi
 
-mkdir -p "/lava-files/rootfs-${DEBIAN_ARCH}"
+ROOTFS=/lava-files/rootfs-${DEBIAN_ARCH}
+mkdir -p "$ROOTFS"
+
+# rootfs packages
+PKG_BASE=(
+  tzdata mount
+)
+PKG_CI=(
+  firmware-realtek
+  bash ca-certificates curl
+  initramfs-tools jq netcat-openbsd dropbear openssh-server
+  libasan8
+  git
+  python3-dev python3-pip python3-setuptools python3-wheel
+  weston # Wayland
+  xinit xserver-xorg-core xwayland # X11
+)
+PKG_MESA_DEP=(
+  libdrm2 libsensors5 libexpat1 # common
+  libvulkan1 # vulkan
+  libx11-6 libx11-xcb1 libxcb-dri2-0 libxcb-dri3-0 libxcb-glx0 libxcb-present0 libxcb-randr0 libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libxdamage1 libxext6 libxfixes3 libxkbcommon0 libxrender1 libxshmfence1 libxxf86vm1 # X11
+)
+PKG_DEP=(
+  libpng16-16
+  libwaffle-1-0
+  libpython3.11 python3 python3-lxml python3-mako python3-numpy python3-packaging python3-pil python3-renderdoc python3-requests python3-simplejson python3-yaml # Python
+  sntp
+  strace
+  waffle-utils
+  zstd
+)
+# arch dependent rootfs packages
+[ "$DEBIAN_ARCH" = "arm64" ] && PKG_ARCH=(
+  libgl1 libglu1-mesa
+  libvulkan-dev
+  firmware-linux-nonfree firmware-qcom-media
+  libfontconfig1
+)
+[ "$DEBIAN_ARCH" = "amd64" ] && PKG_ARCH=(
+  firmware-amd-graphics
+  libgl1 libglu1-mesa
+  inetutils-syslogd iptables libcap2
+  libfontconfig1
+  spirv-tools
+  libelf1 libfdt1 "libllvm${LLVM_VERSION}"
+  libva2 libva-drm2
+  libvulkan-dev
+  socat
+  sysvinit-core
+  wine
+)
+[ "$DEBIAN_ARCH" = "armhf" ] && PKG_ARCH=(
+  firmware-misc-nonfree
+)
+
+mmdebstrap \
+    --variant=apt \
+    --arch="${DEBIAN_ARCH}" \
+    --components main,contrib,non-free-firmware \
+    --include "${PKG_BASE[*]} ${PKG_CI[*]} ${PKG_DEP[*]} ${PKG_MESA_DEP[*]} ${PKG_ARCH[*]}" \
+    bookworm \
+    "$ROOTFS/" \
+    "http://deb.debian.org/debian"
 
 ############### Setuping
 if [ "$DEBIAN_ARCH" = "amd64" ]; then
   . .gitlab-ci/container/setup-wine.sh "/dxvk-wine64"
   . .gitlab-ci/container/install-wine-dxvk.sh
-  mv /dxvk-wine64 "/lava-files/rootfs-${DEBIAN_ARCH}/"
+  mv /dxvk-wine64 $ROOTFS
 fi
 
 ############### Installing
-. .gitlab-ci/container/install-wine-apitrace.sh
-mkdir -p "/lava-files/rootfs-${DEBIAN_ARCH}/apitrace-msvc-win64"
-mv /apitrace-msvc-win64/bin "/lava-files/rootfs-${DEBIAN_ARCH}/apitrace-msvc-win64"
-rm -rf /apitrace-msvc-win64
+if [ "$DEBIAN_ARCH" = "amd64" ]; then
+  . .gitlab-ci/container/install-wine-apitrace.sh
+  mkdir -p "$ROOTFS/apitrace-msvc-win64"
+  mv /apitrace-msvc-win64/bin "$ROOTFS/apitrace-msvc-win64"
+  rm -rf /apitrace-msvc-win64
+fi
 
 ############### Building
 STRIP_CMD="${GCC_ARCH}-strip"
-mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/usr/lib/$GCC_ARCH
+mkdir -p $ROOTFS/usr/lib/$GCC_ARCH
 
+############### Build Vulkan validation layer (for zink)
+if [ "$DEBIAN_ARCH" = "amd64" ]; then
+  . .gitlab-ci/container/build-vulkan-validation.sh
+  mv /usr/lib/x86_64-linux-gnu/libVkLayer_khronos_validation.so $ROOTFS/usr/lib/x86_64-linux-gnu/
+  mkdir -p $ROOTFS/usr/share/vulkan/explicit_layer.d
+  mv /usr/share/vulkan/explicit_layer.d/* $ROOTFS/usr/share/vulkan/explicit_layer.d/
+fi
 
 ############### Build apitrace
 . .gitlab-ci/container/build-apitrace.sh
-mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/apitrace
-mv /apitrace/build /lava-files/rootfs-${DEBIAN_ARCH}/apitrace
+mkdir -p $ROOTFS/apitrace
+mv /apitrace/build $ROOTFS/apitrace
 rm -rf /apitrace
 
+############### Build ANGLE
+if [[ "$DEBIAN_ARCH" = "amd64" ]]; then
+  . .gitlab-ci/container/build-angle.sh
+  mv /angle /lava-files/rootfs-${DEBIAN_ARCH}/.
+  rm -rf /angle
+fi
 
 ############### Build dEQP runner
 . .gitlab-ci/container/build-deqp-runner.sh
-mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin
-mv /usr/local/bin/*-runner /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin/.
+mkdir -p $ROOTFS/usr/bin
+mv /usr/local/bin/*-runner $ROOTFS/usr/bin/.
 
 
 ############### Build dEQP
 DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh
 
-mv /deqp /lava-files/rootfs-${DEBIAN_ARCH}/.
+mv /deqp $ROOTFS/.
 
 
 ############### Build SKQP
 if [[ "$DEBIAN_ARCH" = "arm64" ]] \
   || [[ "$DEBIAN_ARCH" = "amd64" ]]; then
     . .gitlab-ci/container/build-skqp.sh
-    mv /skqp /lava-files/rootfs-${DEBIAN_ARCH}/.
+    mv /skqp $ROOTFS/.
 fi
 
 ############### Build piglit
 PIGLIT_OPTS="-DPIGLIT_BUILD_DMA_BUF_TESTS=ON -DPIGLIT_BUILD_GLX_TESTS=ON" . .gitlab-ci/container/build-piglit.sh
-mv /piglit /lava-files/rootfs-${DEBIAN_ARCH}/.
+mv /piglit $ROOTFS/.
 
 ############### Build libva tests
 if [[ "$DEBIAN_ARCH" = "amd64" ]]; then
     . .gitlab-ci/container/build-va-tools.sh
-    mv /va/bin/* /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin/
+    mv /va/bin/* $ROOTFS/usr/bin/
 fi
 
 ############### Build Crosvm
 if [[ ${DEBIAN_ARCH} = "amd64" ]]; then
     . .gitlab-ci/container/build-crosvm.sh
-    mv /usr/local/bin/crosvm /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin/
-    mv /usr/local/lib/$GCC_ARCH/libvirglrenderer.* /lava-files/rootfs-${DEBIAN_ARCH}/usr/lib/$GCC_ARCH/
-    mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/usr/local/libexec/
-    mv /usr/local/libexec/virgl* /lava-files/rootfs-${DEBIAN_ARCH}/usr/local/libexec/
+    mv /usr/local/bin/crosvm $ROOTFS/usr/bin/
+    mv /usr/local/lib/libvirglrenderer.* $ROOTFS/usr/lib/$GCC_ARCH/
+    mkdir -p $ROOTFS/usr/local/libexec/
+    mv /usr/local/libexec/virgl* $ROOTFS/usr/local/libexec/
 fi
 
-############### Build libdrm
-EXTRA_MESON_ARGS+=" -D prefix=/libdrm"
-. .gitlab-ci/container/build-libdrm.sh
-
-
 ############### Build local stuff for use by igt and kernel testing, which
 ############### will reuse most of our container build process from a specific
 ############### hash of the Mesa tree.
@@ -227,48 +305,26 @@ fi
 rm -rf /root/.cargo
 rm -rf /root/.rustup
 
-############### Create rootfs
-set +e
-if ! debootstrap \
-     --variant=minbase \
-     --arch=${DEBIAN_ARCH} \
-     --components main,contrib,non-free \
-     bullseye \
-     /lava-files/rootfs-${DEBIAN_ARCH}/ \
-     http://deb.debian.org/debian; then
-    cat /lava-files/rootfs-${DEBIAN_ARCH}/debootstrap/debootstrap.log
-    exit 1
-fi
-set -e
+############### Fill rootfs
+cp .gitlab-ci/container/setup-rootfs.sh $ROOTFS/.
+cp .gitlab-ci/container/strip-rootfs.sh $ROOTFS/.
+cp .gitlab-ci/container/debian/llvm-snapshot.gpg.key $ROOTFS/.
+cp .gitlab-ci/container/debian/winehq.gpg.key $ROOTFS/.
+chroot $ROOTFS bash /setup-rootfs.sh
+rm $ROOTFS/{llvm-snapshot,winehq}.gpg.key
+rm "$ROOTFS/setup-rootfs.sh"
+rm "$ROOTFS/strip-rootfs.sh"
+cp /etc/wgetrc $ROOTFS/etc/.
 
-cp .gitlab-ci/container/create-rootfs.sh /lava-files/rootfs-${DEBIAN_ARCH}/.
-cp .gitlab-ci/container/debian/llvm-snapshot.gpg.key /lava-files/rootfs-${DEBIAN_ARCH}/.
-cp .gitlab-ci/container/debian/winehq.gpg.key /lava-files/rootfs-${DEBIAN_ARCH}/.
-chroot /lava-files/rootfs-${DEBIAN_ARCH} sh /create-rootfs.sh
-rm /lava-files/rootfs-${DEBIAN_ARCH}/{llvm-snapshot,winehq}.gpg.key
-rm /lava-files/rootfs-${DEBIAN_ARCH}/create-rootfs.sh
-cp /etc/wgetrc /lava-files/rootfs-${DEBIAN_ARCH}/etc/.
-
-
-############### Install the built libdrm
-# Dependencies pulled during the creation of the rootfs may overwrite
-# the built libdrm. Hence, we add it after the rootfs has been already
-# created.
-find /libdrm/ -name lib\*\.so\* \
-  -exec cp -t /lava-files/rootfs-${DEBIAN_ARCH}/usr/lib/$GCC_ARCH/. {} \;
-mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/libdrm/
-cp -Rp /libdrm/share /lava-files/rootfs-${DEBIAN_ARCH}/libdrm/share
-rm -rf /libdrm
-
-
-if [ ${DEBIAN_ARCH} = arm64 ]; then
+if [ "${DEBIAN_ARCH}" = "arm64" ]; then
+    mkdir -p /lava-files/rootfs-arm64/lib/firmware/qcom/sm8350/  # for firmware imported later
     # Make a gzipped copy of the Image for db410c.
     gzip -k /lava-files/Image
     KERNEL_IMAGE_NAME+=" Image.gz"
 fi
 
-du -ah /lava-files/rootfs-${DEBIAN_ARCH} | sort -h | tail -100
-pushd /lava-files/rootfs-${DEBIAN_ARCH}
+du -ah "$ROOTFS" | sort -h | tail -100
+pushd $ROOTFS
   tar --zstd -cf /lava-files/lava-rootfs.tar.zst .
 popd
 
@@ -284,8 +340,8 @@ fi
 
 for f in $FILES_TO_UPLOAD; do
     ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" /lava-files/$f \
-             https://${MINIO_PATH}/$f
+             https://${S3_PATH}/$f
 done
 
 touch /lava-files/done
-ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" /lava-files/done https://${MINIO_PATH}/done
+ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" /lava-files/done https://${S3_PATH}/done

.gitlab-ci/container/setup-rootfs.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC1091 # The relative paths in this file only become valid at runtime.
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# KERNEL_ROOTFS_TAG
+set -ex
+
+export DEBIAN_FRONTEND=noninteractive
+
+# Needed for ci-fairy, this revision is able to upload files to
+# MinIO and doesn't depend on git
+pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
+
+# Needed for manipulation with traces yaml files.
+pip3 install --break-system-packages yq
+
+passwd root -d
+chsh -s /bin/sh
+
+cat > /init <<EOF
+#!/bin/sh
+export PS1=lava-shell:
+exec sh
+EOF
+chmod +x  /init
+
+# Copy timezone file and remove tzdata package
+rm -rf /etc/localtime
+cp /usr/share/zoneinfo/Etc/UTC /etc/localtime
+
+. strip-rootfs.sh

.gitlab-ci/container/setup-wine.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export WINEPREFIX="$1"
 export WINEDEBUG="-all"
@@ -13,7 +13,7 @@ Windows Registry Editor Version 5.00
 EOF
 
 # Set the wine prefix and disable the crash dialog
-wine64 regedit crashdialog.reg
+wine regedit crashdialog.reg
 rm crashdialog.reg
 
 # An immediate wine command may fail with: "${WINEPREFIX}: Not a

.gitlab-ci/container/strip-rootfs.sh

@@ -0,0 +1,133 @@
+#!/usr/bin/env bash
+# Strip the image to a small minimal system.
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# KERNEL_ROOTFS_TAG
+set -ex
+
+export DEBIAN_FRONTEND=noninteractive
+
+UNNEEDED_PACKAGES=(
+  libfdisk1 git
+  python3-dev python3-pip python3-setuptools python3-wheel
+)
+
+# Removing unused packages
+for PACKAGE in "${UNNEEDED_PACKAGES[@]}"
+do
+	if ! apt-get remove --purge --yes "${PACKAGE}"
+	then
+		echo "WARNING: ${PACKAGE} isn't installed"
+	fi
+done
+
+apt-get autoremove --yes || true
+
+UNNEEDED_PACKAGES=(
+  apt libapt-pkg6.0
+  ncurses-bin ncurses-base libncursesw6 libncurses6
+  perl-base
+  debconf libdebconfclient0
+  e2fsprogs e2fslibs libfdisk1
+  insserv
+  udev
+  init-system-helpers
+  cpio
+  passwd
+  libsemanage1 libsemanage-common
+  libsepol1
+  gpgv
+  hostname
+  adduser
+  debian-archive-keyring
+  libegl1-mesa-dev # mesa group
+  libegl-mesa0
+  libgl1-mesa-dev
+  libgl1-mesa-dri
+  libglapi-mesa
+  libgles2-mesa-dev
+  libglx-mesa0
+  mesa-common-dev
+  gnupg2
+  software-properties-common
+)
+
+# Removing unneeded packages
+for PACKAGE in "${UNNEEDED_PACKAGES[@]}"
+do
+	if ! dpkg --purge --force-remove-essential --force-depends "${PACKAGE}"
+	then
+		echo "WARNING: ${PACKAGE} isn't installed"
+	fi
+done
+
+# Show what's left package-wise before dropping dpkg itself
+COLUMNS=300 dpkg-query -W --showformat='${Installed-Size;10}\t${Package}\n' | sort -k1,1n
+
+# Drop dpkg
+dpkg --purge --force-remove-essential --force-depends dpkg
+
+# directories for a removal
+
+directories=(
+  /var/log/* # logs
+  /usr/share/doc/* # docs, i18n, etc.
+  /usr/share/locale/*
+  /usr/share/X11/locale/*
+  /usr/share/man
+  /usr/share/i18n/*
+  /usr/share/info/*
+  /usr/share/lintian/*
+  /usr/share/common-licenses/*
+  /usr/share/mime/*
+  /usr/share/bug
+  /lib/udev/hwdb.bin # udev hwdb not required on a stripped system
+  /lib/udev/hwdb.d/*
+  /usr/bin/iconv # gconv conversions && binaries
+  /usr/sbin/iconvconfig
+  /usr/lib/*/gconv/
+  /usr/sbin/update-usbids # libusb db
+  /usr/share/misc/usb.ids
+  /var/lib/usbutils/usb.ids
+  /root/.pip # pip cache
+  /root/.cache
+  /etc/apt # configuration archives of apt and dpkg
+  /etc/dpkg
+  /var/* # drop non-ostree directories
+  /srv
+  /share
+  /usr/share/ca-certificates # certificates are in /etc
+  /usr/share/bash-completion # completions
+  /usr/share/zsh/vendor-completions
+  /usr/share/gcc # gcc python helpers
+  /etc/inid.d # sysvinit leftovers
+  /etc/rc[0-6S].d
+  /etc/init
+  /usr/lib/lsb
+  /usr/lib/xtables # xtrables helpers
+  /usr/lib/locale/* # should we keep C locale?
+  /usr/sbin/*fdisk # partitioning
+  /usr/bin/localedef # local compiler
+  /usr/sbin/ldconfig* # only needed when adding libs
+  /usr/games
+  /usr/lib/*/security/pam_userdb.so # Remove pam module to authenticate against a DB
+  /usr/lib/*/libdb-5.3.so # libdb-5.3.so that is only used by this pam module ^
+  /usr/lib/*/libnss_hesiod* # remove NSS support for nis, nisplus and hesiod
+  /usr/lib/*/libnss_nis*
+)
+
+for directory in "${directories[@]}"; do
+  rm -rf "$directory" || echo "Failed to remove $directory! Update scripts!"
+done
+
+files=(
+  '*systemd-resolve*' # systemd dns resolver
+  '*networkd*' # systemd network configuration
+  '*timesyncd*' # systemd ntp
+  'systemd-hwdb*' # systemd hw database
+  '*fuse*' # FUSE
+)
+
+for files in "${files[@]}"; do
+  find /usr /etc -name "$files" -prune -exec rm -r {} \;
+done

.gitlab-ci/crosvm-init.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-
+# shellcheck disable=SC1091 # The relative paths in this file only become valid at runtime.
+# shellcheck disable=SC2086 # we want word splitting
 set -e
 
 VSOCK_STDOUT=$1
@@ -10,6 +11,8 @@ mount -t proc none /proc
 mount -t sysfs none /sys
 mkdir -p /dev/pts
 mount -t devpts devpts /dev/pts
+mkdir /dev/shm
+mount -t tmpfs -o noexec,nodev,nosuid tmpfs /dev/shm
 mount -t tmpfs tmpfs /tmp
 
 . ${VM_TEMP_DIR}/crosvm-env.sh

.gitlab-ci/crosvm-runner.sh

@@ -1,5 +1,5 @@
-#!/bin/sh
-
+#!/usr/bin/env bash
+# shellcheck disable=SC2086 # we want word splitting
 set -e
 
 # If run outside of a deqp-runner invoction (e.g. piglit trace replay), then act
@@ -35,7 +35,7 @@ set_vsock_context() {
     rm -rf $VM_TEMP_DIR
     mkdir $VM_TEMP_DIR || return 1
 
-    VSOCK_CID=$(((CI_JOB_ID & 0x1ffffff) | ((${THREAD} & 0x7f) << 25)))
+    VSOCK_CID=$(((CI_JOB_ID & 0x1ffffff) | ((THREAD & 0x7f) << 25)))
     VSOCK_STDOUT=5001
     VSOCK_STDERR=5002
 
@@ -66,7 +66,7 @@ set_vsock_context || { echo "Could not generate crosvm vsock CID" >&2; exit 1; }
 echo "Variables passed through:"
 SCRIPT_DIR=$(readlink -en "${0%/*}")
 ${SCRIPT_DIR}/common/generate-env.sh | tee ${VM_TEMP_DIR}/crosvm-env.sh
-cp ${SCRIPTS_DIR}/setup-test-env.sh ${VM_TEMP_DIR}/setup-test-env.sh
+cp ${SCRIPT_DIR}/setup-test-env.sh ${VM_TEMP_DIR}/setup-test-env.sh
 
 # Set the crosvm-script as the arguments of the current script
 echo ". ${VM_TEMP_DIR}/setup-test-env.sh" > ${VM_TEMP_DIR}/crosvm-script.sh
@@ -101,7 +101,7 @@ crosvm --no-syslog run \
     --gpu "${CROSVM_GPU_ARGS}" --gpu-render-server "path=/usr/local/libexec/virgl_render_server" \
     -m "${CROSVM_MEMORY:-4096}" -c "${CROSVM_CPU:-2}" --disable-sandbox \
     --shared-dir /:my_root:type=fs:writeback=true:timeout=60:cache=always \
-    --host-ip "192.168.30.1" --netmask "255.255.255.0" --mac "AA:BB:CC:00:00:12" \
+    --net "host-ip=192.168.30.1,netmask=255.255.255.0,mac=AA:BB:CC:00:00:12" \
     -s $VM_SOCKET \
     --cid ${VSOCK_CID} -p "${CROSVM_KERN_ARGS}" \
     /lava-files/${KERNEL_IMAGE_NAME:-bzImage} > ${VM_TEMP_DIR}/crosvm 2>&1

.gitlab-ci/cuttlefish-runner.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# shellcheck disable=SC2086 # we want word splitting
+
 section_start cuttlefish_setup "cuttlefish: setup"
 set -xe
 
@@ -26,6 +28,7 @@ ADB="adb -s vsock:3:5555"
 $ADB root
 sleep 1
 $ADB shell echo Hi from Android
+# shellcheck disable=SC2035
 $ADB logcat dEQP:D *:S &
 
 # overlay vendor
@@ -44,15 +47,15 @@ $ADB shell setenforce 0
 
 # deqp
 
-$ADB push /deqp/modules/egl/deqp-egl /data/.
+$ADB push /deqp/modules/egl/deqp-egl-android /data/.
 $ADB push /deqp/assets/gl_cts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-master.txt /data/.
 $ADB push /deqp-runner/deqp-runner /data/.
 
-# download mesa-x86_64-android.tar.zst
-
-MESA_ANDROID_ARTIFACT_URL=https://${PIPELINE_ARTIFACTS_BASE}/${MINIO_ARTIFACT_NAME}.tar.zst
-curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -o ${MINIO_ARTIFACT_NAME}.tar.zst ${MESA_ANDROID_ARTIFACT_URL}
-tar -xvf ${MINIO_ARTIFACT_NAME}.tar.zst
+# download Android Mesa from S3
+MESA_ANDROID_ARTIFACT_URL=https://${PIPELINE_ARTIFACTS_BASE}/${S3_ARTIFACT_NAME}.tar.zst
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -o ${S3_ARTIFACT_NAME}.tar.zst ${MESA_ANDROID_ARTIFACT_URL}
+tar -xvf ${S3_ARTIFACT_NAME}.tar.zst
+rm "${S3_ARTIFACT_NAME}.tar.zst" &
 
 $ADB push install/all-skips.txt /data/.
 $ADB push install/$GPU_VERSION-flakes.txt /data/.
@@ -89,7 +92,7 @@ RESULTS=/data/results
 uncollapsed_section_switch cuttlefish_test "cuttlefish: testing"
 
 set +e
-$ADB shell "mkdir /data/results; cd /data; strace -o /data/results/out.strace -f -s 1000 ./deqp-runner \
+$ADB shell "mkdir /data/results; cd /data; ./deqp-runner \
     suite \
     --suite /data/deqp-$DEQP_SUITE.toml \
     --output $RESULTS \
@@ -97,7 +100,7 @@ $ADB shell "mkdir /data/results; cd /data; strace -o /data/results/out.strace -f
     --flakes /data/$GPU_VERSION-flakes.txt \
     --testlog-to-xml /deqp/executor/testlog-to-xml \
     --fraction-start $CI_NODE_INDEX \
-    --fraction `expr $CI_NODE_TOTAL \* ${DEQP_FRACTION:-1}` \
+    --fraction $(( CI_NODE_TOTAL * ${DEQP_FRACTION:-1})) \
     --jobs ${FDO_CI_CONCURRENT:-4} \
     $DEQP_RUNNER_OPTIONS"