VERSION: bump for 24.3.0-rc1 release

2024-11-07 10:44:28 -08:00
3288 changed files with 106691 additions and 230322 deletions
--- a/.ci-farms-disabled/lima
+++ b/.ci-farms-disabled/lima
--- a/.ci-farms-disabled/vmware
+++ b/.ci-farms-disabled/vmware
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -65,6 +65,3 @@ c7bf3b69ebc8f2252dbf724a4de638e6bb2ac402

 # ir3: Reformat source with clang-format
 177138d8cb0b4f6a42ef0a1f8593e14d79f17c54
-
-# ir3: reformat after refactoring in previous commit
-8ae5b27ee0331a739d14b42e67586784d6840388
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,15 +30,11 @@ workflow:
    # do not duplicate pipelines on merge pipelines
    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"
      when: never
-    # tag pipelines are disabled as it's too late to run all the tests by
-    # then, the release has been made based on the staging pipelines results
-    - if: $CI_COMMIT_TAG
-      when: never
    # merge pipeline
    - if: &is-merge-attempt $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"
      variables:
        MESA_CI_PERFORMANCE_ENABLED: 1
-        CI_TRON_JOB_PRIORITY_TAG: ""  # Empty tags are ignored by gitlab
+        VALVE_INFRA_VANGOGH_JOB_PRIORITY: ""  # Empty tags are ignored by gitlab
        JOB_PRIORITY: 75
        # fast-fail in merge pipelines: stop early if we get this many unexpected fails/crashes
        DEQP_RUNNER_MAX_FAILS: 40
@@ -51,19 +47,14 @@ workflow:
    # nightly pipeline
    - if: &is-scheduled-pipeline $CI_PIPELINE_SOURCE == "schedule"
      variables:
-        JOB_PRIORITY: 45
        # (some) nightly builds perform LTO, so they take much longer than the
        # short timeout allowed in other pipelines.
        # Note: 0 = infinity = gitlab's job `timeout:` applies, which is 1h
        BUILD_JOB_TIMEOUT_OVERRIDE: 0
    # pipeline for direct pushes that bypassed the CI
-    - if: &is-direct-push $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
+    - if: &is-direct-push $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $GITLAB_USER_LOGIN != "marge-bot"
      variables:
-        JOB_PRIORITY: 70
-    # pipeline for direct pushes from release maintainer
-    - if: &is-staging-push $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME =~ /^staging\//
-      variables:
-        JOB_PRIORITY: 70
+        JOB_PRIORITY: 40


 variables:
@@ -76,12 +67,7 @@ variables:
          rm download-git-cache.sh
          set +o xtrace
  S3_JWT_FILE: /s3_jwt
-  S3_JWT_FILE_SCRIPT: |-
-      echo -n '${S3_JWT}' > '${S3_JWT_FILE}' &&
-      unset CI_JOB_JWT S3_JWT  # Unsetting vulnerable env variables
  S3_HOST: s3.freedesktop.org
-  # This bucket is used to fetch ANDROID prebuilts and images
-  S3_ANDROID_BUCKET: mesa-rootfs
  # This bucket is used to fetch the kernel image
  S3_KERNEL_BUCKET: mesa-rootfs
  # Bucket for git cache
@@ -105,14 +91,13 @@ variables:
  ARTIFACTS_BASE_URL: https://${CI_PROJECT_ROOT_NAMESPACE}.${CI_PAGES_DOMAIN}/-/${CI_PROJECT_NAME}/-/jobs/${CI_JOB_ID}/artifacts
  # Python scripts for structured logger
  PYTHONPATH: "$PYTHONPATH:$CI_PROJECT_DIR/install"
-  # No point in continuing once the device is lost
+  # Drop once deqp-runner is upgraded to > 0.18.0
  MESA_VK_ABORT_ON_DEVICE_LOSS: 1
  # Avoid the wall of "Unsupported SPIR-V capability" warnings in CI job log, hiding away useful output
  MESA_SPIRV_LOG_LEVEL: error
  # Default priority for non-merge pipelines
-  CI_TRON_JOB_PRIORITY_TAG: ci-tron:priority:low
+  VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
  JOB_PRIORITY: 50
-  DATA_STORAGE_PATH: data_storage

 default:
  id_tokens:
@@ -126,8 +111,9 @@ default:
    - >
      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" &&
-      . ${SCRIPTS_DIR}/setup-test-env.sh
-    - eval "$S3_JWT_FILE_SCRIPT"
+      . ${SCRIPTS_DIR}/setup-test-env.sh &&
+      echo -n "${S3_JWT}" > "${S3_JWT_FILE}" &&
+      unset CI_JOB_JWT S3_JWT  # Unsetting vulnerable env variables

  after_script:
    # Work around https://gitlab.com/gitlab-org/gitlab/-/issues/20338
@@ -225,7 +211,6 @@ include:
        - bin/git_sha1_gen.py
        - bin/install_megadrivers.py
        - bin/symbols-check.py
-        - bin/ci/**/*
        # GitLab CI
        - .gitlab-ci.yml
        - .gitlab-ci/**/*
@@ -256,9 +241,6 @@ include:
    # Build everything after someone bypassed the CI
    - if: *is-direct-push
      when: on_success
-    # Build everything when pushing to staging branches
-    - if: *is-staging-push
-      when: on_success
    # Build everything in scheduled pipelines
    - if: *is-scheduled-pipeline
      when: on_success
@@ -269,7 +251,7 @@ include:

 .ci-deqp-artifacts:
  artifacts:
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
+    name: "mesa_${CI_JOB_NAME}"
    when: always
    untracked: false
    paths:
@@ -278,7 +260,6 @@ include:
      - artifacts
      - _build/meson-logs/*.txt
      - _build/meson-logs/strace
-      - _build/.ninja_log

 # Git archive

@@ -295,11 +276,11 @@ make git archive:
    # Compactify the .git directory
    - git gc --aggressive
    # Download & cache the perfetto subproject as well.
-    - rm -rf subprojects/perfetto ; mkdir -p subprojects/perfetto && curl --fail https://android.googlesource.com/platform/external/perfetto/+archive/$(grep 'revision =' subprojects/perfetto.wrap | cut -d ' ' -f3).tar.gz | tar zxf - -C subprojects/perfetto
+    - 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 .

-    - s3_upload ../$CI_PROJECT_NAME.tar.gz "https://$S3_HOST/git-cache/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/"
+    - ci-fairy s3cp --token-file "${S3_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
 sanity:
@@ -369,7 +350,9 @@ mr-label-maker-test:
 # 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
-    - job: yaml-toml-shell-py-test
+    - job: toml-lint
      optional: true
--- a/.gitlab-ci/.flake8
+++ b/.gitlab-ci/.flake8
@@ -1,33 +0,0 @@
-[flake8]
-exclude = .venv*,
-
-# PEP 8 Style Guide limits line length to 79 characters
-max-line-length = 159
-
-ignore =
-    # continuation line under-indented for hanging indent
-    E121
-    # continuation line over-indented for hanging indent
-    E126,
-    # continuation line under-indented for visual indent
-    E128,
-    # whitespace before ':'
-    E203,
-    # missing whitespace around arithmetic operator
-    E226,
-    # missing whitespace after ','
-    E231,
-     # expected 2 blank lines, found 1
-    E302,
-    # too many blank lines
-    E303,
-    # imported but unused
-    F401,
-    # f-string is missing placeholders
-    F541,
-    # local variable assigned to but never used
-    F841,
-    # line break before binary operator
-    W503,
-    #  line break after binary operator
-    W504,
--- a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2
+++ b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2
@@ -2,7 +2,7 @@ version: 1

 # Rules to match for a machine to qualify
 target:
-  id: '{{ ci_runner_description }}'
+  id: '{{ ci_runner_id }}'

 timeouts:

@@ -27,12 +27,6 @@ timeouts:
    retries: 0
    # no retries possible here

-  watchdogs:
-    boot:
-      minutes: {{ timeout_boot_wd_minutes | default(0, true) }}
-      seconds: {{ timeout_boot_wd_seconds | default(0, true) }}
-      retries: {{ timeout_boot_wd_retries | default(0, true) }}
-
 console_patterns:
    session_end:
        regex: >-
@@ -51,20 +45,6 @@ console_patterns:
          {{ job_warn_regex }}
 {% endif %}

-{% if boot_wd_start_regex and boot_wd_stop_regex %}
-    watchdogs:
-        boot:
-            start:
-              regex: >-
-                {{ boot_wd_start_regex }}
-            reset:
-              regex: >-
-                {{ boot_wd_reset_regex | default(boot_wd_start_regex, true) }}
-            stop:
-              regex: >-
-                {{ boot_wd_stop_regex }}
-{% endif %}
-
 # Environment to deploy
 deployment:
  # Initial boot
@@ -79,9 +59,8 @@ deployment:
              {% for volume in volumes %}
              b2c.volume={{ volume }}
              {% endfor %}
-              b2c.run_service="--privileged --tls-verify=false --pid=host docker://{{ '{{' }} fdo_proxy_registry }}/gfx-ci/ci-tron/telegraf:latest" b2c.hostname=dut-{{ '{{' }} machine.full_name }}
-              b2c.run="-ti --tls-verify=false docker://{{ '{{' }} fdo_proxy_registry }}/gfx-ci/ci-tron/machine-registration:latest check"
-              b2c.run="-v {{ '{{' }} job_bucket }}-results:{{ working_dir }} -w {{ working_dir }} {% for mount_volume in mount_volumes %} -v {{ mount_volume }}{% endfor %} --tls-verify=false docker://{{ local_container }} {{ container_cmd | replace('"', '\\\"') }}"
+              b2c.service="--privileged --tls-verify=false --pid=host docker://{{ '{{' }} fdo_proxy_registry }}/gfx-ci/ci-tron/telegraf:latest" b2c.hostname=dut-{{ '{{' }} machine.full_name }}
+              b2c.container="-v {{ '{{' }} job_bucket }}-results:{{ working_dir }} -w {{ working_dir }} {% for mount_volume in mount_volumes %} -v {{ mount_volume }}{% endfor %} --tls-verify=false docker://{{ local_container }} {{ container_cmd | replace('"', '\\\"') }}"
    kernel:
 {% if kernel_url %}
      url: '{{ kernel_url }}'
@@ -98,22 +77,12 @@ deployment:
        {{ kernel_cmdline_extras }}
        {% endif %}

-{% if initramfs_url or firmware_url %}
-    initramfs:
-{% if firmware_url %}
-      - url: '{{ firmware_url }}'
-{% endif %}
 {% if initramfs_url %}
-      - url: '{{ initramfs_url }}'
-{% endif %}
+    initramfs:
+      url: '{{ initramfs_url }}'
 {% endif %}

 {% if dtb_url %}
    dtb:
      url: '{{ dtb_url }}'
-{% if dtb_match %}
-      format:
-        archive:
-          match: "{{ dtb_match }}"
-{% endif %}
 {% endif %}
--- a/.gitlab-ci/b2c/generate_b2c.py
+++ b/.gitlab-ci/b2c/generate_b2c.py
@@ -37,7 +37,7 @@ env = Environment(loader=FileSystemLoader(path.dirname(values['job_template'])),
 template = env.get_template(path.basename(values['job_template']))

 values['ci_job_id'] = environ['CI_JOB_ID']
-values['ci_runner_description'] = environ['CI_RUNNER_DESCRIPTION']
+values['ci_runner_id'] = environ['CI_RUNNER_ID']
 values['job_volume_exclusions'] = [excl for excl in values['job_volume_exclusions'].split(",") if excl]
 values['working_dir'] = environ['CI_PROJECT_DIR']

--- a/.gitlab-ci/bare-metal/rootfs-setup.sh
+++ b/.gitlab-ci/bare-metal/rootfs-setup.sh
@@ -17,6 +17,9 @@ cp "${S3_JWT_FILE}" "${rootfs_dst}${S3_JWT_FILE}"

 date +'%F %T'

+cp $CI_COMMON/capture-devcoredump.sh $rootfs_dst/
+cp $CI_COMMON/intel-gpu-freq.sh $rootfs_dst/
+cp $CI_COMMON/kdl.sh $rootfs_dst/
 cp "$SCRIPTS_DIR/setup-test-env.sh" "$rootfs_dst/"

 set +x
--- a/.gitlab-ci/build/compiler-wrapper-clang++-15.sh
+++ b/.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
--- a/.gitlab-ci/build/compiler-wrapper-clang++.sh
+++ b/.gitlab-ci/build/compiler-wrapper-clang++.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+# shellcheck disable=SC1091
+
+set -e
+
+_COMPILER=clang++
+. compiler-wrapper.sh
--- a/.gitlab-ci/build/compiler-wrapper-clang-15.sh
+++ b/.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
--- a/.gitlab-ci/build/compiler-wrapper-clang.sh
+++ b/.gitlab-ci/build/compiler-wrapper-clang.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+# shellcheck disable=SC1091
+
+set -e
+
+_COMPILER=clang
+. compiler-wrapper.sh
--- a/.gitlab-ci/build/compiler-wrapper-g++.sh
+++ b/.gitlab-ci/build/compiler-wrapper-g++.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+# shellcheck disable=SC1091
+
+set -e
+
+_COMPILER=g++
+. compiler-wrapper.sh
--- a/.gitlab-ci/build/compiler-wrapper-gcc.sh
+++ b/.gitlab-ci/build/compiler-wrapper-gcc.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+# shellcheck disable=SC1091
+
+set -e
+
+_COMPILER=gcc
+. compiler-wrapper.sh
--- a/.gitlab-ci/build/compiler-wrapper.sh
+++ b/.gitlab-ci/build/compiler-wrapper.sh
@@ -0,0 +1,21 @@
+# 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 echo "$@" | grep -E 'meson-private/tmp[^ /]*/testfile.c' >/dev/null; then
+    # Invoked for meson feature check
+    exec $CCACHE $_COMPILER "$@"
+fi
+
+if [ "$(eval printf "'%s'" "\"\${$(($#-1))}\"")" = "-c" ]; then
+    # Not invoked for linking
+    exec $CCACHE $_COMPILER "$@"
+fi
+
+# Compiler invoked by ninja for linking. Add -Werror to turn compiler warnings into errors
+# with LTO. (meson's werror should arguably do this, but meanwhile we need to)
+exec $CCACHE $_COMPILER "$@" -Werror
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -11,17 +11,15 @@
    # instead timeout so that the retry mechanism can kick in.
    # A few exception are made, see overrides in the rest of this file.
    BUILD_JOB_TIMEOUT: 15m
-    RUN_MESON_TESTS: "true"
  timeout: 1h
  # We don't want to download any previous job's artifacts
  dependencies: []
  artifacts:
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
+    name: "mesa_${CI_JOB_NAME}"
    when: always
    paths:
      - _build/meson-logs/*.txt
      - _build/meson-logs/strace
-      - _build/.ninja_log
      - artifacts

 # Just Linux
@@ -60,6 +58,8 @@
    - .build-linux
    - .use-debian/x86_64_build
  stage: build-only
+  variables:
+    LLVM_VERSION: 15
  script:
    - &meson-build timeout --verbose ${BUILD_JOB_TIMEOUT_OVERRIDE:-$BUILD_JOB_TIMEOUT} .gitlab-ci/meson/build.sh

@@ -72,8 +72,6 @@
    optional: true
  - job: debian-testing-asan
    optional: true
-  - job: debian-testing-ubsan
-    optional: true
  - job: debian-build-testing
    optional: true
  - job: debian-arm32
@@ -88,7 +86,7 @@
  # no need to wait on the "first one" to be done.
  # - job: windows-msvc
  #   optional: true
-  - job: python-artifacts
+  - job: python-test
    optional: true


@@ -101,25 +99,25 @@ debian-testing:
    BUILD_JOB_TIMEOUT: 30m
    UNWIND: "enabled"
    DRI_LOADERS: >
-      -D egl=enabled
-      -D gbm=enabled
-      -D glvnd=disabled
      -D glx=dri
+      -D gbm=enabled
+      -D egl=enabled
+      -D glvnd=disabled
      -D platforms=x11,wayland
    GALLIUM_ST: >
-      -D gallium-nine=false
-      -D gallium-rusticl=true
+      -D gallium-nine=true
      -D gallium-va=enabled
-    GALLIUM_DRIVERS: "llvmpipe,softpipe,virgl,radeonsi,zink,iris,svga"
-    VULKAN_DRIVERS: "swrast,amd,intel,virtio"
+      -D gallium-rusticl=true
+    GALLIUM_DRIVERS: "llvmpipe,softpipe,virgl,radeonsi,zink,crocus,iris,i915,r300,svga"
+    VULKAN_DRIVERS: "swrast,amd,intel,intel_hasvk,virtio,nouveau"
    BUILDTYPE: "debugoptimized"
    EXTRA_OPTION: >
-      -D intel-elk=false
      -D spirv-to-dxil=true
-      -D tools=drm-shim
      -D valgrind=disabled
+      -D perfetto=true
+      -D tools=drm-shim
    S3_ARTIFACT_NAME: mesa-x86_64-default-${BUILDTYPE}
-    RUN_MESON_TESTS: "false" # debian-build-testing already runs these
+    LLVM_VERSION: 15
  script:
    - *meson-build
    - .gitlab-ci/prepare-artifacts.sh
@@ -133,36 +131,28 @@ debian-testing-asan:
  stage: build-for-tests
  variables:
    BUILD_JOB_TIMEOUT: 30m
-    VULKAN_DRIVERS: "swrast"
-    GALLIUM_DRIVERS: "llvmpipe,softpipe"
    C_ARGS: >
      -Wno-error=stringop-truncation
    EXTRA_OPTION: >
      -D b_sanitize=address
-      -D gallium-va=false
-      -D gallium-nine=false
-      -D gallium-rusticl=false
-      -D mesa-clc=system
-      -D tools=dlclose-skip
      -D valgrind=disabled
+      -D tools=dlclose-skip
+      -D intel-clc=system
    S3_ARTIFACT_NAME: ""
    ARTIFACTS_DEBUG_SYMBOLS: 1
-    RUN_MESON_TESTS: "false" # just too slow
-    # Do a host build for mesa-clc (asan complains not being loaded as
-    # the first library)
+    # Do a host build for intel-clc (asan complains not being loaded
+    # as the first library)
    HOST_BUILD_OPTIONS: >
      -D build-tests=false
      -D enable-glcpp-tests=false
      -D gallium-opencl=disabled
-      -D gallium-rusticl=false
-      -D gallium-nine=false
      -D gallium-drivers=
-      -D glx=disabled
-      -D install-mesa-clc=true
-      -D mesa-clc=enabled
-      -D platforms=
-      -D video-codecs=
      -D vulkan-drivers=
+      -D video-codecs=
+      -D glx=disabled
+      -D platforms=
+      -D intel-clc=enabled
+      -D install-intel-clc=true

 debian-testing-msan:
  # https://github.com/google/sanitizers/wiki/MemorySanitizerLibcxxHowTo
@@ -176,7 +166,7 @@ debian-testing-msan:
    EXTRA_OPTION:
      -D b_sanitize=memory
      -D b_lundef=false
-      -D mesa-clc=system
+      -D intel-clc=system
    S3_ARTIFACT_NAME: ""
    ARTIFACTS_DEBUG_SYMBOLS: 1
    # Don't run all the tests yet:
@@ -185,9 +175,8 @@ debian-testing-msan:
    MESON_TEST_ARGS: "--suite glcpp --suite format"
    GALLIUM_DRIVERS: "freedreno,iris,nouveau,r300,r600,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus"
    VULKAN_DRIVERS: intel,amd,broadcom,virtio
-    RUN_MESON_TESTS: "false" # just too slow
-    # Do a host build for mesa-clc (msan complains about uninitialized
-    # values in the LLVM libs)
+    # Do a host build for intel-clc (msan complains about
+    # uninitialized values in the LLVM libs)
    HOST_BUILD_OPTIONS: >
      -D build-tests=false
      -D enable-glcpp-tests=false
@@ -197,49 +186,14 @@ debian-testing-msan:
      -D video-codecs=
      -D glx=disabled
      -D platforms=
-      -D mesa-clc=enabled
-      -D install-mesa-clc=true
-
-debian-testing-ubsan:
-  extends:
-    - debian-testing
-  stage: build-for-tests
-  timeout: 40m
-  variables:
-    BUILD_JOB_TIMEOUT: 30m
-    C_ARGS: >
-      -Wno-error=stringop-overflow
-      -Wno-error=stringop-truncation
-    CPP_ARGS: >
-      -Wno-error=array-bounds
-    GALLIUM_DRIVERS: "swrast"
-    VULKAN_DRIVERS: "swrast"
-    EXTRA_OPTION: >
-      -D b_sanitize=undefined
-      -D mesa-clc=system
-      -D gallium-rusticl=false
-      -D gallium-va=false
-      -D gallium-nine=false
-    S3_ARTIFACT_NAME: ""
-    ARTIFACTS_DEBUG_SYMBOLS: 1
-    RUN_MESON_TESTS: "false" # just too slow
-    HOST_BUILD_OPTIONS: >
-      -D build-tests=false
-      -D enable-glcpp-tests=false
-      -D gallium-opencl=disabled
-      -D gallium-rusticl=false
-      -D gallium-drivers=
-      -D vulkan-drivers=
-      -D video-codecs=
-      -D glx=disabled
-      -D platforms=
-      -D mesa-clc=enabled
-      -D install-mesa-clc=true
+      -D intel-clc=enabled
+      -D install-intel-clc=true

 debian-build-testing:
  extends: .meson-build
  stage: build-for-tests
  variables:
+    BUILDTYPE: debug
    UNWIND: "enabled"
    DRI_LOADERS: >
      -D glx=dri
@@ -252,16 +206,15 @@ debian-build-testing:
      -D gallium-vdpau=enabled
      -D gallium-va=enabled
      -D gallium-xa=enabled
-      -D gallium-nine=true
+      -D gallium-nine=false
      -D gallium-rusticl=false
-    GALLIUM_DRIVERS: "i915,iris,nouveau,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus"
-    VULKAN_DRIVERS: "intel_hasvk,imagination-experimental,microsoft-experimental,nouveau,swrast"
-    BUILDTYPE: "debugoptimized"
+    GALLIUM_DRIVERS: "iris,nouveau,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus"
+    VULKAN_DRIVERS: swrast
    EXTRA_OPTION: >
      -D spirv-to-dxil=true
      -D osmesa=true
      -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,lima,panfrost,asahi
-      -D perfetto=true
+    LLVM_VERSION: 15
    S3_ARTIFACT_NAME: debian-build-testing
  script:
    - *meson-build
@@ -298,8 +251,6 @@ shader-db:
    paths:
      - shader-db
  timeout: 15m
-  tags:
-    - kvm  # FIXME: this is a hack, should not be needed

 # Test a release build with -Werror so new warnings don't sneak in.
 debian-release:
@@ -308,6 +259,7 @@ debian-release:
    - !reference [.meson-build, needs]
    - !reference [.build-for-tests-jobs]
  variables:
+    LLVM_VERSION: 15
    UNWIND: "enabled"
    C_ARGS: >
      -Wno-error=stringop-overread
@@ -325,13 +277,13 @@ debian-release:
      -D gallium-nine=false
      -D gallium-rusticl=false
      -D llvm=enabled
-    GALLIUM_DRIVERS: "i915,iris,nouveau,r300,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus"
-    VULKAN_DRIVERS: "swrast,intel_hasvk,imagination-experimental,microsoft-experimental"
+    GALLIUM_DRIVERS: "i915,iris,nouveau,freedreno,r300,svga,llvmpipe,softpipe,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,crocus"
+    VULKAN_DRIVERS: "amd,imagination-experimental,microsoft-experimental"
    EXTRA_OPTION: >
      -D spirv-to-dxil=true
      -D osmesa=true
      -D tools=all
-      -D mesa-clc=enabled
+      -D intel-clc=enabled
      -D intel-rt=enabled
      -D imagination-srv=true
    BUILDTYPE: "release"
@@ -387,17 +339,20 @@ fedora-release:
    - !reference [.build-for-tests-jobs]
  variables:
    BUILDTYPE: "release"
-    # array-bounds are pure non-LTO gcc buggy warning
-    # maybe-uninitialized is misfiring in nir_lower_gs_intrinsics.c, and
-    # a "maybe" warning should never be an error anyway.
+    # array-bounds are pure non-LTO gcc buggy warning, verify after bump to F39
    C_ARGS: >
      -Wno-error=stringop-overflow
      -Wno-error=stringop-overread
      -Wno-error=array-bounds
-      -Wno-error=maybe-uninitialized
    CPP_ARGS: >
      -Wno-error=dangling-reference
      -Wno-error=overloaded-virtual
+    C_LINK_ARGS: >
+      -Wno-error=stringop-overflow
+      -Wno-error=stringop-overread
+    CPP_LINK_ARGS: >
+      -Wno-error=stringop-overflow
+      -Wno-error=stringop-overread
    DRI_LOADERS: >
      -D glx=dri
      -D gbm=enabled
@@ -424,12 +379,12 @@ fedora-release:
      -D llvm=enabled
      -D microsoft-clc=disabled
      -D shared-llvm=enabled
+    LLVM_VERSION: ""
    UNWIND: "disabled"
    VULKAN_DRIVERS: "amd,asahi,broadcom,freedreno,imagination-experimental,intel,intel_hasvk"

 debian-android:
  extends:
-    - .android-variables
    - .meson-cross
    - .use-debian/android_build
    - .ci-deqp-artifacts
@@ -456,20 +411,20 @@ debian-android:
      -D egl=enabled
      -D glvnd=disabled
      -D platforms=android
-    FORCE_FALLBACK_FOR: llvm
    EXTRA_OPTION: >
      -D android-stub=true
-      -D platform-sdk-version=${ANDROID_SDK_VERSION}
-      -D cpp_rtti=false
+      -D llvm=disabled
+      -D platform-sdk-version=33
      -D valgrind=disabled
      -D android-libbacktrace=disabled
-      -D mesa-clc=system
+      -D intel-clc=system
    GALLIUM_ST: >
      -D gallium-vdpau=disabled
      -D gallium-va=disabled
      -D gallium-xa=disabled
      -D gallium-nine=false
      -D gallium-rusticl=false
+    LLVM_VERSION: "15"
    PKG_CONFIG_LIBDIR: "/disable/non/android/system/pc/files"
    HOST_BUILD_OPTIONS: >
      -D build-tests=false
@@ -480,8 +435,8 @@ debian-android:
      -D video-codecs=
      -D glx=disabled
      -D platforms=
-      -D mesa-clc=enabled
-      -D install-mesa-clc=true
+      -D intel-clc=enabled
+      -D install-intel-clc=true
    ARTIFACTS_DEBUG_SYMBOLS: 1
    S3_ARTIFACT_NAME: mesa-x86_64-android-${BUILDTYPE}
  script:
@@ -490,12 +445,13 @@ debian-android:
    - export VULKAN_DRIVERS=freedreno,broadcom,virtio
    - *meson-build
    # x86_64 build:
-    # Can't do AMD drivers because they require LLVM, which is currently
-    # problematic in our Android builds.
+    # 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
+    # drivers because they requires LLVM, which we don't have an Android build
+    # of.
    - export CROSS=x86_64-linux-android
-    - export GALLIUM_DRIVERS=iris,virgl,zink,softpipe,llvmpipe,swrast
-    - export VULKAN_DRIVERS=intel,virtio,swrast
-    - .gitlab-ci/create-llvm-meson-wrap-file.sh
+    - export GALLIUM_DRIVERS=iris,virgl
+    - export VULKAN_DRIVERS=amd,intel
    - *meson-build
    - .gitlab-ci/prepare-artifacts.sh

@@ -523,7 +479,7 @@ debian-android:
  needs:
    - debian/arm64_build
  variables:
-    VULKAN_DRIVERS: "asahi,broadcom,freedreno"
+    VULKAN_DRIVERS: asahi,freedreno,broadcom
    GALLIUM_DRIVERS: "etnaviv,freedreno,lima,nouveau,panfrost,llvmpipe,softpipe,tegra,v3d,vc4,zink"
    BUILDTYPE: "debugoptimized"
  tags:
@@ -539,12 +495,11 @@ debian-arm32:
    DRI_LOADERS:
      -D glvnd=disabled
    # remove asahi & llvmpipe from the .meson-arm list because here we have llvm=disabled
-    VULKAN_DRIVERS: "broadcom,freedreno"
+    VULKAN_DRIVERS: freedreno,broadcom
    GALLIUM_DRIVERS: "etnaviv,freedreno,lima,nouveau,panfrost,softpipe,tegra,v3d,vc4,zink"
    EXTRA_OPTION: >
      -D llvm=disabled
      -D valgrind=disabled
-      -D gallium-rusticl=false
    S3_ARTIFACT_NAME: mesa-arm32-default-${BUILDTYPE}
    # The strip command segfaults, failing to strip the binary and leaving
    # tempfiles in our artifacts.
@@ -558,9 +513,6 @@ debian-arm32-asan:
    - debian-arm32
  stage: build-for-tests
  variables:
-    BUILD_JOB_TIMEOUT: 30m
-    GALLIUM_DRIVERS: "etnaviv"
-    VULKAN_DRIVERS: ""
    DRI_LOADERS:
      -D glvnd=disabled
    EXTRA_OPTION: >
@@ -568,10 +520,9 @@ debian-arm32-asan:
      -D b_sanitize=address
      -D valgrind=disabled
      -D tools=dlclose-skip
-      -D gallium-rusticl=false
    ARTIFACTS_DEBUG_SYMBOLS: 1
-    RUN_MESON_TESTS: "false" # just too slow
    S3_ARTIFACT_NAME: mesa-arm32-asan-${BUILDTYPE}
+    MESON_TEST_ARGS: "--no-suite mesa:compiler --no-suite mesa:util"

 debian-arm64:
  extends:
@@ -582,18 +533,17 @@ debian-arm64:
    C_ARGS: >
      -Wno-error=array-bounds
      -Wno-error=stringop-truncation
-    GALLIUM_DRIVERS: "etnaviv,freedreno,lima,panfrost,v3d,vc4,zink"
-    VULKAN_DRIVERS: "broadcom,freedreno,panfrost"
+    VULKAN_DRIVERS: "asahi,freedreno,broadcom,panfrost,imagination-experimental"
    DRI_LOADERS:
      -D glvnd=disabled
    EXTRA_OPTION: >
      -D valgrind=disabled
      -D imagination-srv=true
+      -D perfetto=true
      -D freedreno-kmds=msm,virtio
      -D teflon=true
    GALLIUM_ST:
      -D gallium-rusticl=true
-    RUN_MESON_TESTS: "false" # run by debian-arm64-build-testing
    S3_ARTIFACT_NAME: mesa-arm64-default-${BUILDTYPE}
  script:
    - *meson-build
@@ -604,43 +554,15 @@ debian-arm64-asan:
    - debian-arm64
  stage: build-for-tests
  variables:
-    BUILD_JOB_TIMEOUT: 30m
-    VULKAN_DRIVERS: "broadcom,freedreno"
-    GALLIUM_DRIVERS: "freedreno,vc4,v3d"
    DRI_LOADERS:
      -D glvnd=disabled
    EXTRA_OPTION: >
      -D b_sanitize=address
      -D valgrind=disabled
      -D tools=dlclose-skip
-      -D gallium-rusticl=false
    ARTIFACTS_DEBUG_SYMBOLS: 1
-    RUN_MESON_TESTS: "false" # just too slow
    S3_ARTIFACT_NAME: mesa-arm64-asan-${BUILDTYPE}
-
-debian-arm64-ubsan:
-  extends:
-    - debian-arm64
-  stage: build-for-tests
-  variables:
-    BUILD_JOB_TIMEOUT: 30m
-    VULKAN_DRIVERS: "broadcom"
-    GALLIUM_DRIVERS: "v3d,vc4"
-    C_ARGS: >
-      -Wno-error=array-bounds
-      -Wno-error=stringop-overflow
-      -Wno-error=stringop-truncation
-    CPP_ARGS: >
-      -Wno-error=array-bounds
-      -fno-var-tracking-assignments
-    DRI_LOADERS:
-      -D glvnd=disabled
-    EXTRA_OPTION: >
-      -D b_sanitize=undefined
-      -D gallium-rusticl=false
-    ARTIFACTS_DEBUG_SYMBOLS: 1
-    RUN_MESON_TESTS: "false" # just too slow
-    S3_ARTIFACT_NAME: mesa-arm64-ubsan-${BUILDTYPE}
+    MESON_TEST_ARGS: "--no-suite mesa:compiler"

 debian-arm64-build-test:
  extends:
@@ -650,12 +572,11 @@ debian-arm64-build-test:
    - !reference [.meson-arm, needs]
    - !reference [.build-for-tests-jobs]
  variables:
-    VULKAN_DRIVERS: "amd,asahi,imagination-experimental,nouveau"
+    VULKAN_DRIVERS: "amd,nouveau"
    DRI_LOADERS:
      -D glvnd=disabled
    EXTRA_OPTION: >
-      -D tools=panfrost,imagination
-      -D perfetto=true
+      -Dtools=panfrost,imagination

 debian-arm64-release:
  extends:
@@ -703,6 +624,7 @@ debian-clang:
    - !reference [.build-for-tests-jobs]
  variables:
    BUILDTYPE: debug
+    LLVM_VERSION: 15
    UNWIND: "enabled"
    C_ARGS: >
      -Wno-error=constant-conversion
@@ -715,7 +637,6 @@ debian-clang:
      -Wno-error=overloaded-virtual
      -Wno-error=tautological-constant-out-of-range-compare
      -Wno-error=unused-private-field
-      -Wno-error=vla-cxx-extension
    DRI_LOADERS: >
      -D glx=dri
      -D gbm=enabled
@@ -733,6 +654,7 @@ debian-clang:
      -D llvm=enabled
      -D microsoft-clc=disabled
      -D shared-llvm=enabled
+      -D opencl-spirv=true
      -D shared-glapi=enabled
    GALLIUM_DRIVERS: "iris,nouveau,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus,i915,asahi"
    VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,swrast,panfrost,imagination-experimental,microsoft-experimental,nouveau
@@ -743,7 +665,7 @@ debian-clang:
      -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,lima,panfrost,asahi,imagination
      -D vulkan-layers=device-select,overlay
      -D build-aco-tests=true
-      -D mesa-clc=enabled
+      -D intel-clc=enabled
      -D intel-rt=enabled
      -D imagination-srv=true
      -D teflon=true
@@ -770,6 +692,7 @@ debian-clang-release:
      -D llvm=enabled
      -D microsoft-clc=disabled
      -D shared-llvm=enabled
+      -D opencl-spirv=true
      -D shared-glapi=disabled

 windows-msvc:
@@ -793,6 +716,7 @@ debian-vulkan:
  variables:
    BUILD_JOB_TIMEOUT: 30m
    BUILDTYPE: debug
+    LLVM_VERSION: 15
    UNWIND: "disabled"
    DRI_LOADERS: >
      -D glx=disabled
@@ -831,17 +755,14 @@ debian-x86_32:
  variables:
    BUILDTYPE: debug
    CROSS: i386
-    VULKAN_DRIVERS: intel,amd,swrast,virtio,panfrost
-    GALLIUM_DRIVERS: "iris,nouveau,r300,r600,radeonsi,llvmpipe,softpipe,virgl,zink,crocus,d3d12,panfrost"
+    VULKAN_DRIVERS: intel,amd,swrast,virtio
+    GALLIUM_DRIVERS: "iris,nouveau,r300,r600,radeonsi,llvmpipe,softpipe,virgl,zink,crocus,d3d12"
+    LLVM_VERSION: 15
    DRI_LOADERS:
      -D glvnd=disabled
    EXTRA_OPTION: >
      -D vulkan-layers=device-select,overlay
-      -D mesa-clc=system
-    C_LINK_ARGS: >
-      -Wl,--no-warn-rwx-segments
-    CPP_LINK_ARGS: >
-      -Wl,--no-warn-rwx-segments
+      -D intel-clc=system
    HOST_BUILD_OPTIONS: >
      -D build-tests=false
      -D enable-glcpp-tests=false
@@ -851,8 +772,8 @@ debian-x86_32:
      -D video-codecs=
      -D glx=disabled
      -D platforms=
-      -D mesa-clc=enabled
-      -D install-mesa-clc=true
+      -D intel-clc=enabled
+      -D install-intel-clc=true

 # While s390 is dead, s390x is very much alive, and one of the last major
 # big-endian platforms, so it provides useful coverage.
@@ -870,6 +791,7 @@ debian-s390x:
    BUILDTYPE: debug
    CROSS: s390x
    GALLIUM_DRIVERS: "llvmpipe,virgl,zink"
+    LLVM_VERSION: 15
    VULKAN_DRIVERS: "swrast,virtio"
    DRI_LOADERS:
      -D glvnd=disabled
@@ -889,18 +811,17 @@ debian-ppc64el:
    DRI_LOADERS:
      -D glvnd=disabled

-# This job emits our scripts into artifacts so they can be reused for
-# job submission to hardware devices.
-python-artifacts:
+# This job tests our Python scripts, and also emits our scripts into
+# artifacts, so they can be reused for job submission to hardware devices.
+python-test:
  stage: build-for-tests
  extends:
    - .use-debian/x86_64_pyutils
    - .build-common
  variables:
    GIT_STRATEGY: fetch
-    S3_ARTIFACT_NAME: mesa-python-ci-artifacts
+    S3_ARTIFACT_NAME: mesa-python-test
  timeout: 10m
  script:
+    - .gitlab-ci/run-pytest.sh
    - .gitlab-ci/prepare-artifacts-python.sh
-  tags:
-    - placeholder-job
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -31,23 +31,24 @@ VARS=(
    CROSVM_GPU_ARGS
    CURRENT_SECTION
    DEQP_BIN_DIR
-    DEQP_FORCE_ASAN
+    DEQP_CONFIG
+    DEQP_EXPECTED_RENDERER
    DEQP_FRACTION
+    DEQP_HEIGHT
    DEQP_RUNNER_MAX_FAILS
+    DEQP_RUNNER_OPTIONS
    DEQP_SUITE
    DEQP_TEMP_DIR
+    DEQP_VER
+    DEQP_WIDTH
    DEVICE_NAME
    DRIVER_NAME
    EGL_PLATFORM
    ETNA_MESA_DEBUG
    FDO_CI_CONCURRENT
-    FDO_HTTP_CACHE_URI
    FDO_UPSTREAM_REPO
    FD_MESA_DEBUG
    FLAKES_CHANNEL
-    FLUSTER_CODECS
-    FLUSTER_FRACTION
-    FLUSTER_VECTORS_VERSION
    FREEDRENO_HANGCHECK_MS
    GALLIUM_DRIVER
    GALLIVM_PERF
@@ -115,8 +116,6 @@ VARS=(
    RADV_PERFTEST
    SKQP_ASSETS_DIR
    SKQP_BACKENDS
-    STORAGE_FORK_HOST_PATH
-    STORAGE_MAINLINE_HOST_PATH
    TU_DEBUG
    USE_ANGLE
    VIRGL_HOST_API
--- a/.gitlab-ci/common/init-stage2.sh
+++ b/.gitlab-ci/common/init-stage2.sh
@@ -140,14 +140,13 @@ if [ "$HWCI_FREQ_MAX" = "true" ]; then
  # 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.
-  /install/common/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

 # Start a little daemon to capture sysfs records and produce a JSON file
-KDL_PATH=/install/common/kdl.sh
-if [ -x "$KDL_PATH" ]; then
+if [ -x /kdl.sh ]; then
  echo "launch kdl.sh!"
-  $KDL_PATH &
+  /kdl.sh &
  BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
 else
  echo "kdl.sh not found!"
@@ -161,9 +160,8 @@ fi

 # Start a little daemon to capture the first devcoredump we encounter.  (They
 # expire after 5 minutes, so we poll for them).
-CAPTURE_DEVCOREDUMP=/install/common/capture-devcoredump.sh
-if [ -x "$CAPTURE_DEVCOREDUMP" ]; then
-  $CAPTURE_DEVCOREDUMP &
+if [ -x /capture-devcoredump.sh ]; then
+  /capture-devcoredump.sh &
  BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
 fi

@@ -230,7 +228,7 @@ cleanup
 # upload artifacts
 if [ -n "$S3_RESULTS_UPLOAD" ]; then
  tar --zstd -cf results.tar.zst results/;
-  s3_upload results.tar.zst https://"$S3_RESULTS_UPLOAD"/
+  ci-fairy s3cp --token-file "${S3_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
--- a/.gitlab-ci/container/alpine/x86_64_build.sh
+++ b/.gitlab-ci/container/alpine/x86_64_build.sh
@@ -6,9 +6,6 @@
 # ALPINE_X86_64_BUILD_TAG

 set -e
-
-. .gitlab-ci/setup-test-env.sh
-
 set -o xtrace

 EPHEMERAL=(
--- a/.gitlab-ci/container/alpine/x86_64_lava_ssh_client.sh
+++ b/.gitlab-ci/container/alpine/x86_64_lava_ssh_client.sh
@@ -4,9 +4,6 @@

 # shellcheck disable=SC1091
 set -e
-
-. .gitlab-ci/setup-test-env.sh
-
 set -o xtrace

 EPHEMERAL=(
--- a/.gitlab-ci/container/baremetal_build.sh
+++ b/.gitlab-ci/container/baremetal_build.sh
@@ -7,7 +7,7 @@ set -o xtrace
 # network transfer, disk usage, and runtime on test jobs)

 # shellcheck disable=SC2154 # arch is assigned in previous scripts
-if curl --fail -X HEAD -s "${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/${ARTIFACTS_SUFFIX}/${arch}/done"; then
+if curl -X HEAD -s "${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/${ARTIFACTS_SUFFIX}/${arch}/done"; then
  ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/${ARTIFACTS_SUFFIX}/${arch}"
 else
  ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${CI_PROJECT_PATH}/${ARTIFACTS_SUFFIX}/${arch}"
@@ -31,7 +31,7 @@ if [[ $arch == "arm64" ]]; then
        -O "${KERNEL_IMAGE_BASE}"/arm64/cheza-kernel

    DEVICE_TREES=""
-    DEVICE_TREES="$DEVICE_TREES apq8016-sbc-usb-host.dtb"
+    DEVICE_TREES="$DEVICE_TREES apq8016-sbc.dtb"
    DEVICE_TREES="$DEVICE_TREES apq8096-db820c.dtb"
    DEVICE_TREES="$DEVICE_TREES tegra210-p3450-0000.dtb"
    DEVICE_TREES="$DEVICE_TREES imx8mq-nitrogen.dtb"
--- a/.gitlab-ci/container/build-android-x86_64-llvm.sh
+++ b/.gitlab-ci/container/build-android-x86_64-llvm.sh
@@ -1,119 +0,0 @@
-#!/usr/bin/env bash
-
-set -exu
-
-# If CI vars are not set, assign an empty value, this prevents -u to fail
-: "${CI:=}"
-: "${CI_PROJECT_PATH:=}"
-
-# Early check for required env variables, relies on `set -u`
-: "$ANDROID_NDK_VERSION"
-: "$ANDROID_SDK_VERSION"
-: "$ANDROID_LLVM_VERSION"
-: "$ANDROID_LLVM_ARTIFACT_NAME"
-: "$S3_JWT_FILE"
-: "$S3_HOST"
-: "$S3_ANDROID_BUCKET"
-
-# Check for CI if the auth file used later on is non-empty
-if [ -n "$CI" ] && [ ! -s "${S3_JWT_FILE}" ]; then
-  echo "Error: ${S3_JWT_FILE} is empty." 1>&2
-  exit 1
-fi
-
-if curl -s -o /dev/null -I -L -f --retry 4 --retry-delay 15 "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CI_PROJECT_PATH}/${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst"; then
-  echo "Artifact ${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst already exists, skip re-building."
-
-  # Download prebuilt LLVM libraries for Android when they have not changed,
-  # to save some time
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    -o "/${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst" "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CI_PROJECT_PATH}/${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst"
-  tar -C / --zstd -xf "/${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst"
-  rm "/${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst"
-
-  exit
-fi
-
-# Install some dependencies needed to build LLVM
-EPHEMERAL=(
-  ninja-build
-  unzip
-)
-
-apt-get update
-apt-get install -y --no-install-recommends --no-remove "${EPHEMERAL[@]}"
-
-ANDROID_NDK="android-ndk-${ANDROID_NDK_VERSION}"
-ANDROID_NDK_ROOT="/${ANDROID_NDK}"
-if [ ! -d "$ANDROID_NDK_ROOT" ];
-then
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    -o "${ANDROID_NDK}.zip" \
-    "https://dl.google.com/android/repository/${ANDROID_NDK}-linux.zip"
-  unzip -d / "${ANDROID_NDK}.zip" "$ANDROID_NDK/source.properties" "$ANDROID_NDK/build/cmake/*" "$ANDROID_NDK/toolchains/llvm/*"
-  rm "${ANDROID_NDK}.zip"
-fi
-
-if [ ! -d "/llvm-project" ];
-then
-  mkdir "/llvm-project"
-  pushd "/llvm-project"
-  git init
-  git remote add origin https://github.com/llvm/llvm-project.git
-  git fetch --depth 1 origin "$ANDROID_LLVM_VERSION"
-  git checkout FETCH_HEAD
-  popd
-fi
-
-pushd "/llvm-project"
-
-# Checkout again the intended version, just in case of a pre-existing full clone
-git checkout "$ANDROID_LLVM_VERSION" || true
-
-LLVM_INSTALL_PREFIX="/${ANDROID_LLVM_ARTIFACT_NAME}"
-
-rm -rf build/
-cmake -GNinja -S llvm -B build/ \
-    -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake" \
-    -DANDROID_ABI=x86_64 \
-    -DANDROID_PLATFORM="android-${ANDROID_SDK_VERSION}" \
-    -DANDROID_NDK="${ANDROID_NDK_ROOT}" \
-    -DCMAKE_ANDROID_ARCH_ABI=x86_64 \
-    -DCMAKE_ANDROID_NDK="${ANDROID_NDK_ROOT}" \
-    -DCMAKE_BUILD_TYPE=MinSizeRel \
-    -DCMAKE_SYSTEM_NAME=Android \
-    -DCMAKE_SYSTEM_VERSION="${ANDROID_SDK_VERSION}" \
-    -DCMAKE_INSTALL_PREFIX="${LLVM_INSTALL_PREFIX}" \
-    -DCMAKE_CXX_FLAGS="-march=x86-64 --target=x86_64-linux-android${ANDROID_SDK_VERSION} -fno-rtti" \
-    -DLLVM_HOST_TRIPLE="x86_64-linux-android${ANDROID_SDK_VERSION}" \
-    -DLLVM_TARGETS_TO_BUILD=X86 \
-    -DLLVM_BUILD_LLVM_DYLIB=OFF \
-    -DLLVM_BUILD_TESTS=OFF \
-    -DLLVM_BUILD_EXAMPLES=OFF \
-    -DLLVM_BUILD_DOCS=OFF \
-    -DLLVM_BUILD_TOOLS=OFF \
-    -DLLVM_ENABLE_RTTI=OFF \
-    -DLLVM_BUILD_INSTRUMENTED_COVERAGE=OFF \
-    -DLLVM_NATIVE_TOOL_DIR="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin" \
-    -DLLVM_ENABLE_PIC=False \
-    -DLLVM_OPTIMIZED_TABLEGEN=ON
-
-ninja "-j${FDO_CI_CONCURRENT:-4}" -C build/ install
-
-popd
-
-rm -rf /llvm-project
-
-tar --zstd -cf "${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst" "$LLVM_INSTALL_PREFIX"
-
-# If run in CI upload the tar.zst archive to S3 to avoid rebuilding it if the
-# version does not change, and delete it.
-# The file is not deleted for non-CI because it can be useful in local runs.
-if [ -n "$CI" ]; then
-  s3_upload "${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst" "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CI_PROJECT_PATH}/"
-  rm "${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst"
-fi
-
-rm -rf "$LLVM_INSTALL_PREFIX"
-
-apt-get purge -y "${EPHEMERAL[@]}"
--- a/.gitlab-ci/container/build-angle.sh
+++ b/.gitlab-ci/container/build-angle.sh
@@ -6,8 +6,6 @@

 set -uex

-uncollapsed_section_start angle "Building angle"
-
 ANGLE_REV="76025caa1a059f464a2b0e8f879dbd4746f092b9"
 SCRIPTS_DIR="$(pwd)/.gitlab-ci"
 ANGLE_PATCH_DIR="${SCRIPTS_DIR}/container/patches"
@@ -30,7 +28,7 @@ angle_patch_files=(
 )
 for patch in "${angle_patch_files[@]}"; do
  echo "Apply patch to ANGLE from ${patch}"
-  GIT_COMMITTER_DATE="$(LC_TIME=C date -d@0)" git am < "${ANGLE_PATCH_DIR}/${patch}"
+  GIT_COMMITTER_DATE=$(date -d@0) git am < "${ANGLE_PATCH_DIR}/${patch}"
 done

 {
@@ -99,5 +97,3 @@ rm -rf out
 popd
 rm -rf /depot-tools
 rm -rf /angle-build
-
-section_end angle
--- a/.gitlab-ci/container/build-apitrace.sh
+++ b/.gitlab-ci/container/build-apitrace.sh
@@ -9,8 +9,6 @@

 set -uex

-uncollapsed_section_start apitrace "Building apitrace"
-
 APITRACE_VERSION="0a6506433e1f9f7b69757b4e5730326970c4321a"

 git clone https://github.com/apitrace/apitrace.git --single-branch --no-checkout /apitrace
@@ -25,5 +23,3 @@ cp _build/eglretrace build
 ${STRIP_CMD:-strip} build/*
 find . -not -path './build' -not -path './build/*' -delete
 popd
-
-section_end apitrace
--- a/.gitlab-ci/container/build-bindgen.sh
+++ b/.gitlab-ci/container/build-bindgen.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting

-uncollapsed_section_start bindgen "Building bindgen"
-
 BINDGEN_VER=0.65.1
 CBINDGEN_VER=0.26.0

@@ -20,4 +18,3 @@ RUSTFLAGS='-L native=/usr/local/lib' cargo install \
  -j ${FDO_CI_CONCURRENT:-4} \
  --root /usr/local

-section_end bindgen
--- a/.gitlab-ci/container/build-crosvm.sh
+++ b/.gitlab-ci/container/build-crosvm.sh
@@ -1,27 +1,18 @@
 #!/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_BASE_TAG
-# DEBIAN_TEST_GL_TAG
-# DEBIAN_TEST_VK_TAG
-# KERNEL_ROOTFS_TAG
-
 set -uex

-uncollapsed_section_start crosvm "Building crosvm"
-
 git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"

-CROSVM_VERSION=2118fbb57ca26b495a9aa407845c7729d697a24b
+CROSVM_VERSION=1641c55bcc922588e24de73e9cca7b5e4005bd6d
 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=57a2b82e0958f08d02ade8400786e1ca0935c9b1
+VIRGLRENDERER_VERSION=d9c002fac153b834a2c17731f2b85c36e333e102
 rm -rf 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
@@ -51,5 +42,3 @@ CROSVM_USE_SYSTEM_MINIGBM=1 CROSVM_USE_SYSTEM_VIRGLRENDERER=1 RUSTFLAGS='-L nati
 popd

 rm -rf /platform/crosvm
-
-section_end crosvm
--- a/.gitlab-ci/container/build-deqp-runner.sh
+++ b/.gitlab-ci/container/build-deqp-runner.sh
@@ -9,9 +9,7 @@

 set -uex

-uncollapsed_section_start deqp-runner "Building deqp-runner"
-
-DEQP_RUNNER_VERSION=0.20.3
+DEQP_RUNNER_VERSION=0.20.2

 commits_to_backport=(
 )
@@ -96,5 +94,3 @@ popd
 if [ -z "${DEQP_RUNNER_GIT_TAG:-}${DEQP_RUNNER_GIT_REV:-}" ]; then
    rm -f /usr/local/bin/igt-runner
 fi
-
-section_end deqp-runner
--- a/.gitlab-ci/container/build-deqp.sh
+++ b/.gitlab-ci/container/build-deqp.sh
@@ -8,24 +8,15 @@
 # DEBIAN_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG

-set -ue -o pipefail
-
-# shellcheck disable=SC2153
-deqp_api=${DEQP_API,,}
-
-uncollapsed_section_start deqp-$deqp_api "Building dEQP $DEQP_API"
-
-set -x
+set -uex -o pipefail

 # See `deqp_build_targets` below for which release is used to produce which
 # binary. Unless this comment has bitrotten:
-# - the commit from the main branch produces the deqp tools and `deqp-vk`,
 # - the VK release produces `deqp-vk`,
 # - the GL release produces `glcts`, and
 # - the GLES release produces `deqp-gles*` and `deqp-egl`

-DEQP_MAIN_COMMIT=a9988483c0864d7190e5e6264ccead95423dfd00
-DEQP_VK_VERSION=1.4.1.1
+DEQP_VK_VERSION=1.3.10.0
 DEQP_GL_VERSION=4.6.5.0
 DEQP_GLES_VERSION=3.2.11.0

@@ -35,36 +26,29 @@ DEQP_GLES_VERSION=3.2.11.0
 # Both list variables would have comments explaining the reasons behind the
 # patches.

-# shellcheck disable=SC2034
-main_cts_commits_to_backport=(
-    # If you find yourself wanting to add something in here, consider whether
-    # bumping DEQP_MAIN_COMMIT is not a better solution :)
-)
-
-# shellcheck disable=SC2034
-main_cts_patch_files=(
-)
-
 # shellcheck disable=SC2034
 vk_cts_commits_to_backport=(
+    # Remove multi-line test results in DRM format modifier tests
+    8c95af68a2a85cbdc7e1d9267ab029f73e9427d2
 )

 # shellcheck disable=SC2034
 vk_cts_patch_files=(
 )

+if [ "${DEQP_TARGET}" = 'android' ]; then
+  vk_cts_patch_files+=(
+    build-deqp-vk_Allow-running-on-Android-from-the-command-line.patch
+    build-deqp-vk_Android-prints-to-stdout-instead-of-logcat.patch
+  )
+fi
+
 # shellcheck disable=SC2034
 gl_cts_commits_to_backport=(
-  # Add #include <cmath> in deMath.h when being compiled by C++
-  71808fe7d0a640dfd703e845d93ba1c5ab751055
-  # Revert "Add #include <cmath> in deMath.h when being compiled by C++ compiler"
-  # This also adds an alternative fix along with the revert.
-  6164879a0acce258637d261592a9c395e564b361
 )

 # shellcheck disable=SC2034
 gl_cts_patch_files=(
-  build-deqp-gl_Build-Don-t-build-Vulkan-utilities-for-GL-builds.patch
 )

 if [ "${DEQP_TARGET}" = 'android' ]; then
@@ -77,16 +61,10 @@ fi
 # shellcheck disable=SC2034
 # GLES builds also EGL
 gles_cts_commits_to_backport=(
-  # Add #include <cmath> in deMath.h when being compiled by C++
-  71808fe7d0a640dfd703e845d93ba1c5ab751055
-  # Revert "Add #include <cmath> in deMath.h when being compiled by C++ compiler"
-  # This also adds an alternative fix along with the revert.
-  6164879a0acce258637d261592a9c395e564b361
 )

 # shellcheck disable=SC2034
 gles_cts_patch_files=(
-  build-deqp-gl_Build-Don-t-build-Vulkan-utilities-for-GL-builds.patch
 )

 if [ "${DEQP_TARGET}" = 'android' ]; then
@@ -105,142 +83,86 @@ git config --global user.name "Mesa CI"

 # shellcheck disable=SC2153
 case "${DEQP_API}" in
-  tools) DEQP_VERSION="$DEQP_MAIN_COMMIT";;
-  *-main) DEQP_VERSION="$DEQP_MAIN_COMMIT";;
  VK) DEQP_VERSION="vulkan-cts-$DEQP_VK_VERSION";;
  GL) DEQP_VERSION="opengl-cts-$DEQP_GL_VERSION";;
  GLES) DEQP_VERSION="opengl-es-cts-$DEQP_GLES_VERSION";;
-  *) echo "Unexpected DEQP_API value: $DEQP_API"; exit 1;;
 esac

-mkdir -p /VK-GL-CTS
+git clone \
+    https://github.com/KhronosGroup/VK-GL-CTS.git \
+    -b $DEQP_VERSION \
+    --depth 1 \
+    /VK-GL-CTS
 pushd /VK-GL-CTS
-[ -e .git ] || {
-  git init
-  git remote add origin https://github.com/KhronosGroup/VK-GL-CTS.git
-}
-git fetch --depth 1 origin "$DEQP_VERSION"
-git checkout FETCH_HEAD
-DEQP_COMMIT=$(git rev-parse FETCH_HEAD)

-if [ "$DEQP_VERSION" = "$DEQP_MAIN_COMMIT" ]; then
-  git fetch origin main
-  if ! git merge-base --is-ancestor "$DEQP_MAIN_COMMIT" origin/main; then
-    echo "VK-GL-CTS commit $DEQP_MAIN_COMMIT is not a commit from the main branch."
-    exit 1
-  fi
-fi
+mkdir -p /deqp

-mkdir -p /deqp-$deqp_api
+# shellcheck disable=SC2153
+deqp_api=${DEQP_API,,}

-if [ "$DEQP_VERSION" = "$DEQP_MAIN_COMMIT" ]; then
-  prefix="main"
-else
-  prefix="$deqp_api"
-fi
-
-cts_commits_to_backport="${prefix}_cts_commits_to_backport[@]"
+cts_commits_to_backport="${deqp_api}_cts_commits_to_backport[@]"
 for commit in "${!cts_commits_to_backport}"
 do
  PATCH_URL="https://github.com/KhronosGroup/VK-GL-CTS/commit/$commit.patch"
  echo "Apply patch to ${DEQP_API} CTS from $PATCH_URL"
  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 $PATCH_URL | \
-    GIT_COMMITTER_DATE=$(LC_TIME=C date -d@0) git am -
+    GIT_COMMITTER_DATE=$(date -d@0) git am -
 done

-cts_patch_files="${prefix}_cts_patch_files[@]"
+cts_patch_files="${deqp_api}_cts_patch_files[@]"
 for patch in "${!cts_patch_files}"
 do
  echo "Apply patch to ${DEQP_API} CTS from $patch"
-  GIT_COMMITTER_DATE=$(LC_TIME=C date -d@0) git am < $OLDPWD/.gitlab-ci/container/patches/$patch
+  GIT_COMMITTER_DATE=$(date -d@0) git am < $OLDPWD/.gitlab-ci/container/patches/$patch
 done

 {
-  if [ "$DEQP_VERSION" = "$DEQP_MAIN_COMMIT" ]; then
-    commit_desc=$(git show --no-patch --format='commit %h on %ci' --abbrev=10 "$DEQP_COMMIT")
-    echo "dEQP $DEQP_API at $commit_desc"
-  else
-    echo "dEQP $DEQP_API version $DEQP_VERSION"
-  fi
-  if [ "$(git rev-parse HEAD)" != "$DEQP_COMMIT" ]; then
-    echo "The following local patches are applied on top:"
-    git log --reverse --oneline "$DEQP_COMMIT".. --format='- %s'
-  fi
-} > /deqp-$deqp_api/deqp-$deqp_api-version
+  echo "dEQP base version $DEQP_VERSION"
+  echo "The following local patches are applied on top:"
+  git log --reverse --oneline $DEQP_VERSION.. --format='- %s'
+} > /deqp/version-$deqp_api

 # --insecure is due to SSL cert failures hitting sourceforge for zlib and
 # libpng (sigh).  The archives get their checksums checked anyway, and git
 # always goes through ssh or https.
 python3 external/fetch_sources.py --insecure

-if [[ "$DEQP_API" = tools ]]; then
-  # Save the testlog stylesheets:
-  cp doc/testlog-stylesheet/testlog.{css,xsl} /deqp-$deqp_api
-fi
-
+# Save the testlog stylesheets:
+cp doc/testlog-stylesheet/testlog.{css,xsl} /deqp
 popd

-deqp_build_targets=()
-case "${DEQP_API}" in
-  VK|VK-main)
-    deqp_build_targets+=(deqp-vk)
-    ;;
-  GL)
-    deqp_build_targets+=(glcts)
-    ;;
-  GLES)
-    deqp_build_targets+=(deqp-gles{2,3,31})
-    deqp_build_targets+=(glcts)  # needed for gles*-khr tests
-    # deqp-egl also comes from this build, but it is handled separately below.
-    ;;
-  tools)
-    deqp_build_targets+=(testlog-to-xml)
-    deqp_build_targets+=(testlog-to-csv)
-    deqp_build_targets+=(testlog-to-junit)
-    ;;
-esac
-
-OLD_IFS="$IFS"
-IFS=";"
-CMAKE_SBT="${deqp_build_targets[*]}"
-IFS="$OLD_IFS"
-
-pushd /deqp-$deqp_api
+pushd /deqp

 if [ "${DEQP_API}" = 'GLES' ]; then
  if [ "${DEQP_TARGET}" = 'android' ]; then
    cmake -S /VK-GL-CTS -B . -G Ninja \
        -DDEQP_TARGET=android \
        -DCMAKE_BUILD_TYPE=Release \
-        -DSELECTED_BUILD_TARGETS="deqp-egl" \
        ${EXTRA_CMAKE_ARGS:-}
-    ninja modules/egl/deqp-egl
-    mv modules/egl/deqp-egl{,-android}
+    mold --run ninja modules/egl/deqp-egl
+    mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-android
  else
    # When including EGL/X11 testing, do that build first and save off its
    # deqp-egl binary.
    cmake -S /VK-GL-CTS -B . -G Ninja \
        -DDEQP_TARGET=x11_egl_glx \
        -DCMAKE_BUILD_TYPE=Release \
-        -DSELECTED_BUILD_TARGETS="deqp-egl" \
        ${EXTRA_CMAKE_ARGS:-}
-    ninja modules/egl/deqp-egl
-    mv modules/egl/deqp-egl{,-x11}
+    mold --run ninja modules/egl/deqp-egl
+    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 \
-        -DSELECTED_BUILD_TARGETS="deqp-egl" \
        ${EXTRA_CMAKE_ARGS:-}
-    ninja modules/egl/deqp-egl
-    mv modules/egl/deqp-egl{,-wayland}
+    mold --run ninja modules/egl/deqp-egl
+    mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-wayland
  fi
 fi

 cmake -S /VK-GL-CTS -B . -G Ninja \
      -DDEQP_TARGET=${DEQP_TARGET} \
      -DCMAKE_BUILD_TYPE=Release \
-      -DSELECTED_BUILD_TARGETS="${CMAKE_SBT}" \
      ${EXTRA_CMAKE_ARGS:-}

 # Make sure `default` doesn't silently stop detecting one of the platforms we care about
@@ -250,72 +172,90 @@ if [ "${DEQP_TARGET}" = 'default' ]; then
  grep -q DEQP_SUPPORT_XCB=1 build.ninja
 fi

-ninja "${deqp_build_targets[@]}"
+deqp_build_targets=()
+case "${DEQP_API}" in
+  VK)
+    deqp_build_targets+=(deqp-vk)
+    ;;
+  GL)
+    deqp_build_targets+=(glcts)
+    ;;
+  GLES)
+    deqp_build_targets+=(deqp-gles{2,3,31})
+    # deqp-egl also comes from this build, but it is handled separately above.
+    ;;
+esac
+if [ "${DEQP_TARGET}" != 'android' ]; then
+  deqp_build_targets+=(testlog-to-xml)
+  deqp_build_targets+=(testlog-to-csv)
+  deqp_build_targets+=(testlog-to-junit)
+fi

-if [ "$DEQP_API" != tools ]; then
+mold --run ninja "${deqp_build_targets[@]}"
+
+if [ "${DEQP_TARGET}" != 'android' ]; then
    # Copy out the mustpass lists we want.
-    mkdir -p mustpass
+    mkdir -p /deqp/mustpass

-    if [ "${DEQP_API}" = 'VK' ] || [ "${DEQP_API}" = 'VK-main' ]; then
+    if [ "${DEQP_API}" = 'VK' ]; then
        for mustpass in $(< /VK-GL-CTS/external/vulkancts/mustpass/main/vk-default.txt) ; do
            cat /VK-GL-CTS/external/vulkancts/mustpass/main/$mustpass \
-                >> mustpass/vk-main.txt
+                >> /deqp/mustpass/vk-main.txt
        done
    fi

    if [ "${DEQP_API}" = 'GL' ]; then
        cp \
            /VK-GL-CTS/external/openglcts/data/gl_cts/data/mustpass/gl/khronos_mustpass/main/*-main.txt \
-            mustpass/
+            /deqp/mustpass/
        cp \
            /VK-GL-CTS/external/openglcts/data/gl_cts/data/mustpass/gl/khronos_mustpass_single/main/*-single.txt \
-            mustpass/
+            /deqp/mustpass/
    fi

    if [ "${DEQP_API}" = 'GLES' ]; then
        cp \
            /VK-GL-CTS/external/openglcts/data/gl_cts/data/mustpass/gles/aosp_mustpass/main/*.txt \
-            mustpass/
+            /deqp/mustpass/
        cp \
            /VK-GL-CTS/external/openglcts/data/gl_cts/data/mustpass/egl/aosp_mustpass/main/egl-main.txt \
-            mustpass/
+            /deqp/mustpass/
        cp \
            /VK-GL-CTS/external/openglcts/data/gl_cts/data/mustpass/gles/khronos_mustpass/main/*-main.txt \
-            mustpass/
+            /deqp/mustpass/
    fi

-    # Compress the caselists, since Vulkan's in particular are gigantic; higher
-    # compression levels provide no real measurable benefit.
-    zstd -1 --rm mustpass/*.txt
-fi
-
-if [ "$DEQP_API" = tools ]; then
    # Save *some* executor utils, but otherwise strip things down
    # to reduct deqp build size:
-    mv executor/testlog-to-* .
-    rm -rf executor
+    mkdir /deqp/executor.save
+    cp /deqp/executor/testlog-to-* /deqp/executor.save
+    rm -rf /deqp/executor
+    mv /deqp/executor.save /deqp/executor
 fi

+# Compress the caselists, since Vulkan's in particular are gigantic; higher
+# compression levels provide no real measurable benefit.
+zstd -1 --rm /deqp/mustpass/*.txt
+
 # Remove other mustpass files, since we saved off the ones we wanted to conventient locations above.
-rm -rf external/**/mustpass/
-rm -rf external/vulkancts/modules/vulkan/vk-main*
-rm -rf external/vulkancts/modules/vulkan/vk-default
+rm -rf /deqp/external/**/mustpass/
+rm -rf /deqp/external/vulkancts/modules/vulkan/vk-main*
+rm -rf /deqp/external/vulkancts/modules/vulkan/vk-default

-rm -rf external/openglcts/modules/cts-runner
-rm -rf modules/internal
-rm -rf execserver
-rm -rf framework
+rm -rf /deqp/external/openglcts/modules/cts-runner
+rm -rf /deqp/modules/internal
+rm -rf /deqp/execserver
+rm -rf /deqp/framework
 find . -depth \( -iname '*cmake*' -o -name '*ninja*' -o -name '*.o' -o -name '*.a' \) -exec rm -rf {} \;
-if [ "${DEQP_API}" = 'VK' ] || [ "${DEQP_API}" = 'VK-main' ]; then
+if [ "${DEQP_API}" = 'VK' ]; then
  ${STRIP_CMD:-strip} external/vulkancts/modules/vulkan/deqp-vk
 fi
-if [ "${DEQP_API}" = 'GL' ] || [ "${DEQP_API}" = 'GLES' ]; then
+if [ "${DEQP_API}" = 'GL' ]; then
  ${STRIP_CMD:-strip} external/openglcts/modules/glcts
 fi
 if [ "${DEQP_API}" = 'GLES' ]; then
  ${STRIP_CMD:-strip} modules/*/deqp-*
 fi
 du -sh ./*
+rm -rf /VK-GL-CTS
 popd
-
-section_end deqp-$deqp_api
--- a/.gitlab-ci/container/build-directx-headers.sh
+++ b/.gitlab-ci/container/build-directx-headers.sh
@@ -7,13 +7,9 @@

 set -uex

-uncollapsed_section_start directx-headers "Building directx-headers"
-
 git clone https://github.com/microsoft/DirectX-Headers -b v1.614.1 --depth 1
 pushd DirectX-Headers
 meson setup build --backend=ninja --buildtype=release -Dbuild-test=false ${EXTRA_MESON_ARGS:-}
 meson install -C build
 popd
 rm -rf DirectX-Headers
-
-section_end directx-headers
--- a/.gitlab-ci/container/build-fluster.sh
+++ b/.gitlab-ci/container/build-fluster.sh
@@ -1,39 +0,0 @@
-#!/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
-
-# Install fluster in /usr/local.
-
-FLUSTER_REVISION="e997402978f62428fffc8e5a4a709690d9ca9bc5"
-
-git clone https://github.com/fluendo/fluster.git --single-branch --no-checkout
-
-pushd fluster || exit
-git checkout ${FLUSTER_REVISION}
-popd || exit
-
-if [ "${SKIP_UPDATE_FLUSTER_VECTORS}" != 1 ]; then
-    # Download the necessary vectors: H264, H265 and VP9
-    # When updating FLUSTER_REVISION, make sure to update the vectors if necessary or
-    # fluster-runner will report Missing results.
-    fluster/fluster.py download \
-	JVT-AVC_V1 JVT-FR-EXT JVT-MVC JVT-SVC_V1 \
-	JCT-VC-3D-HEVC JCT-VC-HEVC_V1 JCT-VC-MV-HEVC JCT-VC-RExt JCT-VC-SCC JCT-VC-SHVC \
-	VP9-TEST-VECTORS-HIGH VP9-TEST-VECTORS
-
-    # Build fluster vectors archive and upload it
-    tar --zstd -cf "vectors.tar.zst" fluster/resources/
-    s3_upload vectors.tar.zst "https://${S3_PATH_FLUSTER}/"
-
-    touch /lava-files/done
-    s3_upload /lava-files/done "https://${S3_PATH_FLUSTER}/"
-
-    # Don't include the vectors in the rootfs
-    rm -fr fluster/resources/*
-fi
-
-mkdir -p "${ROOTFS}/usr/local/"
-mv fluster "${ROOTFS}/usr/local/"
-
--- a/.gitlab-ci/container/build-fossilize.sh
+++ b/.gitlab-ci/container/build-fossilize.sh
@@ -7,8 +7,6 @@

 set -ex

-uncollapsed_section_start fossilize "Building fossilize"
-
 git clone https://github.com/ValveSoftware/Fossilize.git
 cd Fossilize
 git checkout b43ee42bbd5631ea21fe9a2dee4190d5d875c327
@@ -19,5 +17,3 @@ cmake -S .. -B . -G Ninja -DCMAKE_BUILD_TYPE=Release
 ninja -C . install
 cd ../..
 rm -rf Fossilize
-
-section_end fossilize
--- a/.gitlab-ci/container/build-gfxreconstruct.sh
+++ b/.gitlab-ci/container/build-gfxreconstruct.sh
@@ -2,8 +2,6 @@

 set -ex

-uncollapsed_section_start gfxreconstruct "Building gfxreconstruct"
-
 GFXRECONSTRUCT_VERSION=761837794a1e57f918a85af7000b12e531b178ae

 git clone https://github.com/LunarG/gfxreconstruct.git \
@@ -19,5 +17,3 @@ cmake -S . -B _build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:
 cmake --build _build --parallel --target tools/{replay,info}/install/strip
 find . -not -path './build' -not -path './build/*' -delete
 popd
-
-section_end gfxreconstruct
--- a/.gitlab-ci/container/build-kdl.sh
+++ b/.gitlab-ci/container/build-kdl.sh
@@ -3,8 +3,6 @@

 set -ex

-uncollapsed_section_start kdl "Building kdl"
-
 KDL_REVISION="cbbe5fd54505fd03ee34f35bfd16794f0c30074f"
 KDL_CHECKOUT_DIR="/tmp/ci-kdl.git"

@@ -28,5 +26,3 @@ popd
 )

 rm -rf ${KDL_CHECKOUT_DIR}
-
-section_end kdl
--- a/.gitlab-ci/container/build-libclc.sh
+++ b/.gitlab-ci/container/build-libclc.sh
@@ -2,8 +2,6 @@

 set -uex

-uncollapsed_section_start libclc "Building libclc"
-
 export LLVM_CONFIG="llvm-config-${LLVM_VERSION:?"llvm unset!"}"
 LLVM_TAG="llvmorg-15.0.7"

@@ -31,5 +29,3 @@ ln -s /usr/share/clc/spirv-mesa3d-.spv /usr/lib/clc/

 du -sh ./*
 rm -rf /libclc /llvm-project
-
-section_end libclc
--- a/.gitlab-ci/container/build-libdrm.sh
+++ b/.gitlab-ci/container/build-libdrm.sh
@@ -5,8 +5,6 @@

 set -uex

-uncollapsed_section_start libdrm "Building libdrm"
-
 export LIBDRM_VERSION=libdrm-2.4.122

 curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \
@@ -17,5 +15,3 @@ meson setup build -D vc4=disabled -D freedreno=disabled -D etnaviv=disabled ${EX
 meson install -C build
 cd ..
 rm -rf "$LIBDRM_VERSION"
-
-section_end libdrm
--- a/.gitlab-ci/container/build-llvm-spirv.sh
+++ b/.gitlab-ci/container/build-llvm-spirv.sh
@@ -2,13 +2,7 @@

 set -ex

-uncollapsed_section_start llvm-spirv "Building LLVM-SPIRV-Translator"
-
-if [ "${LLVM_VERSION:?llvm version not set}" -ge 18 ]; then
-  VER="${LLVM_VERSION}.1.0"
-else
-  VER="${LLVM_VERSION}.0.0"
-fi
+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"
@@ -26,5 +20,3 @@ popd

 du -sh "SPIRV-LLVM-Translator-${VER}"
 rm -rf "SPIRV-LLVM-Translator-${VER}"
-
-section_end llvm-spirv
--- a/.gitlab-ci/container/build-mold.sh
+++ b/.gitlab-ci/container/build-mold.sh
@@ -10,8 +10,6 @@ set -ex
 # FEDORA_X86_64_BUILD_TAG
 # KERNEL_ROOTFS_TAG

-uncollapsed_section_start mold "Building mold"
-
 MOLD_VERSION="2.32.0"

 git clone -b v"$MOLD_VERSION" --single-branch --depth 1 https://github.com/rui314/mold.git
@@ -21,12 +19,5 @@ cmake -DCMAKE_BUILD_TYPE=Release -D BUILD_TESTING=OFF -D MOLD_LTO=ON
 cmake --build . --parallel "${FDO_CI_CONCURRENT:-4}"
 cmake --install . --strip

-# Always use mold from now on
-find /usr/bin \( -name '*-ld' -o -name 'ld' \) \
-  -exec ln -sf /usr/local/bin/ld.mold {} \; \
-  -exec ls -l {} +
-
 popd
 rm -rf mold
-
-section_end mold
--- a/.gitlab-ci/container/build-ninetests.sh
+++ b/.gitlab-ci/container/build-ninetests.sh
@@ -6,8 +6,6 @@

 set -ex -o pipefail

-uncollapsed_section_start ninetests "Building Nine tests"
-
 ### Careful editing anything below this line

 git config --global user.email "mesa@example.com"
@@ -25,5 +23,3 @@ mv NineTests/NineTests /NineTests/

 popd
 rm -rf /Xnine
-
-section_end ninetests
--- a/.gitlab-ci/container/build-piglit.sh
+++ b/.gitlab-ci/container/build-piglit.sh
@@ -2,15 +2,13 @@
 # shellcheck disable=SC2086 # we want word splitting
 set -uex

-uncollapsed_section_start piglit "Building piglit"
-
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
 # DEBIAN_TEST_GL_TAG
 # DEBIAN_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG

-REV="68658566da1c9cd6a378b5ca36999617e26440e7"
+REV="c2b31333926a6171c3c02d182b756efad7770410"

 git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
 pushd /piglit
@@ -34,5 +32,3 @@ if [ "${PIGLIT_BUILD_TARGETS:-}" = "piglit_replayer" ]; then
         -exec rm -rf {} \; 2>/dev/null
 fi
 popd
-
-section_end piglit
--- a/.gitlab-ci/container/build-rust.sh
+++ b/.gitlab-ci/container/build-rust.sh
@@ -5,16 +5,17 @@

 set -ex

-uncollapsed_section_start rust "Building Rust toolchain"
-
 # cargo (and rustup) wants to store stuff in $HOME/.cargo, and binaries in
 # $HOME/.cargo/bin.  Make bin a link to a public bin directory so the commands
 # are just available to all build jobs.
 mkdir -p "$HOME"/.cargo
 ln -s /usr/local/bin "$HOME"/.cargo/bin

-# Pick a specific snapshot from rustup so the compiler doesn't drift on us.
-RUST_VERSION=1.78.0-2024-05-02
+# Rusticl requires at least Rust 1.66.0 and NAK requires 1.73.0
+#
+# Also, pick a specific snapshot from rustup so the compiler doesn't drift on
+# us.
+RUST_VERSION=1.76.0-2024-02-08

 # 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
@@ -36,5 +37,3 @@ linker = "arm-linux-gnueabihf-gcc"
 [target.aarch64-unknown-linux-gnu]
 linker = "aarch64-linux-gnu-gcc"
 EOF
-
-section_end rust
--- a/.gitlab-ci/container/build-shader-db.sh
+++ b/.gitlab-ci/container/build-shader-db.sh
@@ -6,13 +6,9 @@

 set -ex

-uncollapsed_section_start shader-db "Building shader-db"
-
 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
-
-section_end shader-db
--- a/.gitlab-ci/container/build-skqp.sh
+++ b/.gitlab-ci/container/build-skqp.sh
@@ -10,8 +10,6 @@

 set -uex

-uncollapsed_section_start skqp "Building skqp"
-
 SKQP_BRANCH=android-cts-12.1_r5

 SCRIPT_DIR="$(pwd)/.gitlab-ci/container"
@@ -68,8 +66,8 @@ cat "${SKQP_PATCH_DIR}"/build-skqp_*.patch |

 # hack for skqp see the clang
 pushd /usr/bin/
-ln -s "../lib/llvm-${LLVM_VERSION}/bin/clang" clang
-ln -s "../lib/llvm-${LLVM_VERSION}/bin/clang++" clang++
+ln -s "../lib/llvm-${LLVM_VERSION:-15}/bin/clang" clang
+ln -s "../lib/llvm-${LLVM_VERSION:-15}/bin/clang++" clang++
 popd

 # Fetch some needed build tools needed to build skia/skqp.
@@ -100,5 +98,3 @@ popd
 rm -Rf "${SKIA_DIR}"

 set +ex
-
-section_end skqp
--- a/.gitlab-ci/container/build-skqp_base.gn
+++ b/.gitlab-ci/container/build-skqp_base.gn
@@ -34,11 +34,6 @@ extra_cflags_cc = [
        "-Wno-unused-but-set-variable",
        "-Wno-sizeof-array-div",
        "-Wno-string-concatenation",
-        "-Wno-unsafe-buffer-usage",
-        "-Wno-switch-default",
-        "-Wno-cast-function-type-strict",
-        "-Wno-format",
-        "-Wno-enum-constexpr-conversion",
    ]

 cc_wrapper = "ccache"
--- a/.gitlab-ci/container/build-va-tools.sh
+++ b/.gitlab-ci/container/build-va-tools.sh
@@ -6,8 +6,6 @@

 set -uex

-uncollapsed_section_start va-tools "Building va-tools"
-
 git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"

@@ -19,11 +17,9 @@ git clone \

 pushd /va-utils
 # Too old libva in Debian 11. TODO: when this PR gets in, refer to the patch.
-curl --fail -L https://github.com/intel/libva-utils/pull/329.patch | git am
+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
-
-section_end va-tools
--- a/.gitlab-ci/container/build-vkd3d-proton.sh
+++ b/.gitlab-ci/container/build-vkd3d-proton.sh
@@ -6,9 +6,7 @@
 # KERNEL_ROOTFS_TAG
 set -ex

-uncollapsed_section_start vkd3d-proton "Building vkd3d-proton"
-
-VKD3D_PROTON_COMMIT="b121e6d746341e0aaba7663e3d85f3194e8e20e1"
+VKD3D_PROTON_COMMIT="59d6d4b5ed23766e69fe252408a3401d2fd52ce8"

 VKD3D_PROTON_DST_DIR="/vkd3d-proton-tests"
 VKD3D_PROTON_SRC_DIR="/vkd3d-proton-src"
@@ -47,5 +45,3 @@ popd

 rm -rf "$VKD3D_PROTON_BUILD_DIR"
 rm -rf "$VKD3D_PROTON_SRC_DIR"
-
-section_end vkd3d-proton
--- a/.gitlab-ci/container/build-vulkan-validation.sh
+++ b/.gitlab-ci/container/build-vulkan-validation.sh
@@ -7,19 +7,13 @@

 set -uex

-uncollapsed_section_start vulkan-validation "Building Vulkan validation layers"
-
 VALIDATION_TAG="snapshot-2024wk39"

 git clone -b "$VALIDATION_TAG" --single-branch --depth 1 https://github.com/KhronosGroup/Vulkan-ValidationLayers.git
 pushd Vulkan-ValidationLayers
-# we don't need to build SPIRV-Tools tools
-sed -i scripts/known_good.json -e 's/SPIRV_SKIP_EXECUTABLES=OFF/SPIRV_SKIP_EXECUTABLES=ON/'
-python3 scripts/update_deps.py --dir external --config release --generator Ninja --optional tests
+python3 scripts/update_deps.py --dir external --config release --generator Ninja
 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
 cmake --install build --strip
 popd
 rm -rf Vulkan-ValidationLayers
-
-section_end vulkan-validation
--- a/.gitlab-ci/container/build-wayland.sh
+++ b/.gitlab-ci/container/build-wayland.sh
@@ -3,8 +3,6 @@

 set -uex

-uncollapsed_section_start wayland "Building Wayland"
-
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
 # DEBIAN_BUILD_TAG
@@ -32,5 +30,3 @@ meson setup -Dtests=false _build ${EXTRA_MESON_ARGS:-}
 meson install -C _build
 cd ..
 rm -rf wayland-protocols
-
-section_end wayland
--- a/.gitlab-ci/container/container_job_trampoline.sh
+++ b/.gitlab-ci/container/container_job_trampoline.sh
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-# When changing this file, check if the *_BUIL_TAG tags in
-# .gitlab-ci/image-tags.yml need updating.
-
-set -eu
-
-# Early check for required env variables, relies on `set -u`
-: "$S3_JWT_FILE_SCRIPT"
-
-if [ -z "$1" ]; then
-  echo "usage: $(basename "$0") <CONTAINER_CI_JOB_NAME>" 1>&2
-  exit 1
-fi
-
-CONTAINER_CI_JOB_NAME="$1"
-
-# Tasks to perform before executing the script of a container job
-eval "$S3_JWT_FILE_SCRIPT"
-unset S3_JWT_FILE_SCRIPT
-
-trap 'rm -f ${S3_JWT_FILE}' EXIT INT TERM
-
-bash ".gitlab-ci/container/${CONTAINER_CI_JOB_NAME}.sh"
--- a/.gitlab-ci/container/container_pre_build.sh
+++ b/.gitlab-ci/container/container_pre_build.sh
@@ -23,6 +23,19 @@ if test -x /usr/bin/ccache; then
    ccache --show-stats
 fi

+# When not using the mold linker (e.g. unsupported architecture), force
+# linkers to gold, since it's so much faster for building.  We can't use
+# lld because we're on old debian and it's buggy.  mingw fails meson builds
+# with it with "meson.build:21:0: ERROR: Unable to determine dynamic linker"
+if [ -e /usr/bin/ld.gold ]; then
+  find /usr/bin -name \*-ld -o -name ld | \
+    grep -v mingw | \
+    xargs -n 1 -I '{}' ln -sf '{}.gold' '{}'
+else
+  echo "ld.gold is missing, not replacing ld with it."
+  echo "Builds might be slower, consider installing gold."
+fi
+
 # Make a wrapper script for ninja to always include the -j flags
 {
    echo '#!/bin/sh -x'
--- a/.gitlab-ci/container/create-android-cross-file.sh
+++ b/.gitlab-ci/container/create-android-cross-file.sh
@@ -18,7 +18,7 @@ cat > "$cross_file" <<EOF
 [binaries]
 ar = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar'
 c = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}${sdk_version}-clang', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables']
-cpp = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}${sdk_version}-clang++', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '--start-no-unused-arguments', '-static-libstdc++', '--end-no-unused-arguments']
+cpp = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}${sdk_version}-clang++', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-static-libstdc++']
 c_ld = 'lld'
 cpp_ld = 'lld'
 strip = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip'
--- a/.gitlab-ci/container/cross_build.sh
+++ b/.gitlab-ci/container/cross_build.sh
@@ -2,13 +2,10 @@
 # shellcheck disable=SC2086 # we want word splitting

 set -e
-
-. .gitlab-ci/setup-test-env.sh
-
 set -o xtrace

 export DEBIAN_FRONTEND=noninteractive
-: "${LLVM_VERSION:?llvm version not set!}"
+export LLVM_VERSION="${LLVM_VERSION:=15}"

 # Ephemeral packages (installed for this script and removed again at the end)
 EPHEMERAL=(
--- a/.gitlab-ci/container/debian/android_build.sh
+++ b/.gitlab-ci/container/debian/android_build.sh
@@ -5,11 +5,7 @@
 # .gitlab-ci/image-tags.yml tags:
 # DEBIAN_BUILD_TAG

-set -e
-
-. .gitlab-ci/setup-test-env.sh
-
-set -x
+set -ex

 EPHEMERAL=(
    autoconf
@@ -20,10 +16,10 @@ EPHEMERAL=(
 apt-get install -y --no-remove "${EPHEMERAL[@]}"

 # Fetch the NDK and extract just the toolchain we want.
-ndk="android-ndk-${ANDROID_NDK_VERSION}"
+ndk=$ANDROID_NDK
 curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
  -o $ndk.zip https://dl.google.com/android/repository/$ndk-linux.zip
-unzip -d / $ndk.zip "$ndk/source.properties" "$ndk/build/cmake/*" "$ndk/toolchains/llvm/*"
+unzip -d / $ndk.zip "$ndk/toolchains/llvm/*"
 rm $ndk.zip
 # Since it was packed as a zip file, symlinks/hardlinks got turned into
 # duplicate files.  Turn them into hardlinks to save on container space.
@@ -89,20 +85,9 @@ for arch in \
                --libdir=/usr/local/lib/${arch}
    make install
    make distclean
-
-    unset CC
-    unset CC
-    unset CXX
-    unset LD
-    unset RANLIB
 done

 cd ..
 rm -rf $LIBELF_VERSION

-
-# Build LLVM libraries for Android only if necessary, uploading a copy to S3
-# to avoid rebuilding it in a future run if the version does not change.
-bash .gitlab-ci/container/build-android-x86_64-llvm.sh
-
 apt-get purge -y "${EPHEMERAL[@]}"
--- a/.gitlab-ci/container/debian/arm64_build.sh
+++ b/.gitlab-ci/container/debian/arm64_build.sh
@@ -2,18 +2,14 @@
 # shellcheck disable=SC2086 # we want word splitting

 set -e
-
-. .gitlab-ci/setup-test-env.sh
-
 set -o xtrace

-: "${LLVM_VERSION:?llvm version not set}"
+export LLVM_VERSION="${LLVM_VERSION:=15}"

-apt-get -y install ca-certificates curl gnupg2
+apt-get -y install ca-certificates
 sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list.d/*
 echo "deb [trusted=yes] https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/ ${FDO_DISTRIBUTION_VERSION%-*} main" | tee /etc/apt/sources.list.d/gfx-ci_.list
-
-. .gitlab-ci/container/debian/maybe-add-llvm-repo.sh
+apt-get update

 # Ephemeral packages (installed for this script and removed again at the end)
 EPHEMERAL=(
@@ -82,8 +78,6 @@ DEPS=(
    zstd
 )

-apt-get update
-
 apt-get -y install "${DEPS[@]}" "${EPHEMERAL[@]}"

 pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
--- a/.gitlab-ci/container/debian/baremetal_arm_test.sh
+++ b/.gitlab-ci/container/debian/baremetal_arm_test.sh
@@ -6,9 +6,6 @@
 # KERNEL_ROOTFS_TAG

 set -e
-
-. .gitlab-ci/setup-test-env.sh
-
 set -o xtrace

 ############### Install packages for baremetal testing
--- a/.gitlab-ci/container/debian/maybe-add-llvm-repo.sh
+++ b/.gitlab-ci/container/debian/maybe-add-llvm-repo.sh
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-# Check to see if we need a separate repo to install LLVM.
-
-case "${FDO_DISTRIBUTION_VERSION%-*},${LLVM_VERSION}" in
-  bookworm,15)
-    NEED_LLVM_REPO="false"
-    ;;
-  *)
-    NEED_LLVM_REPO="true"
-    ;;
-esac
-
-if [ "$NEED_LLVM_REPO" = "true" ]; then
-  curl --fail -s https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-  export LLVM_APT_REPO="deb [trusted=yes] https://apt.llvm.org/${FDO_DISTRIBUTION_VERSION%-*}/ llvm-toolchain-${FDO_DISTRIBUTION_VERSION%-*}-${LLVM_VERSION} main"
-  echo "$LLVM_APT_REPO" | tee /etc/apt/sources.list.d/llvm.list
-fi
--- a/.gitlab-ci/container/debian/s390x_build.sh
+++ b/.gitlab-ci/container/debian/s390x_build.sh
@@ -2,8 +2,6 @@

 set -e

-. .gitlab-ci/setup-test-env.sh
-
 arch=s390x

 # Ephemeral packages (installed for this script and removed again at the end)
--- a/.gitlab-ci/container/debian/test-base.sh
+++ b/.gitlab-ci/container/debian/test-base.sh
@@ -15,15 +15,13 @@ uncollapsed_section_start debian_setup "Base Debian system setup"

 export DEBIAN_FRONTEND=noninteractive

-apt-get install -y curl ca-certificates gnupg2 software-properties-common
+apt-get install -y ca-certificates gnupg2 software-properties-common

 sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list.d/*

 echo "deb [trusted=yes] https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/ ${FDO_DISTRIBUTION_VERSION%-*} main" | tee /etc/apt/sources.list.d/gfx-ci_.list

-: "${LLVM_VERSION:?llvm version not set!}"
-
-. .gitlab-ci/container/debian/maybe-add-llvm-repo.sh
+export LLVM_VERSION="${LLVM_VERSION:=15}"

 # Ephemeral packages (installed for this script and removed again at the end)
 EPHEMERAL=(
@@ -42,7 +40,6 @@ EPHEMERAL=(
    libasound2-dev
    libcap-dev
    "libclang-cpp${LLVM_VERSION}-dev"
-    "libclang-rt-${LLVM_VERSION}-dev"
    libdrm-dev
    libegl-dev
    libelf-dev
@@ -85,7 +82,6 @@ DEPS=(
    liblz4-1
    libpng16-16
    libpython3.11
-    libubsan1
    libvulkan1
    libwayland-client0
    libwayland-server0
@@ -130,44 +126,54 @@ pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedeskt
 # Needed for manipulation with traces yaml files.
 pip3 install --break-system-packages yq

-section_end debian_setup
-
 ############### Download prebuilt kernel

 if [ "$DEBIAN_ARCH" = amd64 ]; then
-  uncollapsed_section_start kernel "Downloading kernel"
+  uncollapsed_section_switch kernel "Downloading kernel"
  export KERNEL_IMAGE_NAME=bzImage
  mkdir -p /lava-files/
  . .gitlab-ci/container/download-prebuilt-kernel.sh
-  section_end kernel
 fi

 ############### Build mold

+uncollapsed_section_switch mold "Building mold linker"
+
 . .gitlab-ci/container/build-mold.sh

 ############### Build LLVM-SPIRV translator

+uncollapsed_section_switch llvmspv "Building LLVM-SPIRV-Translator"
+
 . .gitlab-ci/container/build-llvm-spirv.sh

 ############### Build libclc

+uncollapsed_section_switch libclc "Building libclc"
+
 . .gitlab-ci/container/build-libclc.sh

 ############### Build Wayland

+uncollapsed_section_switch wayland "Building Wayland"
+
 . .gitlab-ci/container/build-wayland.sh

 ############### Install Rust toolchain

+uncollapsed_section_switch rust "Installing Rust toolchain"
+
 . .gitlab-ci/container/build-rust.sh

 ############### Build Crosvm

+uncollapsed_section_switch crosvm "Building crosvm"
 . .gitlab-ci/container/build-crosvm.sh

 ############### Build dEQP runner

+uncollapsed_section_switch deqpr "Building deqp-runner"
+
 . .gitlab-ci/container/build-deqp-runner.sh

 ############### Uninstall the build software
@@ -179,5 +185,3 @@ apt-get purge -y "${EPHEMERAL[@]}"
 rm -rf /root/.rustup

 . .gitlab-ci/container/container_post_build.sh
-
-section_end debian_cleanup
--- a/.gitlab-ci/container/debian/test-gl.sh
+++ b/.gitlab-ci/container/debian/test-gl.sh
@@ -10,7 +10,7 @@ set -o xtrace
 uncollapsed_section_start debian_setup "Base Debian system setup"

 export DEBIAN_FRONTEND=noninteractive
-: "${LLVM_VERSION:?llvm version not set!}"
+export LLVM_VERSION="${LLVM_VERSION:=15}"

 apt-get install -y libelogind0  # this interfere with systemd deps, install separately

@@ -82,10 +82,10 @@ apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \

 . .gitlab-ci/container/container_pre_build.sh

-section_end debian_setup
-
 ############### Build piglit

+uncollapsed_section_switch piglit "Building Piglit"
+
 PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
 	     -DPIGLIT_USE_GBM=ON
 	     -DPIGLIT_USE_WAYLAND=ON
@@ -104,30 +104,32 @@ PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON

 ############### Build dEQP GL

-DEQP_API=tools \
-DEQP_TARGET=surfaceless \
-. .gitlab-ci/container/build-deqp.sh
+uncollapsed_section_switch piglit_gl "Building dEQP for GL"

 DEQP_API=GL \
 DEQP_TARGET=surfaceless \
 . .gitlab-ci/container/build-deqp.sh

+uncollapsed_section_switch piglit_gles "Building dEQP for GLES"
+
 DEQP_API=GLES \
 DEQP_TARGET=surfaceless \
 . .gitlab-ci/container/build-deqp.sh

-rm -rf /VK-GL-CTS
-
 ############### Build apitrace

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

 ############### Build validation layer for zink

+uncollapsed_section_switch vvl "Building Vulkan validation layers"
+
 . .gitlab-ci/container/build-vulkan-validation.sh

 ############### Build nine tests

+uncollapsed_section_switch nine "Building Nine tests"
+
 . .gitlab-ci/container/build-ninetests.sh

 ############### Uninstall the build software
@@ -137,5 +139,3 @@ uncollapsed_section_switch debian_cleanup "Cleaning up base Debian system"
 apt-get purge -y "${EPHEMERAL[@]}"

 . .gitlab-ci/container/container_post_build.sh
-
-section_end debian_cleanup
--- a/.gitlab-ci/container/debian/test-vk.sh
+++ b/.gitlab-ci/container/debian/test-vk.sh
@@ -80,10 +80,10 @@ apt-get install -y --no-remove --no-install-recommends \

 . .gitlab-ci/container/container_pre_build.sh

-section_end debian_setup
-
 ############### Build piglit replayer

+uncollapsed_section_switch piglit "Building Piglit for Vulkan (traces only)"
+
 # We don't run any _piglit_ Vulkan tests in the containers.
 PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
 	     -DPIGLIT_USE_GBM=OFF
@@ -104,34 +104,34 @@ PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON

 ############### Build dEQP VK

-DEQP_API=tools \
-DEQP_TARGET=default \
-. .gitlab-ci/container/build-deqp.sh
-
-DEQP_API=VK-main \
-DEQP_TARGET=default \
-. .gitlab-ci/container/build-deqp.sh
+uncollapsed_section_switch deqp "Building Vulkan CTS (dEQP)"

 DEQP_API=VK \
 DEQP_TARGET=default \
 . .gitlab-ci/container/build-deqp.sh

-rm -rf /VK-GL-CTS
-
 ############### Build apitrace

+uncollapsed_section_switch apitrace "Building apitrace"
+
 . .gitlab-ci/container/build-apitrace.sh

 ############### Build Fossilize

+uncollapsed_section_switch fossilize "Building Fossilize"
+
 . .gitlab-ci/container/build-fossilize.sh

 ############### Build gfxreconstruct

+uncollapsed_section_switch gfxreconstruct "Building gfxreconstruct"
+
 . .gitlab-ci/container/build-gfxreconstruct.sh

 ############### Build VKD3D-Proton

+uncollapsed_section_switch proton "Installing Proton (Wine/D3DVK emulation)"
+
 . .gitlab-ci/container/setup-wine.sh "/vkd3d-proton-wine64"

 . .gitlab-ci/container/build-vkd3d-proton.sh
@@ -143,5 +143,3 @@ uncollapsed_section_switch debian_cleanup "Cleaning up base Debian system"
 apt-get purge -y "${EPHEMERAL[@]}"

 . .gitlab-ci/container/container_post_build.sh
-
-section_end debian_cleanup
--- a/.gitlab-ci/container/debian/x86_64_build-base.sh
+++ b/.gitlab-ci/container/debian/x86_64_build-base.sh
@@ -6,20 +6,15 @@
 # DEBIAN_BUILD_TAG

 set -e
-
-. .gitlab-ci/setup-test-env.sh
-
 set -o xtrace

 export DEBIAN_FRONTEND=noninteractive
-: "${LLVM_VERSION:?llvm version not set!}"
+export LLVM_VERSION="${LLVM_VERSION:=15}"

-apt-get install -y ca-certificates curl gnupg2
+apt-get install -y ca-certificates
 sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list.d/*
 echo "deb [trusted=yes] https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/ ${FDO_DISTRIBUTION_VERSION%-*} main" | tee /etc/apt/sources.list.d/gfx-ci_.list

-. .gitlab-ci/container/debian/maybe-add-llvm-repo.sh
-
 # Ephemeral packages (installed for this script and removed again at
 # the end)
 EPHEMERAL=(
--- a/.gitlab-ci/container/debian/x86_64_build.sh
+++ b/.gitlab-ci/container/debian/x86_64_build.sh
@@ -6,13 +6,10 @@
 # DEBIAN_BUILD_TAG

 set -e
-
-. .gitlab-ci/setup-test-env.sh
-
 set -o xtrace

 export DEBIAN_FRONTEND=noninteractive
-: "${LLVM_VERSION:?llvm version not set!}"
+export LLVM_VERSION="${LLVM_VERSION:=15}"

 # Ephemeral packages (installed for this script and removed again at the end)
 EPHEMERAL=(
@@ -31,7 +28,6 @@ DEPS=(
    libarchive-dev
    libdrm-dev
    "libclang-cpp${LLVM_VERSION}-dev"
-    "libclang-rt-${LLVM_VERSION}-dev"
    libgbm-dev
    libglvnd-dev
    liblua5.3-dev
--- a/.gitlab-ci/container/debian/x86_64_pyutils.sh
+++ b/.gitlab-ci/container/debian/x86_64_pyutils.sh
@@ -6,9 +6,6 @@
 # DEBIAN_PYUTILS_TAG

 set -e
-
-. .gitlab-ci/setup-test-env.sh
-
 set -o xtrace

 export DEBIAN_FRONTEND=noninteractive
--- a/.gitlab-ci/container/debian/x86_64_test-android.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-android.sh
@@ -1,15 +1,8 @@
 #!/usr/bin/env bash
 # The relative paths in this file only become valid at runtime.
 # shellcheck disable=SC1091
-#
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_ANDROID_TAG

 set -e
-
-. .gitlab-ci/setup-test-env.sh
-
 set -o xtrace

 export DEBIAN_FRONTEND=noninteractive
@@ -23,7 +16,6 @@ EPHEMERAL=(
   debhelper-compat
   dpkg-dev
   ninja-build
-   sudo
   unzip
 )

@@ -40,7 +32,7 @@ apt-get install -y --no-remove --no-install-recommends \
 ############### Downloading NDK for native builds for the guest ...

 # Fetch the NDK and extract just the toolchain we want.
-ndk="android-ndk-${ANDROID_NDK_VERSION}"
+ndk=$ANDROID_NDK
 curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
  -o "$ndk.zip" "https://dl.google.com/android/repository/$ndk-linux.zip"
 unzip -d / "$ndk.zip"
@@ -58,63 +50,37 @@ rm -rf /root/.rustup

 ############### Build dEQP GL

-DEQP_API=tools \
-DEQP_TARGET="android" \
-EXTRA_CMAKE_ARGS="-DDEQP_ANDROID_EXE=ON -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=x86_64 -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
-. .gitlab-ci/container/build-deqp.sh
-
 DEQP_API=GL \
 DEQP_TARGET="android" \
-EXTRA_CMAKE_ARGS="-DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=x86_64 -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
+EXTRA_CMAKE_ARGS="-DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=x86_64 -DDE_ANDROID_API=28" \
 . .gitlab-ci/container/build-deqp.sh

 DEQP_API=GLES \
 DEQP_TARGET="android" \
-EXTRA_CMAKE_ARGS="-DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=x86_64 -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
+EXTRA_CMAKE_ARGS="-DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=x86_64 -DDE_ANDROID_API=28" \
 . .gitlab-ci/container/build-deqp.sh

-DEQP_API=VK \
-DEQP_TARGET="android" \
-EXTRA_CMAKE_ARGS="-DDEQP_ANDROID_EXE=ON -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=x86_64 -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
-. .gitlab-ci/container/build-deqp.sh
-
-rm -rf /VK-GL-CTS
-
 ############### Downloading Cuttlefish resources ...

-CUTTLEFISH_PROJECT_PATH=ao2/aosp-manifest
-CUTTLEFISH_BUILD_VERSION_TAGS=mesa-venus
-CUTTLEFISH_BUILD_NUMBER=20250115.001
+CUTTLEFISH_VERSION=9082637   # Chosen from https://ci.android.com/builds/branches/aosp-master/grid?

 mkdir /cuttlefish
 pushd /cuttlefish

 curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-  -o aosp_cf_x86_64_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CUTTLEFISH_PROJECT_PATH}/aosp-${CUTTLEFISH_BUILD_VERSION_TAGS}.${CUTTLEFISH_BUILD_NUMBER}/aosp_cf_x86_64_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip"
-
-unzip aosp_cf_x86_64_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip
-rm aosp_cf_x86_64_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip
+  -o aosp_cf_x86_64_phone-img-$CUTTLEFISH_VERSION.zip https://ci.android.com/builds/submitted/$CUTTLEFISH_VERSION/aosp_cf_x86_64_phone-userdebug/latest/raw/aosp_cf_x86_64_phone-img-$CUTTLEFISH_VERSION.zip
+unzip aosp_cf_x86_64_phone-img-$CUTTLEFISH_VERSION.zip
+rm aosp_cf_x86_64_phone-img-$CUTTLEFISH_VERSION.zip
 ls -lhS ./*

 curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-  -o cvd-host_package.tar.gz "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CUTTLEFISH_PROJECT_PATH}/aosp-${CUTTLEFISH_BUILD_VERSION_TAGS}.${CUTTLEFISH_BUILD_NUMBER}/cvd-host_package.tar.gz"
-tar -xzvf cvd-host_package.tar.gz
-rm cvd-host_package.tar.gz
-
-AOSP_KERNEL_PROJECT_PATH=ao2/aosp-kernel-manifest
-AOSP_KERNEL_BUILD_VERSION_TAGS=common-android14-6.1-venus
-AOSP_KERNEL_BUILD_NUMBER=20241107.001
-
-curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-  -o bzImage "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${AOSP_KERNEL_PROJECT_PATH}/aosp-kernel-common-${AOSP_KERNEL_BUILD_VERSION_TAGS}.${AOSP_KERNEL_BUILD_NUMBER}/bzImage"
-curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-  -o initramfs.img "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${AOSP_KERNEL_PROJECT_PATH}/aosp-kernel-common-${AOSP_KERNEL_BUILD_VERSION_TAGS}.${AOSP_KERNEL_BUILD_NUMBER}/initramfs.img"
+  https://ci.android.com/builds/submitted/$CUTTLEFISH_VERSION/aosp_cf_x86_64_phone-userdebug/latest/raw/cvd-host_package.tar.gz | tar -xzvf-

 popd

 ############### Building and installing Debian package ...

-ANDROID_CUTTLEFISH_VERSION=v1.0.1
+ANDROID_CUTTLEFISH_VERSION=f6494d9fbeaa9974b56923e3029909e5d5f440dd

 mkdir android-cuttlefish
 pushd android-cuttlefish
@@ -123,9 +89,11 @@ git remote add origin https://github.com/google/android-cuttlefish.git
 git fetch --depth 1 origin "$ANDROID_CUTTLEFISH_VERSION"
 git checkout FETCH_HEAD

-./tools/buildutils/build_packages.sh
+pushd base
+dpkg-buildpackage -uc -us
+popd

-apt-get install -y --allow-downgrades ./cuttlefish-base_*.deb ./cuttlefish-user_*.deb
+apt-get install -y ./cuttlefish-base_*.deb

 popd
 rm -rf android-cuttlefish
@@ -137,7 +105,6 @@ usermod -a -G kvm,cvdnetwork root

 rm -rf "/${ndk:?}"

-export SUDO_FORCE_REMOVE=yes
 apt-get purge -y "${EPHEMERAL[@]}"

 . .gitlab-ci/container/container_post_build.sh
--- a/.gitlab-ci/container/fedora/x86_64_build.sh
+++ b/.gitlab-ci/container/fedora/x86_64_build.sh
@@ -6,9 +6,6 @@
 # FEDORA_X86_64_BUILD_TAG

 set -e
-
-. .gitlab-ci/setup-test-env.sh
-
 set -o xtrace


@@ -77,15 +74,13 @@ DEPS=(
    python-unversioned-command
    python3-devel
    python3-mako
-    python3-packaging
    python3-ply
    python3-pycparser
    python3-yaml
    rust-packaging
+    vulkan-headers
    spirv-tools-devel
    spirv-llvm-translator-devel
-    vulkan-headers
-    which
 )

 dnf install -y --setopt=install_weak_deps=False "${DEPS[@]}" "${EPHEMERAL[@]}"
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -57,7 +57,7 @@
    - .incorporate-templates-commit
  variables:
    FDO_REPO_SUFFIX: $CI_JOB_NAME
-    FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/container_job_trampoline.sh "${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
    GIT_STRATEGY: none

@@ -72,7 +72,6 @@ debian/x86_64_build-base:
    - .debian-container
  variables:
    MESA_IMAGE_TAG: &debian-x86_64_build-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
-    LLVM_VERSION: &debian-x86_64-llvm 19

 .use-debian/x86_64_build-base:
  extends:
@@ -83,7 +82,6 @@ debian/x86_64_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
-    LLVM_VERSION: *debian-x86_64-llvm
  needs:
    - debian/x86_64_build-base

@@ -93,7 +91,6 @@ debian/x86_64_build:
    - .use-debian/x86_64_build-base
  variables:
    MESA_IMAGE_TAG: &debian-x86_64_build ${DEBIAN_BUILD_TAG}
-    LLVM_VERSION: *debian-x86_64-llvm

 .use-debian/x86_64_build:
  extends:
@@ -102,7 +99,6 @@ debian/x86_64_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
-    LLVM_VERSION: *debian-x86_64-llvm
  needs:
    - debian/x86_64_build

@@ -120,7 +116,6 @@ debian/x86_32_build:
    MESA_BASE_TAG: *debian-x86_64_build-base
    MESA_IMAGE_PATH: "debian/x86_32_build"
    MESA_IMAGE_TAG: *debian-x86_32_build
-    LLVM_VERSION: *debian-x86_64-llvm
  needs:
    - debian/x86_32_build

@@ -130,7 +125,6 @@ debian/ppc64el_build:
    - .use-debian/x86_64_build-base
  variables:
    MESA_IMAGE_TAG: &debian-ppc64el_build ${DEBIAN_BUILD_TAG}
-    LLVM_VERSION: &debian-ppc64el-llvm 15 # no LLVM packages for PPC

 .use-debian/ppc64el_build:
  extends:
@@ -139,7 +133,6 @@ debian/ppc64el_build:
    MESA_BASE_TAG: *debian-x86_64_build-base
    MESA_IMAGE_PATH: "debian/ppc64el_build"
    MESA_IMAGE_TAG: *debian-ppc64el_build
-    LLVM_VERSION: *debian-ppc64el-llvm
  needs:
    - debian/ppc64el_build

@@ -149,7 +142,6 @@ debian/s390x_build:
    - .use-debian/x86_64_build-base
  variables:
    MESA_IMAGE_TAG: &debian-s390x_build ${DEBIAN_BUILD_TAG}
-    LLVM_VERSION: &debian-s390x-llvm 19

 .use-debian/s390x_build:
  extends:
@@ -158,32 +150,20 @@ debian/s390x_build:
    MESA_BASE_TAG: *debian-x86_64_build-base
    MESA_IMAGE_PATH: "debian/s390x_build"
    MESA_IMAGE_TAG: *debian-s390x_build
-    LLVM_VERSION: *debian-s390x-llvm
  needs:
    - debian/s390x_build

 # Android NDK cross-build image
-.android-variables:
-  variables:
-    ANDROID_NDK_VERSION: "r27c"
-    ANDROID_SDK_VERSION: 34
-    ANDROID_LLVM_VERSION: llvmorg-18.1.8
-    ANDROID_LLVM_ARTIFACT_NAME: android-x86_64-llvm-20250103
-    # This can be confusing: LLVM_VERSION refers to the host LLVM toolchain
-    # used (LLVM 19 in our Debian system), but ANDROID_LLVM_VERSION refers to
-    # the cross-compiling LLVM toolchain used to build for the Android system.
-    LLVM_VERSION: &debian-android-llvm 19
-
 debian/android_build:
  extends:
-    - .android-variables
    - .use-debian/x86_64_build-base
  variables:
    MESA_IMAGE_TAG: &debian-android_build ${DEBIAN_BUILD_TAG}
+    ANDROID_SDK_VERSION: 33
+    ANDROID_NDK: android-ndk-r25b

 .use-debian/android_build:
  extends:
-    - .android-variables
    - .set-image-base-tag
  variables:
    MESA_BASE_TAG: *debian-x86_64_build-base
@@ -192,98 +172,12 @@ debian/android_build:
  needs:
    - debian/android_build

-# Debian based ARM build image
-debian/arm64_build:
-  extends:
-    - .fdo.container-build@debian
-    - .container
-    - .debian-container-version
-  tags:
-    - aarch64
-  variables:
-    MESA_IMAGE_TAG: &debian-arm64_build "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
-    LLVM_VERSION: &debian-arm64-llvm 19
-
-.use-debian/arm64_build:
-  extends:
-    - .set-image
-  variables:
-    MESA_IMAGE_PATH: "debian/arm64_build"
-    MESA_IMAGE_TAG: *debian-arm64_build
-    MESA_ARTIFACTS_TAG: *debian-arm64_build
-    LLVM_VERSION: *debian-arm64-llvm
-  needs:
-    - debian/arm64_build
-
-# Alpine based x86_64 build image
-.alpine/x86_64_build-base:
-  extends:
-    - .fdo.container-build@alpine
-    - .container
-  variables:
-    FDO_DISTRIBUTION_VERSION: "edge"  # switch to 3.20 when gets released
-    FDO_BASE_IMAGE: alpine:$FDO_DISTRIBUTION_VERSION  # since cbuild ignores it
-
-# 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}
-    LLVM_VERSION: &alpine-llvm_version 19
-  rules:
-    # Note: the next three lines must remain in that order, so that the rules
-    # in `linkcheck-docs` catch nightly pipelines before the rules in `pages`
-    # exclude them.
-    - !reference [linkcheck-docs, rules]
-    - !reference [pages, rules]
-    - !reference [test-docs, rules]
-    - !reference [.container, rules]
-
-.use-alpine/x86_64_build:
-  extends:
-    - .set-image
-  variables:
-    MESA_IMAGE_PATH: "alpine/x86_64_build"
-    MESA_IMAGE_TAG: *alpine-x86_64_build
-    LLVM_VERSION: *alpine-llvm_version
-  needs:
-    - alpine/x86_64_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: 41
-    MESA_IMAGE_TAG: &fedora-x86_64_build ${FEDORA_X86_64_BUILD_TAG}
-    LLVM_VERSION: &fedora-x86_64-llvm 19
-
-.use-fedora/x86_64_build:
-  extends:
-    - .set-image
-  variables:
-    MESA_IMAGE_PATH: "fedora/x86_64_build"
-    MESA_IMAGE_TAG: *fedora-x86_64_build
-    LLVM_VERSION: *fedora-x86_64-llvm
-  needs:
-    - fedora/x86_64_build
-
 # Debian based x86_64 test image base
 debian/x86_64_test-base:
  extends:
    - .debian-container
  variables:
    MESA_IMAGE_TAG: &debian-x86_64_test-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${KERNEL_TAG}"
-    LLVM_VERSION: *debian-x86_64-llvm

 .use-debian/x86_64_test-base:
  extends:
@@ -293,7 +187,6 @@ debian/x86_64_test-base:
  variables:
    MESA_BASE_IMAGE: ${DEBIAN_X86_64_TEST_BASE_IMAGE}
    MESA_BASE_TAG: *debian-x86_64_test-base
-    LLVM_VERSION: *debian-x86_64-llvm
  needs:
    - debian/x86_64_test-base

@@ -305,7 +198,6 @@ debian/arm64_test-base:
    - .debian-container
  variables:
    MESA_IMAGE_TAG: &debian-arm64_test-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
-    LLVM_VERSION: *debian-arm64-llvm

 .use-debian/arm64_test-base:
  tags:
@@ -317,7 +209,6 @@ debian/arm64_test-base:
  variables:
    MESA_BASE_IMAGE: ${DEBIAN_ARM64_TEST_BASE_IMAGE}
    MESA_BASE_TAG: *debian-arm64_test-base
-    LLVM_VERSION: *debian-arm64-llvm
  needs:
    - debian/arm64_test-base

@@ -355,11 +246,10 @@ debian/x86_64_test-vk:

 # Debian based x86_64 test image for Android
 .debian/x86_64_test-android:
-  extends:
-    - .android-variables
-    - .use-debian/x86_64_test-base
+  extends: .use-debian/x86_64_test-base
  variables:
    MESA_IMAGE_TAG: &debian-x86_64_test-android ${DEBIAN_TEST_ANDROID_TAG}
+    ANDROID_NDK: android-ndk-r25b

 .use-debian/x86_64_test-android:
  extends:
@@ -377,6 +267,10 @@ debian/x86_64_pyutils:
    - .debian-container
  variables:
    MESA_IMAGE_TAG: &debian-x86_64_pyutils "${DEBIAN_PYUTILS_TAG}"
+  rules:
+    # python-test requires this job
+    - !reference [python-test, rules]
+    - !reference [.container, rules]

 .use-debian/x86_64_pyutils:
  extends:
@@ -429,6 +323,88 @@ debian/arm64_test-vk:
  needs:
    - debian/arm64_test-vk

+# Debian based ARM build image
+debian/arm64_build:
+  extends:
+    - .fdo.container-build@debian
+    - .container
+    - .debian-container-version
+  tags:
+    - aarch64
+  variables:
+    MESA_IMAGE_TAG: &debian-arm64_build "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+
+.use-debian/arm64_build:
+  extends:
+    - .set-image
+  variables:
+    MESA_IMAGE_PATH: "debian/arm64_build"
+    MESA_IMAGE_TAG: *debian-arm64_build
+    MESA_ARTIFACTS_TAG: *debian-arm64_build
+  needs:
+    - debian/arm64_build
+
+
+# Alpine based x86_64 build image
+.alpine/x86_64_build-base:
+  extends:
+    - .fdo.container-build@alpine
+    - .container
+  variables:
+    FDO_DISTRIBUTION_VERSION: "edge"  # switch to 3.20 when gets released
+    FDO_BASE_IMAGE: alpine:$FDO_DISTRIBUTION_VERSION  # since cbuild ignores it
+
+# 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}
+    LLVM_VERSION: &alpine-llvm_version 19
+  rules:
+    # Note: the next three lines must remain in that order, so that the rules
+    # in `linkcheck-docs` catch nightly pipelines before the rules in `pages`
+    # exclude them.
+    - !reference [linkcheck-docs, rules]
+    - !reference [pages, rules]
+    - !reference [test-docs, rules]
+    - !reference [.container, rules]
+
+.use-alpine/x86_64_build:
+  extends:
+    - .set-image
+  variables:
+    MESA_IMAGE_PATH: "alpine/x86_64_build"
+    MESA_IMAGE_TAG: *alpine-x86_64_build
+    LLVM_VERSION: *alpine-llvm_version
+  needs:
+    - alpine/x86_64_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: 38
+    MESA_IMAGE_TAG: &fedora-x86_64_build ${FEDORA_X86_64_BUILD_TAG}
+
+.use-fedora/x86_64_build:
+  extends:
+    - .set-image
+  variables:
+    MESA_IMAGE_PATH: "fedora/x86_64_build"
+    MESA_IMAGE_TAG: *fedora-x86_64_build
+  needs:
+    - fedora/x86_64_build
+
 # Get firmware directly rather than using package versions.
 # Change KERNEL_ROOTFS_TAG to add firmware changes.
 # FIRMWARE_FILES is a list of json files arranged by vendor in .gitlab-ci/firmware/*
@@ -451,7 +427,7 @@ debian/arm64_test-vk:
    - .container+build-rules
    - .debian-container-version
  stage: container
-  timeout: 120m
+  timeout: 90m
  variables:
    GIT_STRATEGY: fetch
    MESA_ROOTFS_TAG: &kernel-rootfs ${KERNEL_ROOTFS_TAG}
@@ -468,7 +444,6 @@ kernel+rootfs_x86_64:
  variables:
    DEBIAN_ARCH: "amd64"
    DISTRIBUTION_TAG: &distribution-tag-x86_64 "${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_ARTIFACTS_BASE_TAG}--${MESA_TEMPLATES_COMMIT}"
-    LLVM_VERSION: *debian-x86_64-llvm

 kernel+rootfs_arm64:
  extends:
@@ -479,7 +454,6 @@ kernel+rootfs_arm64:
    - aarch64
  variables:
    DEBIAN_ARCH: "arm64"
-    LLVM_VERSION: *debian-arm64-llvm

 kernel+rootfs_arm32:
  extends:
@@ -487,7 +461,6 @@ kernel+rootfs_arm32:
    - .firmware_arm32
  variables:
    DEBIAN_ARCH: "armhf"
-    LLVM_VERSION: &debian-arm32-llvm 15 # no armhf builds for LLVM

 # Cannot use anchors defined here from included files, so use extends: instead
 .use-kernel+rootfs-arm:
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -6,10 +6,6 @@
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
 # KERNEL_ROOTFS_TAG
-# If you need to update the fluster vectors cache without updating the fluster revision,
-# you can update the FLUSTER_VECTORS_VERSION tag in .gitlab-ci/image-tags.yml.
-# When changing FLUSTER_REVISION, KERNEL_ROOTFS_TAG needs to be updated as well to rebuild
-# the rootfs.

 set -e

@@ -18,9 +14,8 @@ set -e
 set -o xtrace

 export DEBIAN_FRONTEND=noninteractive
-: "${LLVM_VERSION:?llvm version not set!}"
+export LLVM_VERSION="${LLVM_VERSION:=15}"
 export FIRMWARE_FILES="${FIRMWARE_FILES}"
-export SKIP_UPDATE_FLUSTER_VECTORS=0

 check_minio()
 {
@@ -32,22 +27,9 @@ check_minio()
    fi
 }

-check_fluster()
-{
-    S3_PATH_FLUSTER="${S3_HOST}/${S3_KERNEL_BUCKET}/$1/${DATA_STORAGE_PATH}/fluster/${FLUSTER_VECTORS_VERSION}"
-    if curl -L --retry 4 -f --retry-delay 60 -s -X HEAD \
-      "https://${S3_PATH_FLUSTER}/done"; then
-        echo "Fluster vectors are up-to-date, skip downloading them."
-        export SKIP_UPDATE_FLUSTER_VECTORS=1
-    fi
-}
-
 check_minio "${FDO_UPSTREAM_REPO}"
 check_minio "${CI_PROJECT_PATH}"

-check_fluster "${FDO_UPSTREAM_REPO}"
-check_fluster "${CI_PROJECT_PATH}"
-
 . .gitlab-ci/container/container_pre_build.sh

 # Install rust, which we'll be using for deqp-runner.  It will be cleaned up at the end.
@@ -68,7 +50,7 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
    DEVICE_TREES+=" mt8192-asurada-spherion-r0.dtb"
    DEVICE_TREES+=" mt8183-kukui-jacuzzi-juniper-sku16.dtb"
    DEVICE_TREES+=" tegra210-p3450-0000.dtb"
-    DEVICE_TREES+=" apq8016-sbc-usb-host.dtb"
+    DEVICE_TREES+=" apq8016-sbc.dtb"
    DEVICE_TREES+=" apq8096-db820c.dtb"
    DEVICE_TREES+=" sc7180-trogdor-lazor-limozeen-nots-r5.dtb"
    DEVICE_TREES+=" sc7180-trogdor-kingoftown.dtb"
@@ -183,8 +165,6 @@ CONTAINER_EPHEMERAL=(

 echo "deb [trusted=yes] https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/ ${FDO_DISTRIBUTION_VERSION%-*} main" | tee /etc/apt/sources.list.d/gfx-ci_.list

-. .gitlab-ci/container/debian/maybe-add-llvm-repo.sh
-
 apt-get update
 apt-get install -y --no-remove \
 		   -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' \
@@ -204,7 +184,6 @@ PKG_CI=(
  bash ca-certificates curl
  initramfs-tools jq netcat-openbsd dropbear openssh-server
  libasan8
-  libubsan1
  git
  python3-dev python3-pip python3-setuptools python3-wheel
  weston # Wayland
@@ -217,7 +196,6 @@ PKG_MESA_DEP=(
 )
 PKG_DEP=(
  libpng16-16
-  libva-wayland2
  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
@@ -234,7 +212,6 @@ PKG_DEP=(
 [ "$DEBIAN_ARCH" = "amd64" ] && PKG_ARCH=(
  firmware-amd-graphics
  firmware-misc-nonfree
-  gstreamer1.0-plugins-bad gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-tools gstreamer1.0-vaapi libgstreamer1.0-0 # Fluster
  libgl1 libglu1-mesa
  inetutils-syslogd iptables libcap2
  libfontconfig1
@@ -268,8 +245,7 @@ mmdebstrap \
    bookworm \
    "$ROOTFS/" \
    "http://deb.debian.org/debian" \
-    "deb [trusted=yes] https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/ ${FDO_DISTRIBUTION_VERSION%-*} main" \
-    "${LLVM_APT_REPO:-}"
+    "deb [trusted=yes] https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/ ${FDO_DISTRIBUTION_VERSION%-*} main"

 ############### Install mold
 . .gitlab-ci/container/build-mold.sh
@@ -317,11 +293,6 @@ mv /usr/local/bin/*-runner $ROOTFS/usr/bin/.


 ############### Build dEQP
-
-DEQP_API=tools \
-DEQP_TARGET=default \
-. .gitlab-ci/container/build-deqp.sh
-
 DEQP_API=GL \
 DEQP_TARGET=surfaceless \
 . .gitlab-ci/container/build-deqp.sh
@@ -330,19 +301,11 @@ DEQP_API=GLES \
 DEQP_TARGET=surfaceless \
 . .gitlab-ci/container/build-deqp.sh

-if [ "$BUILD_VK" == "ON" ]; then
-  DEQP_API=VK \
-  DEQP_TARGET=default \
-  . .gitlab-ci/container/build-deqp.sh
+[ "$BUILD_VK" == "ON" ] && DEQP_API=VK \
+DEQP_TARGET=default \
+. .gitlab-ci/container/build-deqp.sh

-  DEQP_API=VK-main \
-  DEQP_TARGET=default \
-  . .gitlab-ci/container/build-deqp.sh
-fi
-
-rm -rf /VK-GL-CTS
-
-mv /deqp-* $ROOTFS/.
+mv /deqp $ROOTFS/.


 ############### Build SKQP
@@ -386,15 +349,10 @@ if [[ ${DEBIAN_ARCH} = "amd64" ]]; then
 fi

 ############### Build ci-kdl
+section_start kdl "Prepare a venv for kdl"
 . .gitlab-ci/container/build-kdl.sh
 mv /ci-kdl $ROOTFS/
-
-############### Install fluster
-if [[ ${DEBIAN_ARCH} = "amd64" ]]; then
-    section_start fluster "Install fluster"
-    . .gitlab-ci/container/build-fluster.sh
-    section_end fluster
-fi
+section_end kdl

 ############### Build local stuff for use by igt and kernel testing, which
 ############### will reuse most of our container build process from a specific
@@ -417,14 +375,12 @@ if [ "$DEBIAN_ARCH" = "amd64" ]; then
 fi

 ############### Fill rootfs
-cp .gitlab-ci/setup-test-env.sh $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-test-env.sh"
 rm "$ROOTFS/setup-rootfs.sh"
 rm "$ROOTFS/strip-rootfs.sh"
 cp /etc/wgetrc $ROOTFS/etc/.
@@ -444,7 +400,8 @@ popd

 . .gitlab-ci/container/container_post_build.sh

-s3_upload /lava-files/"${ROOTFSTAR}" "https://${S3_PATH}/"
+ci-fairy s3cp --token-file "${S3_JWT_FILE}" /lava-files/"${ROOTFSTAR}" \
+      https://${S3_PATH}/"${ROOTFSTAR}"

 touch /lava-files/done
-s3_upload /lava-files/done "https://${S3_PATH}/"
+ci-fairy s3cp --token-file "${S3_JWT_FILE}" /lava-files/done https://${S3_PATH}/done
--- a/.gitlab-ci/container/patches/build-deqp-gl_Allow-running-on-Android-from-the-command-line.patch
+++ b/.gitlab-ci/container/patches/build-deqp-gl_Allow-running-on-Android-from-the-command-line.patch
@@ -1,4 +1,4 @@
-From 6250d347d15502e3b45769edba57ae244e20fb92 Mon Sep 17 00:00:00 2001
+From dc97ee83a813f6b170079ddf2a04bbb06221a5a7 Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Fri, 26 Aug 2022 18:24:27 +0200
 Subject: [PATCH 1/2] Allow running on Android from the command line
@@ -20,10 +20,10 @@ Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 3 files changed, 34 insertions(+), 52 deletions(-)

 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 309bdda18..7c833751f 100644
+index eb58cc7ba..98b8fc6cc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -275,7 +275,7 @@ include_directories(
+@@ -272,7 +272,7 @@ include_directories(
 	external/vulkancts/framework/vulkan
 	)
 
@@ -32,7 +32,7 @@ index 309bdda18..7c833751f 100644
 	# On Android deqp modules are compiled as libraries and linked into final .so
 	set(DEQP_MODULE_LIBRARIES )
 	set(DEQP_MODULE_ENTRY_POINTS )
-@@ -319,7 +319,7 @@ macro (add_deqp_module MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
+@@ -316,7 +316,7 @@ macro (add_deqp_module MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
 	set(DEQP_MODULE_LIBRARIES		${DEQP_MODULE_LIBRARIES} PARENT_SCOPE)
 	set(DEQP_MODULE_ENTRY_POINTS	${DEQP_MODULE_ENTRY_POINTS} PARENT_SCOPE)
 
@@ -41,7 +41,7 @@ index 309bdda18..7c833751f 100644
 		# Executable target
 		add_executable(${MODULE_NAME} ${PROJECT_SOURCE_DIR}/framework/platform/tcuMain.cpp ${ENTRY})
 		target_link_libraries(${MODULE_NAME} PUBLIC "${EXECLIBS}" "${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}")
-@@ -341,7 +341,7 @@ macro (add_deqp_module_skip_android MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
+@@ -338,7 +338,7 @@ macro (add_deqp_module_skip_android MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
 	add_library("${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}" STATIC ${SRCS})
 	target_link_libraries("${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}" ${LIBS})
 
@@ -50,7 +50,7 @@ index 309bdda18..7c833751f 100644
 		# Executable target
 		add_executable(${MODULE_NAME} ${PROJECT_SOURCE_DIR}/framework/platform/tcuMain.cpp ${ENTRY})
 		target_link_libraries(${MODULE_NAME} PUBLIC "${EXECLIBS}" "${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}")
-@@ -393,37 +393,7 @@ add_subdirectory(external/vulkancts/vkscpc ${MAYBE_EXCLUDE_FROM_ALL})
+@@ -390,37 +390,7 @@ add_subdirectory(external/vulkancts/vkscpc ${MAYBE_EXCLUDE_FROM_ALL})
 add_subdirectory(external/openglcts ${MAYBE_EXCLUDE_FROM_ALL})
 
 # Single-binary targets
@@ -90,54 +90,54 @@ index 309bdda18..7c833751f 100644
 	set(DEQP_IOS_CODE_SIGN_IDENTITY "drawElements" CACHE STRING "Code sign identity for iOS build")
 
 diff --git a/framework/platform/android/tcuAndroidNativeActivity.cpp b/framework/platform/android/tcuAndroidNativeActivity.cpp
-index 82a9ab699..4eab14a39 100644
+index 6f8cd8fc5..b83e30f41 100644
 --- a/framework/platform/android/tcuAndroidNativeActivity.cpp
 +++ b/framework/platform/android/tcuAndroidNativeActivity.cpp
-@@ -115,23 +115,25 @@ namespace Android
- 
- NativeActivity::NativeActivity(ANativeActivity *activity) : m_activity(activity)
+@@ -116,23 +116,25 @@ namespace Android
+ NativeActivity::NativeActivity (ANativeActivity* activity)
+ 	: m_activity(activity)
 {
-    activity->instance                              = (void *)this;
-    activity->callbacks->onStart                    = onStartCallback;
-    activity->callbacks->onResume                   = onResumeCallback;
-    activity->callbacks->onSaveInstanceState        = onSaveInstanceStateCallback;
-    activity->callbacks->onPause                    = onPauseCallback;
-    activity->callbacks->onStop                     = onStopCallback;
-    activity->callbacks->onDestroy                  = onDestroyCallback;
-    activity->callbacks->onWindowFocusChanged       = onWindowFocusChangedCallback;
-    activity->callbacks->onNativeWindowCreated      = onNativeWindowCreatedCallback;
-    activity->callbacks->onNativeWindowResized      = onNativeWindowResizedCallback;
-    activity->callbacks->onNativeWindowRedrawNeeded = onNativeWindowRedrawNeededCallback;
-    activity->callbacks->onNativeWindowDestroyed    = onNativeWindowDestroyedCallback;
-    activity->callbacks->onInputQueueCreated        = onInputQueueCreatedCallback;
-    activity->callbacks->onInputQueueDestroyed      = onInputQueueDestroyedCallback;
-    activity->callbacks->onContentRectChanged       = onContentRectChangedCallback;
-    activity->callbacks->onConfigurationChanged     = onConfigurationChangedCallback;
-    activity->callbacks->onLowMemory                = onLowMemoryCallback;
-+    if (activity) {
-+        activity->instance                              = (void *)this;
-+        activity->callbacks->onStart                    = onStartCallback;
-+        activity->callbacks->onResume                   = onResumeCallback;
-+        activity->callbacks->onSaveInstanceState        = onSaveInstanceStateCallback;
-+        activity->callbacks->onPause                    = onPauseCallback;
-+        activity->callbacks->onStop                     = onStopCallback;
-+        activity->callbacks->onDestroy                  = onDestroyCallback;
-+        activity->callbacks->onWindowFocusChanged       = onWindowFocusChangedCallback;
-+        activity->callbacks->onNativeWindowCreated      = onNativeWindowCreatedCallback;
-+        activity->callbacks->onNativeWindowResized      = onNativeWindowResizedCallback;
-+        activity->callbacks->onNativeWindowRedrawNeeded = onNativeWindowRedrawNeededCallback;
-+        activity->callbacks->onNativeWindowDestroyed    = onNativeWindowDestroyedCallback;
-+        activity->callbacks->onInputQueueCreated        = onInputQueueCreatedCallback;
-+        activity->callbacks->onInputQueueDestroyed      = onInputQueueDestroyedCallback;
-+        activity->callbacks->onContentRectChanged       = onContentRectChangedCallback;
-+        activity->callbacks->onConfigurationChanged     = onConfigurationChangedCallback;
-+        activity->callbacks->onLowMemory                = onLowMemoryCallback;
-+    }
+-	activity->instance								= (void*)this;
+-	activity->callbacks->onStart					= onStartCallback;
+-	activity->callbacks->onResume					= onResumeCallback;
+-	activity->callbacks->onSaveInstanceState		= onSaveInstanceStateCallback;
+-	activity->callbacks->onPause					= onPauseCallback;
+-	activity->callbacks->onStop						= onStopCallback;
+-	activity->callbacks->onDestroy					= onDestroyCallback;
+-	activity->callbacks->onWindowFocusChanged		= onWindowFocusChangedCallback;
+-	activity->callbacks->onNativeWindowCreated		= onNativeWindowCreatedCallback;
+-	activity->callbacks->onNativeWindowResized		= onNativeWindowResizedCallback;
+-	activity->callbacks->onNativeWindowRedrawNeeded	= onNativeWindowRedrawNeededCallback;
+-	activity->callbacks->onNativeWindowDestroyed	= onNativeWindowDestroyedCallback;
+-	activity->callbacks->onInputQueueCreated		= onInputQueueCreatedCallback;
+-	activity->callbacks->onInputQueueDestroyed		= onInputQueueDestroyedCallback;
+-	activity->callbacks->onContentRectChanged		= onContentRectChangedCallback;
+-	activity->callbacks->onConfigurationChanged		= onConfigurationChangedCallback;
+-	activity->callbacks->onLowMemory				= onLowMemoryCallback;
+	if (activity) {
+		activity->instance								= (void*)this;
+		activity->callbacks->onStart					= onStartCallback;
+		activity->callbacks->onResume					= onResumeCallback;
+		activity->callbacks->onSaveInstanceState		= onSaveInstanceStateCallback;
+		activity->callbacks->onPause					= onPauseCallback;
+		activity->callbacks->onStop						= onStopCallback;
+		activity->callbacks->onDestroy					= onDestroyCallback;
+		activity->callbacks->onWindowFocusChanged		= onWindowFocusChangedCallback;
+		activity->callbacks->onNativeWindowCreated		= onNativeWindowCreatedCallback;
+		activity->callbacks->onNativeWindowResized		= onNativeWindowResizedCallback;
+		activity->callbacks->onNativeWindowRedrawNeeded	= onNativeWindowRedrawNeededCallback;
+		activity->callbacks->onNativeWindowDestroyed	= onNativeWindowDestroyedCallback;
+		activity->callbacks->onInputQueueCreated		= onInputQueueCreatedCallback;
+		activity->callbacks->onInputQueueDestroyed		= onInputQueueDestroyedCallback;
+		activity->callbacks->onContentRectChanged		= onContentRectChangedCallback;
+		activity->callbacks->onConfigurationChanged		= onConfigurationChangedCallback;
+		activity->callbacks->onLowMemory				= onLowMemoryCallback;
+	}
 }
 
- NativeActivity::~NativeActivity(void)
+ NativeActivity::~NativeActivity (void)
 diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp
-index 0472fa615..ff8929409 100644
+index b8a35898c..cf02e6b70 100644
 --- a/framework/platform/android/tcuAndroidPlatform.cpp
 +++ b/framework/platform/android/tcuAndroidPlatform.cpp
@@ -22,6 +22,7 @@
@@ -148,35 +148,35 @@ index 0472fa615..ff8929409 100644
 #include "tcuAndroidUtil.hpp"
 #include "gluRenderContext.hpp"
 #include "egluNativeDisplay.hpp"
-@@ -198,7 +199,7 @@ eglu::NativeWindow *NativeWindowFactory::createWindow(const eglu::WindowParams &
-     Window *window = m_windowRegistry.tryAcquireWindow();
+@@ -170,7 +171,7 @@ eglu::NativeWindow* NativeWindowFactory::createWindow (const eglu::WindowParams&
+ 	Window* window = m_windowRegistry.tryAcquireWindow();
 
-     if (!window)
-        throw ResourceError("Native window is not available", DE_NULL, __FILE__, __LINE__);
-+        throw NotSupportedError("Native window is not available", DE_NULL, __FILE__, __LINE__);
+ 	if (!window)
+-		throw ResourceError("Native window is not available", DE_NULL, __FILE__, __LINE__);
+		throw NotSupportedError("Native window is not available", DE_NULL, __FILE__, __LINE__);
 
-     return new NativeWindow(window, params.width, params.height, format);
+ 	return new NativeWindow(window, params.width, params.height, format);
 }
-@@ -319,6 +320,9 @@ static size_t getTotalSystemMemory(ANativeActivity *activity)
+@@ -292,6 +293,9 @@ static size_t getTotalSystemMemory (ANativeActivity* activity)
 
-     try
-     {
-+        if (!activity)
-+            throw tcu::InternalError("No activity (running from command line?");
+ 	try
+ 	{
+		if (!activity)
+			throw tcu::InternalError("No activity (running from command line?");
 +
-         const size_t totalMemory = getTotalAndroidSystemMemory(activity);
-         print("Device has %.2f MiB of system memory\n", static_cast<double>(totalMemory) / static_cast<double>(MiB));
-         return totalMemory;
-@@ -416,3 +420,9 @@ bool Platform::hasDisplay(vk::wsi::Type wsiType) const
+ 		const size_t totalMemory = getTotalAndroidSystemMemory(activity);
+ 		print("Device has %.2f MiB of system memory\n", static_cast<double>(totalMemory) / static_cast<double>(MiB));
+ 		return totalMemory;
+@@ -388,3 +392,9 @@ bool Platform::hasDisplay (vk::wsi::Type wsiType) const
 
- } // namespace Android
- } // namespace tcu
+ } // Android
+ } // tcu
 +
 +tcu::Platform* createPlatform (void)
 +{
-+    tcu::Android::NativeActivity activity(NULL);
-+    return new tcu::Android::Platform(activity);
+	tcu::Android::NativeActivity activity(NULL);
+	return new tcu::Android::Platform(activity);
 +}
 -- 
-2.45.2
+2.42.0

--- a/.gitlab-ci/container/patches/build-deqp-gl_Build-Don-t-build-Vulkan-utilities-for-GL-builds.patch
+++ b/.gitlab-ci/container/patches/build-deqp-gl_Build-Don-t-build-Vulkan-utilities-for-GL-builds.patch
@@ -1,328 +0,0 @@
-From 4f53bcbb597a91bab715bc8d555cfd6c81263ac1 Mon Sep 17 00:00:00 2001
-From: Daniel Stone <daniels@collabora.com>
-Date: Wed, 29 Jan 2025 12:50:33 +0000
-Subject: [PATCH] Build: Don't build Vulkan utilities for GL builds
-
-Change-Id: Ie412f914bb6264ffbd502deea57d80cc11a9948e
-Signed-off-by: Daniel Stone <daniels@collabora.com>
---
- framework/platform/CMakeLists.txt             |   9 --
- .../platform/android/tcuAndroidPlatform.cpp   | 118 ------------------
- framework/platform/lnx/tcuLnxPlatform.cpp     |   9 +-
- .../surfaceless/tcuSurfacelessPlatform.cpp    |  54 --------
- 4 files changed, 1 insertion(+), 189 deletions(-)
-
-diff --git a/framework/platform/CMakeLists.txt b/framework/platform/CMakeLists.txt
-index ec1deb5c2..49fe412a7 100644
--- a/framework/platform/CMakeLists.txt
-+++ b/framework/platform/CMakeLists.txt
-@@ -15,8 +15,6 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS)
- 			win32/tcuWin32Window.hpp
- 			win32/tcuWin32EGLNativeDisplayFactory.hpp
- 			win32/tcuWin32EGLNativeDisplayFactory.cpp
-			win32/tcuWin32VulkanPlatform.hpp
-			win32/tcuWin32VulkanPlatform.cpp
- 			)
- 
- 	elseif ((DE_OS_IS_UNIX OR DE_OS_IS_OSX) AND (DEQP_USE_X11 OR DEQP_USE_WAYLAND OR DEQP_USE_HEADLESS))
-@@ -28,8 +26,6 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS)
- 			lnx/tcuLnxPlatform.hpp
- 			lnx/tcuLnxEglPlatform.hpp
- 			lnx/tcuLnxEglPlatform.cpp
-			lnx/tcuLnxVulkanPlatform.hpp
-			lnx/tcuLnxVulkanPlatform.cpp
- 		)
- 
- 		include_directories(lnx)
-@@ -164,8 +160,6 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS)
- 		set(TCUTIL_PLATFORM_SRCS
- 			osx/tcuOSXPlatform.cpp
- 			osx/tcuOSXPlatform.hpp
-			osx/tcuOSXVulkanPlatform.cpp
-			osx/tcuOSXVulkanPlatform.hpp
- 			osx/tcuOSXMetalView.mm
- 			osx/tcuOSXMetalView.hpp
- 			)
-@@ -191,9 +185,6 @@ if (DEQP_USE_WAYLAND)
- 	add_dependencies(tcutil-platform deqp-xdg-shell)
- endif()
- 
-# Add vkutil to the deps before tcutil so that it picks up the c++11 dependencies
-target_link_libraries(tcutil-platform vkutil)
-
- target_link_libraries(tcutil-platform tcutil ${TCUTIL_PLATFORM_LIBS})
- 
- # Always link to glutil as some platforms such as Win32 always support GL
-diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp
-index 0472fa615..87033ad56 100644
--- a/framework/platform/android/tcuAndroidPlatform.cpp
-+++ b/framework/platform/android/tcuAndroidPlatform.cpp
-@@ -31,7 +31,6 @@
- #include "eglwLibrary.hpp"
- #include "eglwEnums.hpp"
- #include "tcuFunctionLibrary.hpp"
-#include "vkWsiPlatform.hpp"
- 
- // Assume no call translation is needed
- #include <android/native_window.h>
-@@ -217,102 +216,6 @@ eglu::NativeDisplay *NativeDisplayFactory::createDisplay(const EGLAttrib *attrib
-     return new NativeDisplay();
- }
- 
-// Vulkan
-
-class VulkanLibrary : public vk::Library
-{
-public:
-    VulkanLibrary(const char *libraryPath)
-        : m_library(libraryPath != DE_NULL ? libraryPath : "libvulkan.so")
-        , m_driver(m_library)
-    {
-    }
-
-    const vk::PlatformInterface &getPlatformInterface(void) const
-    {
-        return m_driver;
-    }
-
-    const tcu::FunctionLibrary &getFunctionLibrary(void) const
-    {
-        return m_library;
-    }
-
-private:
-    const tcu::DynamicFunctionLibrary m_library;
-    const vk::PlatformDriver m_driver;
-};
-
-DE_STATIC_ASSERT(sizeof(vk::pt::AndroidNativeWindowPtr) == sizeof(ANativeWindow *));
-
-class VulkanWindow : public vk::wsi::AndroidWindowInterface
-{
-public:
-    VulkanWindow(tcu::Android::Window &window)
-        : vk::wsi::AndroidWindowInterface(vk::pt::AndroidNativeWindowPtr(window.getNativeWindow()))
-        , m_window(window)
-    {
-    }
-
-    void setVisible(bool visible)
-    {
-        DE_UNREF(visible);
-    }
-
-    void resize(const UVec2 &newSize)
-    {
-        DE_UNREF(newSize);
-    }
-
-    void setMinimized(bool minimized)
-    {
-        DE_UNREF(minimized);
-        TCU_THROW(NotSupportedError, "Minimized on Android is not implemented");
-    }
-
-    ~VulkanWindow(void)
-    {
-        m_window.release();
-    }
-
-private:
-    tcu::Android::Window &m_window;
-};
-
-class VulkanDisplay : public vk::wsi::Display
-{
-public:
-    VulkanDisplay(WindowRegistry &windowRegistry) : m_windowRegistry(windowRegistry)
-    {
-    }
-
-    vk::wsi::Window *createWindow(const Maybe<UVec2> &initialSize) const
-    {
-        Window *const window = m_windowRegistry.tryAcquireWindow();
-
-        if (window)
-        {
-            try
-            {
-                if (initialSize)
-                    window->setBuffersGeometry((int)initialSize->x(), (int)initialSize->y(), WINDOW_FORMAT_RGBA_8888);
-
-                return new VulkanWindow(*window);
-            }
-            catch (...)
-            {
-                window->release();
-                throw;
-            }
-        }
-        else
-            TCU_THROW(ResourceError, "Native window is not available");
-    }
-
-private:
-    WindowRegistry &m_windowRegistry;
-};
-
- static size_t getTotalSystemMemory(ANativeActivity *activity)
- {
-     const size_t MiB = (size_t)(1 << 20);
-@@ -355,11 +258,6 @@ bool Platform::processEvents(void)
-     return true;
- }
- 
-vk::Library *Platform::createLibrary(const char *libraryPath) const
-{
-    return new VulkanLibrary(libraryPath);
-}
-
- void Platform::describePlatform(std::ostream &dst) const
- {
-     tcu::Android::describePlatform(m_activity.getNativeActivity(), dst);
-@@ -398,21 +296,5 @@ void Platform::getMemoryLimits(tcu::PlatformMemoryLimits &limits) const
-     limits.devicePageTableHierarchyLevels    = 3;
- }
- 
-vk::wsi::Display *Platform::createWsiDisplay(vk::wsi::Type wsiType) const
-{
-    if (wsiType == vk::wsi::TYPE_ANDROID)
-        return new VulkanDisplay(const_cast<WindowRegistry &>(m_windowRegistry));
-    else
-        TCU_THROW(NotSupportedError, "WSI type not supported on Android");
-}
-
-bool Platform::hasDisplay(vk::wsi::Type wsiType) const
-{
-    if (wsiType == vk::wsi::TYPE_ANDROID)
-        return true;
-
-    return false;
-}
-
- } // namespace Android
- } // namespace tcu
-diff --git a/framework/platform/lnx/tcuLnxPlatform.cpp b/framework/platform/lnx/tcuLnxPlatform.cpp
-index 8c0a3ef06..6b1a4985a 100644
--- a/framework/platform/lnx/tcuLnxPlatform.cpp
-+++ b/framework/platform/lnx/tcuLnxPlatform.cpp
-@@ -23,12 +23,10 @@
- 
- #include "tcuLnxPlatform.hpp"
- 
-#include "tcuLnxVulkanPlatform.hpp"
- #include "tcuLnxEglPlatform.hpp"
- 
- #include "deUniquePtr.hpp"
- #include "gluPlatform.hpp"
-#include "vkPlatform.hpp"
- 
- #if defined(DEQP_SUPPORT_X11)
- #include <X11/Xlib.h>
-@@ -64,10 +62,6 @@ public:
-         return !m_eventState.getQuitFlag();
-     }
- 
-    const vk::Platform &getVulkanPlatform(void) const
-    {
-        return m_vkPlatform;
-    }
-     const eglu::Platform &getEGLPlatform(void) const
-     {
-         return m_eglPlatform;
-@@ -79,12 +73,11 @@ public:
- 
- private:
-     EventState m_eventState;
-    VulkanPlatform m_vkPlatform;
-     egl::Platform m_eglPlatform;
-     LinuxGLPlatform m_glPlatform;
- };
- 
-LinuxPlatform::LinuxPlatform(void) : m_vkPlatform(m_eventState), m_eglPlatform(m_eventState)
-+LinuxPlatform::LinuxPlatform(void) : m_eglPlatform(m_eventState)
- {
- #if defined(DEQP_SUPPORT_GLX)
-     m_glPlatform.registerFactory(x11::glx::createContextFactory(m_eventState));
-diff --git a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
-index 1cea9dd97..3d5bd8b62 100644
--- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
-+++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
-@@ -43,7 +43,6 @@
- #include "tcuPixelFormat.hpp"
- #include "tcuPlatform.hpp"
- #include "tcuRenderTarget.hpp"
-#include "vkPlatform.hpp"
- 
- #include <EGL/egl.h>
- 
-@@ -93,52 +92,6 @@ namespace tcu
- namespace surfaceless
- {
- 
-class VulkanLibrary : public vk::Library
-{
-public:
-    VulkanLibrary(const char *libraryPath)
-        : m_library(libraryPath != DE_NULL ? libraryPath : DEQP_VULKAN_LIBRARY_PATH)
-        , m_driver(m_library)
-    {
-    }
-
-    const vk::PlatformInterface &getPlatformInterface(void) const
-    {
-        return m_driver;
-    }
-    const tcu::FunctionLibrary &getFunctionLibrary(void) const
-    {
-        return m_library;
-    }
-
-private:
-    const tcu::DynamicFunctionLibrary m_library;
-    const vk::PlatformDriver m_driver;
-};
-
-// Copied from tcuX11Platform.cpp
-class VulkanPlatform : public vk::Platform
-{
-public:
-    vk::Library *createLibrary(const char *libraryPath) const
-    {
-        return new VulkanLibrary(libraryPath);
-    }
-
-    void describePlatform(std::ostream &dst) const
-    {
-        utsname sysInfo;
-
-        deMemset(&sysInfo, 0, sizeof(sysInfo));
-
-        if (uname(&sysInfo) != 0)
-            throw std::runtime_error("uname() failed");
-
-        dst << "OS: " << sysInfo.sysname << " " << sysInfo.release << " " << sysInfo.version << "\n";
-        dst << "CPU: " << sysInfo.machine << "\n";
-    }
-};
-
- bool isEGLExtensionSupported(const eglw::Library &egl, eglw::EGLDisplay, const std::string &extName)
- {
-     const vector<string> exts = eglu::getClientExtensions(egl);
-@@ -185,13 +138,6 @@ public:
-     {
-         return *this;
-     }
-    const vk::Platform &getVulkanPlatform(void) const
-    {
-        return m_vkPlatform;
-    }
-
-private:
-    VulkanPlatform m_vkPlatform;
- };
- 
- class ContextFactory : public glu::ContextFactory
-- 
-2.48.1
-
--- a/.gitlab-ci/container/patches/build-deqp-gles_Allow-running-on-Android-from-the-command-line.patch
+++ b/.gitlab-ci/container/patches/build-deqp-gles_Allow-running-on-Android-from-the-command-line.patch
@@ -1,4 +1,4 @@
-From 2503bf1be98eaa810672f6a6eb8f735a33511a4f Mon Sep 17 00:00:00 2001
+From dc97ee83a813f6b170079ddf2a04bbb06221a5a7 Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Fri, 26 Aug 2022 18:24:27 +0200
 Subject: [PATCH 1/2] Allow running on Android from the command line
@@ -20,10 +20,10 @@ Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 3 files changed, 34 insertions(+), 52 deletions(-)

 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 309bdda18..7c833751f 100644
+index eb58cc7ba..98b8fc6cc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -275,7 +275,7 @@ include_directories(
+@@ -272,7 +272,7 @@ include_directories(
 	external/vulkancts/framework/vulkan
 	)
 
@@ -32,7 +32,7 @@ index 309bdda18..7c833751f 100644
 	# On Android deqp modules are compiled as libraries and linked into final .so
 	set(DEQP_MODULE_LIBRARIES )
 	set(DEQP_MODULE_ENTRY_POINTS )
-@@ -319,7 +319,7 @@ macro (add_deqp_module MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
+@@ -316,7 +316,7 @@ macro (add_deqp_module MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
 	set(DEQP_MODULE_LIBRARIES		${DEQP_MODULE_LIBRARIES} PARENT_SCOPE)
 	set(DEQP_MODULE_ENTRY_POINTS	${DEQP_MODULE_ENTRY_POINTS} PARENT_SCOPE)
 
@@ -41,7 +41,7 @@ index 309bdda18..7c833751f 100644
 		# Executable target
 		add_executable(${MODULE_NAME} ${PROJECT_SOURCE_DIR}/framework/platform/tcuMain.cpp ${ENTRY})
 		target_link_libraries(${MODULE_NAME} PUBLIC "${EXECLIBS}" "${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}")
-@@ -341,7 +341,7 @@ macro (add_deqp_module_skip_android MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
+@@ -338,7 +338,7 @@ macro (add_deqp_module_skip_android MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
 	add_library("${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}" STATIC ${SRCS})
 	target_link_libraries("${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}" ${LIBS})
 
@@ -50,7 +50,7 @@ index 309bdda18..7c833751f 100644
 		# Executable target
 		add_executable(${MODULE_NAME} ${PROJECT_SOURCE_DIR}/framework/platform/tcuMain.cpp ${ENTRY})
 		target_link_libraries(${MODULE_NAME} PUBLIC "${EXECLIBS}" "${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}")
-@@ -393,37 +393,7 @@ add_subdirectory(external/vulkancts/vkscpc ${MAYBE_EXCLUDE_FROM_ALL})
+@@ -390,37 +390,7 @@ add_subdirectory(external/vulkancts/vkscpc ${MAYBE_EXCLUDE_FROM_ALL})
 add_subdirectory(external/openglcts ${MAYBE_EXCLUDE_FROM_ALL})
 
 # Single-binary targets
@@ -90,54 +90,54 @@ index 309bdda18..7c833751f 100644
 	set(DEQP_IOS_CODE_SIGN_IDENTITY "drawElements" CACHE STRING "Code sign identity for iOS build")
 
 diff --git a/framework/platform/android/tcuAndroidNativeActivity.cpp b/framework/platform/android/tcuAndroidNativeActivity.cpp
-index 82a9ab699..4eab14a39 100644
+index 6f8cd8fc5..b83e30f41 100644
 --- a/framework/platform/android/tcuAndroidNativeActivity.cpp
 +++ b/framework/platform/android/tcuAndroidNativeActivity.cpp
-@@ -115,23 +115,25 @@ namespace Android
- 
- NativeActivity::NativeActivity(ANativeActivity *activity) : m_activity(activity)
+@@ -116,23 +116,25 @@ namespace Android
+ NativeActivity::NativeActivity (ANativeActivity* activity)
+ 	: m_activity(activity)
 {
-    activity->instance                              = (void *)this;
-    activity->callbacks->onStart                    = onStartCallback;
-    activity->callbacks->onResume                   = onResumeCallback;
-    activity->callbacks->onSaveInstanceState        = onSaveInstanceStateCallback;
-    activity->callbacks->onPause                    = onPauseCallback;
-    activity->callbacks->onStop                     = onStopCallback;
-    activity->callbacks->onDestroy                  = onDestroyCallback;
-    activity->callbacks->onWindowFocusChanged       = onWindowFocusChangedCallback;
-    activity->callbacks->onNativeWindowCreated      = onNativeWindowCreatedCallback;
-    activity->callbacks->onNativeWindowResized      = onNativeWindowResizedCallback;
-    activity->callbacks->onNativeWindowRedrawNeeded = onNativeWindowRedrawNeededCallback;
-    activity->callbacks->onNativeWindowDestroyed    = onNativeWindowDestroyedCallback;
-    activity->callbacks->onInputQueueCreated        = onInputQueueCreatedCallback;
-    activity->callbacks->onInputQueueDestroyed      = onInputQueueDestroyedCallback;
-    activity->callbacks->onContentRectChanged       = onContentRectChangedCallback;
-    activity->callbacks->onConfigurationChanged     = onConfigurationChangedCallback;
-    activity->callbacks->onLowMemory                = onLowMemoryCallback;
-+    if (activity) {
-+        activity->instance                              = (void *)this;
-+        activity->callbacks->onStart                    = onStartCallback;
-+        activity->callbacks->onResume                   = onResumeCallback;
-+        activity->callbacks->onSaveInstanceState        = onSaveInstanceStateCallback;
-+        activity->callbacks->onPause                    = onPauseCallback;
-+        activity->callbacks->onStop                     = onStopCallback;
-+        activity->callbacks->onDestroy                  = onDestroyCallback;
-+        activity->callbacks->onWindowFocusChanged       = onWindowFocusChangedCallback;
-+        activity->callbacks->onNativeWindowCreated      = onNativeWindowCreatedCallback;
-+        activity->callbacks->onNativeWindowResized      = onNativeWindowResizedCallback;
-+        activity->callbacks->onNativeWindowRedrawNeeded = onNativeWindowRedrawNeededCallback;
-+        activity->callbacks->onNativeWindowDestroyed    = onNativeWindowDestroyedCallback;
-+        activity->callbacks->onInputQueueCreated        = onInputQueueCreatedCallback;
-+        activity->callbacks->onInputQueueDestroyed      = onInputQueueDestroyedCallback;
-+        activity->callbacks->onContentRectChanged       = onContentRectChangedCallback;
-+        activity->callbacks->onConfigurationChanged     = onConfigurationChangedCallback;
-+        activity->callbacks->onLowMemory                = onLowMemoryCallback;
-+    }
+-	activity->instance								= (void*)this;
+-	activity->callbacks->onStart					= onStartCallback;
+-	activity->callbacks->onResume					= onResumeCallback;
+-	activity->callbacks->onSaveInstanceState		= onSaveInstanceStateCallback;
+-	activity->callbacks->onPause					= onPauseCallback;
+-	activity->callbacks->onStop						= onStopCallback;
+-	activity->callbacks->onDestroy					= onDestroyCallback;
+-	activity->callbacks->onWindowFocusChanged		= onWindowFocusChangedCallback;
+-	activity->callbacks->onNativeWindowCreated		= onNativeWindowCreatedCallback;
+-	activity->callbacks->onNativeWindowResized		= onNativeWindowResizedCallback;
+-	activity->callbacks->onNativeWindowRedrawNeeded	= onNativeWindowRedrawNeededCallback;
+-	activity->callbacks->onNativeWindowDestroyed	= onNativeWindowDestroyedCallback;
+-	activity->callbacks->onInputQueueCreated		= onInputQueueCreatedCallback;
+-	activity->callbacks->onInputQueueDestroyed		= onInputQueueDestroyedCallback;
+-	activity->callbacks->onContentRectChanged		= onContentRectChangedCallback;
+-	activity->callbacks->onConfigurationChanged		= onConfigurationChangedCallback;
+-	activity->callbacks->onLowMemory				= onLowMemoryCallback;
+	if (activity) {
+		activity->instance								= (void*)this;
+		activity->callbacks->onStart					= onStartCallback;
+		activity->callbacks->onResume					= onResumeCallback;
+		activity->callbacks->onSaveInstanceState		= onSaveInstanceStateCallback;
+		activity->callbacks->onPause					= onPauseCallback;
+		activity->callbacks->onStop						= onStopCallback;
+		activity->callbacks->onDestroy					= onDestroyCallback;
+		activity->callbacks->onWindowFocusChanged		= onWindowFocusChangedCallback;
+		activity->callbacks->onNativeWindowCreated		= onNativeWindowCreatedCallback;
+		activity->callbacks->onNativeWindowResized		= onNativeWindowResizedCallback;
+		activity->callbacks->onNativeWindowRedrawNeeded	= onNativeWindowRedrawNeededCallback;
+		activity->callbacks->onNativeWindowDestroyed	= onNativeWindowDestroyedCallback;
+		activity->callbacks->onInputQueueCreated		= onInputQueueCreatedCallback;
+		activity->callbacks->onInputQueueDestroyed		= onInputQueueDestroyedCallback;
+		activity->callbacks->onContentRectChanged		= onContentRectChangedCallback;
+		activity->callbacks->onConfigurationChanged		= onConfigurationChangedCallback;
+		activity->callbacks->onLowMemory				= onLowMemoryCallback;
+	}
 }
 
- NativeActivity::~NativeActivity(void)
+ NativeActivity::~NativeActivity (void)
 diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp
-index 0472fa615..ff8929409 100644
+index b8a35898c..cf02e6b70 100644
 --- a/framework/platform/android/tcuAndroidPlatform.cpp
 +++ b/framework/platform/android/tcuAndroidPlatform.cpp
@@ -22,6 +22,7 @@
@@ -148,35 +148,35 @@ index 0472fa615..ff8929409 100644
 #include "tcuAndroidUtil.hpp"
 #include "gluRenderContext.hpp"
 #include "egluNativeDisplay.hpp"
-@@ -198,7 +199,7 @@ eglu::NativeWindow *NativeWindowFactory::createWindow(const eglu::WindowParams &
-     Window *window = m_windowRegistry.tryAcquireWindow();
+@@ -170,7 +171,7 @@ eglu::NativeWindow* NativeWindowFactory::createWindow (const eglu::WindowParams&
+ 	Window* window = m_windowRegistry.tryAcquireWindow();
 
-     if (!window)
-        throw ResourceError("Native window is not available", DE_NULL, __FILE__, __LINE__);
-+        throw NotSupportedError("Native window is not available", DE_NULL, __FILE__, __LINE__);
+ 	if (!window)
+-		throw ResourceError("Native window is not available", DE_NULL, __FILE__, __LINE__);
+		throw NotSupportedError("Native window is not available", DE_NULL, __FILE__, __LINE__);
 
-     return new NativeWindow(window, params.width, params.height, format);
+ 	return new NativeWindow(window, params.width, params.height, format);
 }
-@@ -319,6 +320,9 @@ static size_t getTotalSystemMemory(ANativeActivity *activity)
+@@ -292,6 +293,9 @@ static size_t getTotalSystemMemory (ANativeActivity* activity)
 
-     try
-     {
-+        if (!activity)
-+            throw tcu::InternalError("No activity (running from command line?");
+ 	try
+ 	{
+		if (!activity)
+			throw tcu::InternalError("No activity (running from command line?");
 +
-         const size_t totalMemory = getTotalAndroidSystemMemory(activity);
-         print("Device has %.2f MiB of system memory\n", static_cast<double>(totalMemory) / static_cast<double>(MiB));
-         return totalMemory;
-@@ -416,3 +420,9 @@ bool Platform::hasDisplay(vk::wsi::Type wsiType) const
+ 		const size_t totalMemory = getTotalAndroidSystemMemory(activity);
+ 		print("Device has %.2f MiB of system memory\n", static_cast<double>(totalMemory) / static_cast<double>(MiB));
+ 		return totalMemory;
+@@ -388,3 +392,9 @@ bool Platform::hasDisplay (vk::wsi::Type wsiType) const
 
- } // namespace Android
- } // namespace tcu
+ } // Android
+ } // tcu
 +
 +tcu::Platform* createPlatform (void)
 +{
-+    tcu::Android::NativeActivity activity(NULL);
-+    return new tcu::Android::Platform(activity);
+	tcu::Android::NativeActivity activity(NULL);
+	return new tcu::Android::Platform(activity);
 +}
 -- 
-2.45.2
+2.42.0

--- a/.gitlab-ci/container/patches/build-deqp-vk_Allow-running-on-Android-from-the-command-line.patch
+++ b/.gitlab-ci/container/patches/build-deqp-vk_Allow-running-on-Android-from-the-command-line.patch
@@ -0,0 +1,173 @@
+From dc97ee83a813f6b170079ddf2a04bbb06221a5a7 Mon Sep 17 00:00:00 2001
+From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
+Date: Fri, 26 Aug 2022 18:24:27 +0200
+Subject: [PATCH 1/2] Allow running on Android from the command line
+
+For testing the Android EGL platform without having to go via the
+Android activity manager, build deqp-egl.
+
+Tests that render to native windows are unsupported, as command line
+programs cannot create windows on Android.
+
+$ cmake -S . -B build/ -DDEQP_TARGET=android -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror -DANDROID_NDK_PATH=./android-ndk-r21d -DANDROID_ABI=x86_64 -DDE_ANDROID_API=28 -DGLCTS_GTF_TARGET=gles32 -G Ninja
+$ ninja -C build modules/egl/deqp-egl
+
+Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
+---
+ CMakeLists.txt                                | 36 ++-----------------
+ .../android/tcuAndroidNativeActivity.cpp      | 36 ++++++++++---------
+ .../platform/android/tcuAndroidPlatform.cpp   | 12 ++++++-
+ 3 files changed, 33 insertions(+), 51 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f9c61d0db..d6ad2990b 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -272,7 +272,7 @@ include_directories(
+ 	external/vulkancts/framework/vulkan
+ 	)
+ 
+-if (DE_OS_IS_ANDROID OR DE_OS_IS_IOS)
+if (DE_OS_IS_IOS)
+ 	# On Android deqp modules are compiled as libraries and linked into final .so
+ 	set(DEQP_MODULE_LIBRARIES )
+ 	set(DEQP_MODULE_ENTRY_POINTS )
+@@ -316,7 +316,7 @@ macro (add_deqp_module MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
+ 	set(DEQP_MODULE_LIBRARIES		${DEQP_MODULE_LIBRARIES} PARENT_SCOPE)
+ 	set(DEQP_MODULE_ENTRY_POINTS	${DEQP_MODULE_ENTRY_POINTS} PARENT_SCOPE)
+ 
+-	if (NOT DE_OS_IS_ANDROID AND NOT DE_OS_IS_IOS)
+	if (NOT DE_OS_IS_IOS)
+ 		# Executable target
+ 		add_executable(${MODULE_NAME} ${PROJECT_SOURCE_DIR}/framework/platform/tcuMain.cpp ${ENTRY})
+ 		target_link_libraries(${MODULE_NAME} PUBLIC "${EXECLIBS}" "${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}")
+@@ -390,37 +390,7 @@ add_subdirectory(external/vulkancts/vkscpc ${MAYBE_EXCLUDE_FROM_ALL})
+ add_subdirectory(external/openglcts ${MAYBE_EXCLUDE_FROM_ALL})
+ 
+ # Single-binary targets
+-if (DE_OS_IS_ANDROID)
+-	include_directories(executor)
+-	include_directories(${PROJECT_BINARY_DIR}/external/vulkancts/framework/vulkan)
+-
+-	set(DEQP_SRCS
+-		framework/platform/android/tcuAndroidMain.cpp
+-		framework/platform/android/tcuAndroidJNI.cpp
+-		framework/platform/android/tcuAndroidPlatformCapabilityQueryJNI.cpp
+-		framework/platform/android/tcuTestLogParserJNI.cpp
+-		${DEQP_MODULE_ENTRY_POINTS}
+-		)
+-
+-	set(DEQP_LIBS
+-		tcutil-platform
+-		xecore
+-		${DEQP_MODULE_LIBRARIES}
+-		)
+-
+-	add_library(deqp SHARED ${DEQP_SRCS})
+-	target_link_libraries(deqp ${DEQP_LIBS})
+-
+-	# Separate out the debug information because it's enormous
+-	add_custom_command(TARGET deqp POST_BUILD
+-		COMMAND ${CMAKE_STRIP} --only-keep-debug -o $<TARGET_FILE:deqp>.debug $<TARGET_FILE:deqp>
+-		COMMAND ${CMAKE_STRIP} -g $<TARGET_FILE:deqp>)
+-
+-	# Needed by OpenGL CTS that defines its own activity but depends on
+-	# common Android support code.
+-	target_include_directories(deqp PRIVATE framework/platform/android)
+-
+-elseif (DE_OS_IS_IOS)
+if (DE_OS_IS_IOS)
+ 	# Code sign identity
+ 	set(DEQP_IOS_CODE_SIGN_IDENTITY "drawElements" CACHE STRING "Code sign identity for iOS build")
+ 
+diff --git a/framework/platform/android/tcuAndroidNativeActivity.cpp b/framework/platform/android/tcuAndroidNativeActivity.cpp
+index 6f8cd8fc5..b83e30f41 100644
+--- a/framework/platform/android/tcuAndroidNativeActivity.cpp
+++ b/framework/platform/android/tcuAndroidNativeActivity.cpp
+@@ -116,23 +116,25 @@ namespace Android
+ NativeActivity::NativeActivity (ANativeActivity* activity)
+ 	: m_activity(activity)
+ {
+-	activity->instance								= (void*)this;
+-	activity->callbacks->onStart					= onStartCallback;
+-	activity->callbacks->onResume					= onResumeCallback;
+-	activity->callbacks->onSaveInstanceState		= onSaveInstanceStateCallback;
+-	activity->callbacks->onPause					= onPauseCallback;
+-	activity->callbacks->onStop						= onStopCallback;
+-	activity->callbacks->onDestroy					= onDestroyCallback;
+-	activity->callbacks->onWindowFocusChanged		= onWindowFocusChangedCallback;
+-	activity->callbacks->onNativeWindowCreated		= onNativeWindowCreatedCallback;
+-	activity->callbacks->onNativeWindowResized		= onNativeWindowResizedCallback;
+-	activity->callbacks->onNativeWindowRedrawNeeded	= onNativeWindowRedrawNeededCallback;
+-	activity->callbacks->onNativeWindowDestroyed	= onNativeWindowDestroyedCallback;
+-	activity->callbacks->onInputQueueCreated		= onInputQueueCreatedCallback;
+-	activity->callbacks->onInputQueueDestroyed		= onInputQueueDestroyedCallback;
+-	activity->callbacks->onContentRectChanged		= onContentRectChangedCallback;
+-	activity->callbacks->onConfigurationChanged		= onConfigurationChangedCallback;
+-	activity->callbacks->onLowMemory				= onLowMemoryCallback;
+	if (activity) {
+		activity->instance								= (void*)this;
+		activity->callbacks->onStart					= onStartCallback;
+		activity->callbacks->onResume					= onResumeCallback;
+		activity->callbacks->onSaveInstanceState		= onSaveInstanceStateCallback;
+		activity->callbacks->onPause					= onPauseCallback;
+		activity->callbacks->onStop						= onStopCallback;
+		activity->callbacks->onDestroy					= onDestroyCallback;
+		activity->callbacks->onWindowFocusChanged		= onWindowFocusChangedCallback;
+		activity->callbacks->onNativeWindowCreated		= onNativeWindowCreatedCallback;
+		activity->callbacks->onNativeWindowResized		= onNativeWindowResizedCallback;
+		activity->callbacks->onNativeWindowRedrawNeeded	= onNativeWindowRedrawNeededCallback;
+		activity->callbacks->onNativeWindowDestroyed	= onNativeWindowDestroyedCallback;
+		activity->callbacks->onInputQueueCreated		= onInputQueueCreatedCallback;
+		activity->callbacks->onInputQueueDestroyed		= onInputQueueDestroyedCallback;
+		activity->callbacks->onContentRectChanged		= onContentRectChangedCallback;
+		activity->callbacks->onConfigurationChanged		= onConfigurationChangedCallback;
+		activity->callbacks->onLowMemory				= onLowMemoryCallback;
+	}
+ }
+ 
+ NativeActivity::~NativeActivity (void)
+diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp
+index b8a35898c..cf02e6b70 100644
+--- a/framework/platform/android/tcuAndroidPlatform.cpp
+++ b/framework/platform/android/tcuAndroidPlatform.cpp
+@@ -22,6 +22,7 @@
+  *//*--------------------------------------------------------------------*/
+ 
+ #include "tcuAndroidPlatform.hpp"
+#include "tcuAndroidNativeActivity.hpp"
+ #include "tcuAndroidUtil.hpp"
+ #include "gluRenderContext.hpp"
+ #include "egluNativeDisplay.hpp"
+@@ -170,7 +171,7 @@ eglu::NativeWindow* NativeWindowFactory::createWindow (const eglu::WindowParams&
+ 	Window* window = m_windowRegistry.tryAcquireWindow();
+ 
+ 	if (!window)
+-		throw ResourceError("Native window is not available", DE_NULL, __FILE__, __LINE__);
+		throw NotSupportedError("Native window is not available", DE_NULL, __FILE__, __LINE__);
+ 
+ 	return new NativeWindow(window, params.width, params.height, format);
+ }
+@@ -292,6 +293,9 @@ static size_t getTotalSystemMemory (ANativeActivity* activity)
+ 
+ 	try
+ 	{
+		if (!activity)
+			throw tcu::InternalError("No activity (running from command line?");
+
+ 		const size_t totalMemory = getTotalAndroidSystemMemory(activity);
+ 		print("Device has %.2f MiB of system memory\n", static_cast<double>(totalMemory) / static_cast<double>(MiB));
+ 		return totalMemory;
+@@ -388,3 +392,9 @@ bool Platform::hasDisplay (vk::wsi::Type wsiType) const
+ 
+ } // Android
+ } // tcu
+
+tcu::Platform* createPlatform (void)
+{
+	tcu::Android::NativeActivity activity(NULL);
+	return new tcu::Android::Platform(activity);
+}
+-- 
+2.42.0
+
--- a/.gitlab-ci/container/patches/build-deqp-vk_Android-prints-to-stdout-instead-of-logcat.patch
+++ b/.gitlab-ci/container/patches/build-deqp-vk_Android-prints-to-stdout-instead-of-logcat.patch
@@ -0,0 +1,26 @@
+From a602822c53e22e985f942f843ccadbfb64613212 Mon Sep 17 00:00:00 2001
+From: Helen Koike <helen.koike@collabora.com>
+Date: Tue, 27 Sep 2022 12:35:22 -0300
+Subject: [PATCH 2/2] Android prints to stdout instead of logcat
+
+Signed-off-by: Helen Koike <helen.koike@collabora.com>
+---
+ framework/qphelper/qpDebugOut.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/framework/qphelper/qpDebugOut.c b/framework/qphelper/qpDebugOut.c
+index 6579e9f48..c200c6f6b 100644
+--- a/framework/qphelper/qpDebugOut.c
+++ b/framework/qphelper/qpDebugOut.c
+@@ -98,7 +98,7 @@ void qpDiev (const char* format, va_list args)
+ }
+ 
+ /* print() implementation. */
+-#if (DE_OS == DE_OS_ANDROID)
+#if (0)
+ 
+ #include <android/log.h>
+ 
+-- 
+2.42.0
+
--- a/.gitlab-ci/container/setup-rootfs.sh
+++ b/.gitlab-ci/container/setup-rootfs.sh
@@ -5,8 +5,6 @@
 # KERNEL_ROOTFS_TAG
 set -ex

-. setup-test-env.sh
-
 export DEBIAN_FRONTEND=noninteractive

 # Needed for ci-fairy, this revision is able to upload files to
--- a/.gitlab-ci/container/setup-wine.sh
+++ b/.gitlab-ci/container/setup-wine.sh
@@ -2,8 +2,6 @@

 set -u

-uncollapsed_section_start wine "Setting up Wine"
-
 export WINEPREFIX="$1"
 export WINEDEBUG="-all"

@@ -26,5 +24,3 @@ rm crashdialog.reg
 # it a bit more of time for it to be created solves the problem
 # ...
 while ! test -f  "${WINEPREFIX}/system.reg"; do sleep 1; done
-
-section_end wine
--- a/.gitlab-ci/container/strip-rootfs.sh
+++ b/.gitlab-ci/container/strip-rootfs.sh
@@ -5,8 +5,6 @@
 # KERNEL_ROOTFS_TAG
 set -ex

-section_start strip-rootfs "Stripping rootfs"
-
 export DEBIAN_FRONTEND=noninteractive

 UNNEEDED_PACKAGES=(
@@ -157,5 +155,3 @@ EOF

 chmod +x /usr/bin/apt-get
 ln -s /usr/bin/apt-get /usr/bin/apt
-
-section_end strip-rootfs
--- a/.gitlab-ci/create-llvm-meson-wrap-file.sh
+++ b/.gitlab-ci/create-llvm-meson-wrap-file.sh
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-
-set -exu
-
-# Early check for required env variables, relies on `set -u`
-: "$ANDROID_LLVM_ARTIFACT_NAME"
-
-# if DEST_DIR is not set, assing an empty value, this prevents -u to fail
-: "${DEST_DIR:=}"
-
-# TODO, check if meson can do the download and wrap file generation for us.
-
-LLVM_INSTALL_PREFIX="${DEST_DIR}/${ANDROID_LLVM_ARTIFACT_NAME}"
-
-if [ ! -d "$LLVM_INSTALL_PREFIX" ]; then
-  echo "Cannot find an LLVM build in $LLVM_INSTALL_PREFIX" 1>&2
-  exit 1
-fi
-
-mkdir -p subprojects/llvm
-
-cat << EOF > subprojects/llvm/meson.build
-project('llvm', ['cpp'])
-
-cpp = meson.get_compiler('cpp')
-
-_deps = []
-_search = join_paths('$LLVM_INSTALL_PREFIX', 'lib')
-
-foreach d: ['libLLVMAggressiveInstCombine', 'libLLVMAnalysis', 'libLLVMAsmParser', 'libLLVMAsmPrinter', 'libLLVMBinaryFormat', 'libLLVMBitReader', 'libLLVMBitstreamReader', 'libLLVMBitWriter', 'libLLVMCFGuard', 'libLLVMCFIVerify', 'libLLVMCodeGen', 'libLLVMCodeGenTypes', 'libLLVMCore', 'libLLVMCoroutines', 'libLLVMCoverage', 'libLLVMDebugInfoBTF', 'libLLVMDebugInfoCodeView', 'libLLVMDebuginfod', 'libLLVMDebugInfoDWARF', 'libLLVMDebugInfoGSYM', 'libLLVMDebugInfoLogicalView', 'libLLVMDebugInfoMSF', 'libLLVMDebugInfoPDB', 'libLLVMDemangle', 'libLLVMDiff', 'libLLVMDlltoolDriver', 'libLLVMDWARFLinker', 'libLLVMDWARFLinkerClassic', 'libLLVMDWARFLinkerParallel', 'libLLVMDWP', 'libLLVMExecutionEngine', 'libLLVMExegesis', 'libLLVMExegesisX86', 'libLLVMExtensions', 'libLLVMFileCheck', 'libLLVMFrontendDriver', 'libLLVMFrontendHLSL', 'libLLVMFrontendOffloading', 'libLLVMFrontendOpenACC', 'libLLVMFrontendOpenMP', 'libLLVMFuzzerCLI', 'libLLVMFuzzMutate', 'libLLVMGlobalISel', 'libLLVMHipStdPar', 'libLLVMInstCombine', 'libLLVMInstrumentation', 'libLLVMInterfaceStub', 'libLLVMInterpreter', 'libLLVMipo', 'libLLVMIRPrinter', 'libLLVMIRReader', 'libLLVMJITLink', 'libLLVMLibDriver', 'libLLVMLineEditor', 'libLLVMLinker', 'libLLVMLTO', 'libLLVMMC', 'libLLVMMCA', 'libLLVMMCDisassembler', 'libLLVMMCJIT', 'libLLVMMCParser', 'libLLVMMIRParser', 'libLLVMObjCARCOpts', 'libLLVMObjCopy', 'libLLVMObject', 'libLLVMObjectYAML', 'libLLVMOption', 'libLLVMOrcDebugging', 'libLLVMOrcJIT', 'libLLVMOrcShared', 'libLLVMOrcTargetProcess', 'libLLVMPasses', 'libLLVMProfileData', 'libLLVMRemarks', 'libLLVMRuntimeDyld', 'libLLVMScalarOpts', 'libLLVMSelectionDAG', 'libLLVMSupport', 'libLLVMSymbolize', 'libLLVMTableGen', 'libLLVMTableGenCommon', 'libLLVMTarget', 'libLLVMTargetParser', 'libLLVMTextAPI', 'libLLVMTextAPIBinaryReader', 'libLLVMTransformUtils', 'libLLVMVectorize', 'libLLVMWindowsDriver', 'libLLVMWindowsManifest', 'libLLVMX86AsmParser', 'libLLVMX86CodeGen', 'libLLVMX86Desc', 'libLLVMX86Disassembler', 'libLLVMX86Info', 'libLLVMX86TargetMCA', 'libLLVMXRay']
-  _deps += cpp.find_library(d, dirs : _search)
-endforeach
-
-dep_llvm = declare_dependency(
-  include_directories : include_directories('$LLVM_INSTALL_PREFIX/include'),
-  dependencies : _deps,
-  version : '$(sed -n -e 's/^#define LLVM_VERSION_STRING "\([^"]*\)".*/\1/p' "${LLVM_INSTALL_PREFIX}/include/llvm/Config/llvm-config.h" )',
-)
-
-has_rtti = false
-irbuilder_h = files('$LLVM_INSTALL_PREFIX/include/llvm/IR/IRBuilder.h')
-EOF
--- a/.gitlab-ci/crosvm-runner.sh
+++ b/.gitlab-ci/crosvm-runner.sh
@@ -80,12 +80,9 @@ ${SCRIPTS_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

 # Set the crosvm-script as the arguments of the current script
-{
-  echo "export SCRIPTS_DIR=${SCRIPTS_DIR}"
-  echo "export RESULTS_DIR=${RESULTS_DIR}"
-  echo ". ${VM_TEMP_DIR}/setup-test-env.sh"
-  echo "$@"
-} > ${VM_TEMP_DIR}/crosvm-script.sh
+echo "export SCRIPTS_DIR=${SCRIPTS_DIR}" > ${VM_TEMP_DIR}/crosvm-script.sh
+echo ". ${VM_TEMP_DIR}/setup-test-env.sh" >> ${VM_TEMP_DIR}/crosvm-script.sh
+echo "$@" >> ${VM_TEMP_DIR}/crosvm-script.sh

 # Setup networking
 /usr/sbin/iptables-legacy -w -t nat -A POSTROUTING -o eth0 -j MASQUERADE
@@ -105,12 +102,7 @@ CROSVM_KERN_ARGS="${CROSVM_KERN_ARGS} init=${SCRIPTS_DIR}/crosvm-init.sh -- ${VS
 [ "${CROSVM_GALLIUM_DRIVER:-}" = "llvmpipe" ] && \
    CROSVM_LIBGL_ALWAYS_SOFTWARE=true || CROSVM_LIBGL_ALWAYS_SOFTWARE=false

-set +e
-
-if [ "${INSIDE_DEQP_RUNNER:-}" != "true" ]
-then
-  set -x
-fi
+set +e -x

 # We aren't testing the host driver here, so we don't need to validate NIR on the host
 NIR_DEBUG="novalidate" \
@@ -137,7 +129,7 @@ CROSVM_RET=$?

 # Show crosvm output on error to help with debugging
 [ ${CROSVM_RET} -eq 0 ] || {
-    { set +x; } 2>/dev/null
+    set +x
    echo "Dumping crosvm output.." >&2
    cat ${VM_TEMP_DIR}/crosvm >&2
    set -x
--- a/.gitlab-ci/cuttlefish-runner.sh
+++ b/.gitlab-ci/cuttlefish-runner.sh
@@ -8,68 +8,27 @@ section_start cuttlefish_setup "cuttlefish: setup"
 set -xe

 export HOME=/cuttlefish
-export PATH=/cuttlefish/bin:$PATH
-export LD_LIBRARY_PATH=/cuttlefish/lib64:${CI_PROJECT_DIR}/install/lib:$LD_LIBRARY_PATH
+export PATH=$PATH:/cuttlefish/bin
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${CI_PROJECT_DIR}/install/lib/:/cuttlefish/lib64
 export EGL_PLATFORM=surfaceless

-# Pick up a vulkan driver
-ARCH=$(uname -m)
-export VK_DRIVER_FILES=${CI_PROJECT_DIR}/install/share/vulkan/icd.d/${VK_DRIVER:-}_icd.$ARCH.json
-
 syslogd

-chown root:kvm /dev/kvm
+chown root.kvm /dev/kvm

-pushd /cuttlefish
+/etc/init.d/cuttlefish-host-resources start

-# Add a function to perform some tasks when exiting the script
-function my_atexit()
-{
-  # shellcheck disable=SC2317
-  cp /cuttlefish/cuttlefish/instances/cvd-1/logs/logcat $RESULTS_DIR || true
-  # shellcheck disable=SC2317
-  cp /cuttlefish/cuttlefish/instances/cvd-1/kernel.log $RESULTS_DIR || true
-
-  # shellcheck disable=SC2317
-  cp /cuttlefish/cuttlefish/instances/cvd-1/logs/launcher.log $RESULTS_DIR || true
-
-  # shellcheck disable=SC2317
-  /cuttlefish/bin/stop_cvd -wait_for_launcher=10
-}
-
-# stop cuttlefish if the script ends prematurely or is interrupted
-trap 'my_atexit' EXIT
-trap 'exit 2' HUP INT PIPE TERM
-
-ulimit -S -n 32768
-
-# Clean up state of previous run
-rm -rf  /cuttlefish/cuttlefish
-rm -rf  /cuttlefish/.cache
-rm -rf  /cuttlefish/.cuttlefish_config.json
-
-launch_cvd \
-  -daemon \
-  -verbosity=VERBOSE \
-  -file_verbosity=VERBOSE \
-  -use_overlay=false \
-  -enable_bootanimation=false \
-  -enable_minimal_mode=true \
-  -guest_enforce_security=false \
-  -report_anonymous_usage_stats=no \
-  -gpu_mode="$ANDROID_GPU_MODE" \
-  -cpus=${FDO_CI_CONCURRENT:-4} \
-  -memory_mb 8192 \
-  -kernel_path="$HOME/bzImage" \
-  -initramfs_path="$HOME/initramfs.img"
+cd /cuttlefish

+launch_cvd --verbosity=DEBUG --report_anonymous_usage_stats=n --cpus=8 --memory_mb=8192 --gpu_mode="$ANDROID_GPU_MODE" --daemon --enable_minimal_mode=true --guest_enforce_security=false --use_overlay=false
 sleep 1

-popd
+cd -

-ADB=adb
+adb connect vsock:3:5555
+ADB="adb -s vsock:3:5555"

-$ADB wait-for-device root
+$ADB root
 sleep 1
 $ADB shell echo Hi from Android
 # shellcheck disable=SC2035
@@ -91,145 +50,72 @@ $ADB shell setenforce 0

 # deqp

-$ADB shell mkdir -p /data/deqp
-$ADB push /deqp-gles/modules/egl/deqp-egl-android /data/deqp
-$ADB push /deqp-gles/assets/gl_cts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-main.txt /data/deqp
-$ADB push /deqp-vk/external/vulkancts/modules/vulkan/* /data/deqp
-$ADB push /deqp-vk/mustpass/vk-main.txt.zst /data/deqp
-$ADB push /deqp-tools/* /data/deqp
-$ADB push /deqp-runner/deqp-runner /data/deqp
+$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-main.txt /data/
+$ADB push /deqp-runner/deqp-runner /data/.

 # download Android Mesa from S3
-MESA_ANDROID_ARTIFACT_URL=https://${PIPELINE_ARTIFACTS_BASE}/${S3_ANDROID_ARTIFACT_NAME}.tar.zst
-curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -o ${S3_ANDROID_ARTIFACT_NAME}.tar.zst ${MESA_ANDROID_ARTIFACT_URL}
-mkdir /mesa-android
-tar -C /mesa-android -xvf ${S3_ANDROID_ARTIFACT_NAME}.tar.zst
-rm "${S3_ANDROID_ARTIFACT_NAME}.tar.zst" &
+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" &

-INSTALL="/mesa-android/install"
-
-$ADB push "$INSTALL/all-skips.txt" /data/deqp
-$ADB push "$INSTALL/angle-skips.txt" /data/deqp
-if [ -e "$INSTALL/$GPU_VERSION-flakes.txt" ]; then
-  $ADB push "$INSTALL/$GPU_VERSION-flakes.txt" /data/deqp
-fi
-if [ -e "$INSTALL/$GPU_VERSION-fails.txt" ]; then
-  $ADB push "$INSTALL/$GPU_VERSION-fails.txt" /data/deqp
-fi
-if [ -e "$INSTALL/$GPU_VERSION-skips.txt" ]; then
-  $ADB push "$INSTALL/$GPU_VERSION-skips.txt" /data/deqp
-fi
-$ADB push "$INSTALL/deqp-$DEQP_SUITE.toml" /data/deqp
+$ADB push install/all-skips.txt /data/.
+$ADB push install/$GPU_VERSION-flakes.txt /data/.
+$ADB push install/deqp-$DEQP_SUITE.toml /data/.

 # remove 32 bits libs from /vendor/lib

-$ADB shell rm -f /vendor/lib/libglapi.so
-$ADB shell rm -f /vendor/lib/egl/libGLES_mesa.so
+$ADB shell rm /vendor/lib/dri/${ANDROID_DRIVER}_dri.so
+$ADB shell rm /vendor/lib/libglapi.so
+$ADB shell rm /vendor/lib/egl/libGLES_mesa.so

-$ADB shell rm -f /vendor/lib/egl/libEGL_angle.so
-$ADB shell rm -f /vendor/lib/egl/libEGL_emulation.so
-$ADB shell rm -f /vendor/lib/egl/libGLESv1_CM_angle.so
-$ADB shell rm -f /vendor/lib/egl/libGLESv1_CM_emulation.so
-$ADB shell rm -f /vendor/lib/egl/libGLESv2_angle.so
-$ADB shell rm -f /vendor/lib/egl/libGLESv2_emulation.so
-
-$ADB shell rm -f /vendor/lib/hw/vulkan.*
+$ADB shell rm /vendor/lib/egl/libEGL_angle.so
+$ADB shell rm /vendor/lib/egl/libEGL_emulation.so
+$ADB shell rm /vendor/lib/egl/libGLESv1_CM_angle.so
+$ADB shell rm /vendor/lib/egl/libGLESv1_CM_emulation.so
+$ADB shell rm /vendor/lib/egl/libGLESv2_angle.so
+$ADB shell rm /vendor/lib/egl/libGLESv2_emulation.so

 # replace on /vendor/lib64

-$ADB push "$INSTALL/lib/libgallium_dri.so" /vendor/lib64/libgallium_dri.so
-$ADB push "$INSTALL/lib/libEGL.so" /vendor/lib64/egl/libEGL_mesa.so
-$ADB push "$INSTALL/lib/libGLESv1_CM.so" /vendor/lib64/egl/libGLESv1_CM_mesa.so
-$ADB push "$INSTALL/lib/libGLESv2.so" /vendor/lib64/egl/libGLESv2_mesa.so
+$ADB push install/lib/dri/${ANDROID_DRIVER}_dri.so /vendor/lib64/dri/${ANDROID_DRIVER}_dri.so
+$ADB push install/lib/libglapi.so /vendor/lib64/libglapi.so
+$ADB push install/lib/libEGL.so /vendor/lib64/egl/libEGL_mesa.so

-$ADB push "$INSTALL/lib/libvulkan_lvp.so" /vendor/lib64/hw/vulkan.lvp.so
-$ADB push "$INSTALL/lib/libvulkan_virtio.so" /vendor/lib64/hw/vulkan.virtio.so
+$ADB shell rm /vendor/lib64/egl/libEGL_angle.so
+$ADB shell rm /vendor/lib64/egl/libEGL_emulation.so
+$ADB shell rm /vendor/lib64/egl/libGLESv1_CM_angle.so
+$ADB shell rm /vendor/lib64/egl/libGLESv1_CM_emulation.so
+$ADB shell rm /vendor/lib64/egl/libGLESv2_angle.so
+$ADB shell rm /vendor/lib64/egl/libGLESv2_emulation.so

-$ADB shell rm -f /vendor/lib64/egl/libEGL_emulation.so
-$ADB shell rm -f /vendor/lib64/egl/libGLESv1_CM_emulation.so
-$ADB shell rm -f /vendor/lib64/egl/libGLESv2_emulation.so

-# Check what GLES implementation Surfaceflinger is using before copying the new mesa libraries
-while [ "$($ADB shell dumpsys SurfaceFlinger | grep GLES:)" = "" ] ; do sleep 1; done
-$ADB shell dumpsys SurfaceFlinger | grep GLES
-
-# restart Android shell, so that surfaceflinger uses the new libraries
-$ADB shell stop
-$ADB shell start
-
-# Check what GLES implementation Surfaceflinger is using after copying the new mesa libraries
-while [ "$($ADB shell dumpsys SurfaceFlinger | grep GLES:)" = "" ] ; do sleep 1; done
-MESA_RUNTIME_VERSION="$($ADB shell dumpsys SurfaceFlinger | grep GLES:)"
-MESA_BUILD_VERSION=$(cat "$INSTALL/VERSION")
-if ! printf "%s" "$MESA_RUNTIME_VERSION" | grep "${MESA_BUILD_VERSION}$"; then
-    echo "Fatal: Android is loading a wrong version of the Mesa3D libs: ${MESA_RUNTIME_VERSION}" 1>&2
-    exit 1
-fi
-
-BASELINE=""
-if [ -e "$INSTALL/$GPU_VERSION-fails.txt" ]; then
-    BASELINE="--baseline /data/deqp/$GPU_VERSION-fails.txt"
-fi
-
-# Default to an empty known flakes file if it doesn't exist.
-$ADB shell "touch /data/deqp/$GPU_VERSION-flakes.txt"
-
-if [ -e "$INSTALL/$GPU_VERSION-skips.txt" ]; then
-    DEQP_SKIPS="$DEQP_SKIPS /data/deqp/$GPU_VERSION-skips.txt"
-fi
-
-if [ -n "$USE_ANGLE" ]; then
-    DEQP_SKIPS="$DEQP_SKIPS /data/deqp/angle-skips.txt"
-fi
-
-AOSP_RESULTS=/data/deqp/results
+AOSP_RESULTS=/data/results
 uncollapsed_section_switch cuttlefish_test "cuttlefish: testing"

 set +e
-$ADB shell "mkdir ${AOSP_RESULTS}; cd ${AOSP_RESULTS}/..; \
-  XDG_CACHE_HOME=/data/local/tmp \
-  ./deqp-runner \
+$ADB shell "mkdir ${AOSP_RESULTS}; cd ${AOSP_RESULTS}/..; ./deqp-runner \
    suite \
-    --suite /data/deqp/deqp-$DEQP_SUITE.toml \
-    --output $AOSP_RESULTS \
-    --skips /data/deqp/all-skips.txt $DEQP_SKIPS \
-    --flakes /data/deqp/$GPU_VERSION-flakes.txt \
-    --testlog-to-xml /data/deqp/testlog-to-xml \
-    --shader-cache-dir /data/local/tmp \
+    --suite /data/deqp-$DEQP_SUITE.toml \
+    --output $RESULTS \
+    --skips /data/all-skips.txt $DEQP_SKIPS \
+    --flakes /data/$GPU_VERSION-flakes.txt \
+    --testlog-to-xml /deqp/executor/testlog-to-xml \
    --fraction-start ${CI_NODE_INDEX:-1} \
    --fraction $(( CI_NODE_TOTAL * ${DEQP_FRACTION:-1})) \
    --jobs ${FDO_CI_CONCURRENT:-4} \
-    $BASELINE \
-    ${DEQP_RUNNER_MAX_FAILS:+--max-fails \"$DEQP_RUNNER_MAX_FAILS\"} \
-    "
+    $DEQP_RUNNER_OPTIONS"

 EXIT_CODE=$?
 set -e
 section_switch cuttlefish_results "cuttlefish: gathering the results"

-$ADB pull "$AOSP_RESULTS/." "$RESULTS_DIR"
+$ADB pull $RESULTS $RESULTS_DIR

-# Remove all but the first 50 individual XML files uploaded as artifacts, to
-# save fd.o space when you break everything.
-find $RESULTS_DIR -name \*.xml | \
-    sort -n |
-    sed -n '1,+49!p' | \
-    xargs rm -f
-
-# If any QPA XMLs are there, then include the XSL/CSS in our artifacts.
-find $RESULTS_DIR -name \*.xml \
-    -exec cp /deqp-tools/testlog.css /deqp-tools/testlog.xsl "$RESULTS_DIR/" ";" \
-    -quit
-
-$ADB shell "cd ${AOSP_RESULTS}/..; \
-./deqp-runner junit \
-   --testsuite dEQP \
-   --results $AOSP_RESULTS/failures.csv \
-   --output $AOSP_RESULTS/junit.xml \
-   --limit 50 \
-   --template \"See $ARTIFACTS_BASE_URL/results/{{testcase}}.xml\""
-
-$ADB pull "$AOSP_RESULTS/junit.xml" "$RESULTS_DIR"
+cp /cuttlefish/cuttlefish/instances/cvd-1/logs/logcat $RESULTS_DIR
+cp /cuttlefish/cuttlefish/instances/cvd-1/kernel.log $RESULTS_DIR
+cp /cuttlefish/cuttlefish/instances/cvd-1/logs/launcher.log $RESULTS_DIR

 section_end cuttlefish_results
 exit $EXIT_CODE
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -38,9 +38,69 @@ findmnt -n tmpfs ${SHADER_CACHE_HOME} || findmnt -n tmpfs ${SHADER_CACHE_DIR} ||
    mount -t tmpfs -o nosuid,nodev,size=2G,mode=1755 tmpfs ${SHADER_CACHE_DIR}
 }

-BASELINE=""
+if [ -z "$DEQP_SUITE" ]; then
+    if [ -z "$DEQP_VER" ]; then
+        echo 'DEQP_SUITE must be set to the name of your deqp-gpu_version.toml, or DEQP_VER must be set to something like "gles2", "gles31-khr" or "vk" for the test run'
+        exit 1
+    fi
+
+    DEQP_WIDTH=${DEQP_WIDTH:-256}
+    DEQP_HEIGHT=${DEQP_HEIGHT:-256}
+    DEQP_CONFIG=${DEQP_CONFIG:-rgba8888d24s8ms0}
+
+    DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-width=$DEQP_WIDTH --deqp-surface-height=$DEQP_HEIGHT"
+    DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-type=${DEQP_SURFACE_TYPE:-pbuffer}"
+    DEQP_OPTIONS="$DEQP_OPTIONS --deqp-gl-config-name=$DEQP_CONFIG"
+    DEQP_OPTIONS="$DEQP_OPTIONS --deqp-visibility=hidden"
+
+    if [ "$DEQP_VER" = "vk" ] && [ -z "$VK_DRIVER" ]; then
+        echo 'VK_DRIVER must be to something like "radeon" or "intel" for the test run'
+        exit 1
+    fi
+
+    # Generate test case list file.
+    if [ "$DEQP_VER" = "vk" ]; then
+       MUSTPASS=/deqp/mustpass/vk-main.txt.zst
+       DEQP=/deqp/external/vulkancts/modules/vulkan/deqp-vk
+    elif [ "$DEQP_VER" = "gles2" ] || [ "$DEQP_VER" = "gles3" ] || [ "$DEQP_VER" = "gles31" ] || [ "$DEQP_VER" = "egl" ]; then
+       MUSTPASS=/deqp/mustpass/$DEQP_VER-main.txt.zst
+       DEQP=/deqp/modules/$DEQP_VER/deqp-$DEQP_VER
+    elif [ "$DEQP_VER" = "gles2-khr" ] || [ "$DEQP_VER" = "gles3-khr" ] || [ "$DEQP_VER" = "gles31-khr" ] || [ "$DEQP_VER" = "gles32-khr" ]; then
+       MUSTPASS=/deqp/mustpass/$DEQP_VER-main.txt.zst
+       DEQP=/deqp/external/openglcts/modules/glcts
+    else
+       MUSTPASS=/deqp/mustpass/$DEQP_VER-main.txt.zst
+       DEQP=/deqp/external/openglcts/modules/glcts
+    fi
+
+    [ -z "${DEQP_FRACTION:-}" ] && DEQP_FRACTION=1
+    [ -z "${CI_NODE_INDEX:-}" ] && CI_NODE_INDEX=1
+    [ -z "${CI_NODE_TOTAL:-}" ] && CI_NODE_TOTAL=1
+
+    # This ugly sed expression does a single pass across the case list to take
+    # into account the global fraction and sharding.
+    #
+    # First, we select only every n'th line, according to DEQP_FRACTION; for a
+    # fraction of 3, it will select lines 1, 4, 7, 10, etc.
+    #
+    # Then, we select $CI_NODE_INDEX/$CI_NODE_TOTAL for sharding; for a two-way
+    # shard, the first node will select lines 1 and 7, and the second node will
+    # select lines 4 and 10.
+    #
+    # Sharding like this gives us the best coverage, as sequential tests often
+    # test very slightly different permutations of the same functionality. So
+    # by distributing our skips as widely across the set as possible, rather
+    # than grouping them together, we get the broadest coverage.
+    zstd -d $MUSTPASS -c | sed -n "$(((CI_NODE_INDEX - 1) * DEQP_FRACTION + 1))~$((DEQP_FRACTION * CI_NODE_TOTAL))p" > /tmp/case-list.txt
+
+    if [ ! -s /tmp/case-list.txt ]; then
+        echo "Caselist generation failed"
+        exit 1
+    fi
+fi
+
 if [ -e "$INSTALL/$GPU_VERSION-fails.txt" ]; then
-    BASELINE="--baseline $INSTALL/$GPU_VERSION-fails.txt"
+    DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --baseline $INSTALL/$GPU_VERSION-fails.txt"
 fi

 # Default to an empty known flakes file if it doesn't exist.
@@ -79,6 +139,15 @@ if [ -n "$USE_ANGLE" ]; then
    DEQP_SKIPS="$DEQP_SKIPS $INSTALL/angle-skips.txt"
 fi

+if [ -n "$VK_DRIVER" ] && [ -z "$DEQP_SUITE" ]; then
+    # Bump the number of tests per group to reduce the startup time of VKCTS.
+    DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --tests-per-group ${DEQP_RUNNER_TESTS_PER_GROUP:-5000}"
+fi
+
+if [ -n "${DEQP_RUNNER_MAX_FAILS:-}" ]; then
+    DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --max-fails ${DEQP_RUNNER_MAX_FAILS}"
+fi
+
 # Set the path to VK validation layer settings (in case it ends up getting loaded)
 # Note: If you change the format of this filename, look through the rest of the
 # tree for other places that need to be kept in sync (e.g.
@@ -105,37 +174,60 @@ if [ "$GALLIUM_DRIVER" = "virpipe" ]; then
    sleep 1
 fi

+if [ -z "$DEQP_SUITE" ]; then
+    if [ -n "$DEQP_EXPECTED_RENDERER" ]; then
+        export DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --renderer-check $DEQP_EXPECTED_RENDERER"
+    fi
+    if [ $DEQP_VER != vk ] && [ $DEQP_VER != egl ]; then
+        VER=$(sed 's/[() ]/./g' "$INSTALL/VERSION")
+        export DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --version-check $VER"
+    fi
+fi
+
 uncollapsed_section_switch deqp "deqp: deqp-runner"

 # Print the detailed version with the list of backports and local patches
 { set +x; } 2>/dev/null
-for api in vk-main vk gl gles; do
-  deqp_version_log=/deqp-$api/deqp-$api-version
+for api in vk gl gles; do
+  deqp_version_log=/deqp/version-$api
  if [ -r "$deqp_version_log" ]; then
    cat "$deqp_version_log"
  fi
 done
 set -x

-# If you change the format of the suite toml filenames or the
-# $GPU_VERSION-{fails,flakes,skips}.txt filenames, look through the rest
-# of the tree for other places that need to be kept in sync (e.g.
-# src/**/ci/gitlab-ci*.yml)
 set +e
 deqp-runner -V
-deqp-runner \
-    suite \
-    --suite $INSTALL/deqp-$DEQP_SUITE.toml \
-    --output $RESULTS_DIR \
-    --skips $INSTALL/all-skips.txt $DEQP_SKIPS \
-    --flakes $INSTALL/$GPU_VERSION-flakes.txt \
-    --testlog-to-xml /deqp-tools/testlog-to-xml \
-    --fraction-start ${CI_NODE_INDEX:-1} \
-    --fraction $((CI_NODE_TOTAL * ${DEQP_FRACTION:-1})) \
-    --jobs ${FDO_CI_CONCURRENT:-4} \
-    $BASELINE \
-    ${DEQP_RUNNER_MAX_FAILS:+--max-fails "$DEQP_RUNNER_MAX_FAILS"} \
-    ${DEQP_FORCE_ASAN:+--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so}; DEQP_EXITCODE=$?
+if [ -z "$DEQP_SUITE" ]; then
+    deqp-runner \
+        run \
+        --deqp $DEQP \
+        --output $RESULTS_DIR \
+        --caselist /tmp/case-list.txt \
+        --skips $INSTALL/all-skips.txt $DEQP_SKIPS \
+        --flakes $INSTALL/$GPU_VERSION-flakes.txt \
+        --testlog-to-xml /deqp/executor/testlog-to-xml \
+        --jobs ${FDO_CI_CONCURRENT:-4} \
+        $DEQP_RUNNER_OPTIONS \
+        -- \
+        $DEQP_OPTIONS; DEQP_EXITCODE=$?
+else
+    # If you change the format of the suite toml filenames or the
+    # $GPU_VERSION-{fails,flakes,skips}.txt filenames, look through the rest
+    # of the tree for other places that need to be kept in sync (e.g.
+    # src/**/ci/gitlab-ci*.yml)
+    deqp-runner \
+        suite \
+        --suite $INSTALL/deqp-$DEQP_SUITE.toml \
+        --output $RESULTS_DIR \
+        --skips $INSTALL/all-skips.txt $DEQP_SKIPS \
+        --flakes $INSTALL/$GPU_VERSION-flakes.txt \
+        --testlog-to-xml /deqp/executor/testlog-to-xml \
+        --fraction-start ${CI_NODE_INDEX:-1} \
+        --fraction $((CI_NODE_TOTAL * ${DEQP_FRACTION:-1})) \
+        --jobs ${FDO_CI_CONCURRENT:-4} \
+        $DEQP_RUNNER_OPTIONS; DEQP_EXITCODE=$?
+fi

 { set +x; } 2>/dev/null

@@ -155,7 +247,7 @@ find $RESULTS_DIR -name \*.xml | \

 # If any QPA XMLs are there, then include the XSL/CSS in our artifacts.
 find $RESULTS_DIR -name \*.xml \
-    -exec cp /deqp-tools/testlog.css /deqp-tools/testlog.xsl "$RESULTS_DIR/" ";" \
+    -exec cp /deqp/testlog.css /deqp/testlog.xsl "$RESULTS_DIR/" ";" \
    -quit

 deqp-runner junit \
--- a/.gitlab-ci/fluster/fluster-runner.sh
+++ b/.gitlab-ci/fluster/fluster-runner.sh
@@ -1,113 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-
-set -uex -o pipefail
-
-if [ -z "$GPU_VERSION" ]; then
-   echo 'GPU_VERSION must be set to something like "radeonsi-raven" or "freedreno-a630" (the name used in your ci/gpu-version-*.txt)'
-   exit 1
-fi
-
-if [ -z "$FLUSTER_CODECS" ]; then
-   echo 'FLUSTER_CODECS must be set to a space sparated list of codecs like "VP8" or "H.265"'
-   exit 1
-fi
-
-# Check which fluster vectors to get
-FLUSTER_VECTORS_HOST_PATH="${STORAGE_MAINLINE_HOST_PATH}/fluster/${FLUSTER_VECTORS_VERSION}"
-if [ "$CI_PROJECT_PATH" != "$FDO_UPSTREAM_REPO" ]; then
-  if ! curl -s -X HEAD -L --retry 4 -f --retry-delay 60 "https://${FLUSTER_VECTORS_HOST_PATH}/done"; then
-    echo "Using Fluster vectors from the fork, cached from mainline is unavailable."
-    FLUSTER_VECTORS_HOST_PATH="${STORAGE_FORK_HOST_PATH}/fluster/${FLUSTER_VECTORS_VERSION}"
-  else
-    echo "Using the cached Fluster vectors."
-  fi
-fi
-
-FLUSTER_VECTORS_HOST_PATH="${FDO_HTTP_CACHE_URI:-}https://${FLUSTER_VECTORS_HOST_PATH}/vectors.tar.zst"
-
-curl -L --retry 4 -f --retry-all-errors --retry-delay 60 ${FLUSTER_VECTORS_HOST_PATH} | tar --zstd -x -C /usr/local/
-
-INSTALL="$PWD/install"
-
-# Set up the driver environment.
-export LD_LIBRARY_PATH="$INSTALL/lib/"
-
-export LIBVA_DRIVERS_PATH=$INSTALL/lib/dri/
-# libva spams driver open info by default, and that happens per testcase.
-export LIBVA_MESSAGING_LEVEL=1
-
-RESULTS=$PWD/${FLUSTER_RESULTS_DIR:-results}
-mkdir -p $RESULTS
-
-if [ -n "${FLUSTER_FRACTION:-}" ] || [ -n "$CI_NODE_INDEX" ]; then
-    FRACTION=$((${FLUSTER_FRACTION:-1} * ${CI_NODE_TOTAL:-1}))
-    FLUSTER_RUNNER_OPTIONS="${FLUSTER_RUNNER_OPTIONS:-} --fraction $FRACTION"
-fi
-
-# If the job is parallel at the gitab job level, take the corresponding fraction
-# of the caselist.
-if [ -n "$CI_NODE_INDEX" ]; then
-    FLUSTER_RUNNER_OPTIONS="${FLUSTER_RUNNER_OPTIONS:-} --fraction-start ${CI_NODE_INDEX}"
-fi
-
-for codec in ${FLUSTER_CODECS}; do
-    DECODERS="${DECODERS:-} GStreamer-${codec}-VAAPI-Gst1.0"
-done
-
-# Default to an empty known flakes file if it doesn't exist.
-FLUSTER_FLAKES=$INSTALL/$GPU_VERSION-fluster-flakes.txt
-touch ${FLUSTER_FLAKES}
-
-# Default to an empty known fails file if it doesn't exist.
-FLUSTER_FAILS=$INSTALL/$GPU_VERSION-fluster-fails.txt
-touch ${FLUSTER_FAILS}
-
-# Default to an empty known skips file if it doesn't exist.
-FLUSTER_SKIPS=$INSTALL/$GPU_VERSION-fluster-skips.txt
-touch ${FLUSTER_SKIPS}
-
-set +e
-
-fluster-runner \
-        run \
-        --fluster /usr/local/fluster/fluster.py \
-        --output ${RESULTS} \
-        --jobs ${FDO_CI_CONCURRENT:-4} \
-        --skips ${FLUSTER_SKIPS} \
-        --flakes ${FLUSTER_FLAKES} \
-        --baseline ${FLUSTER_FAILS} \
-        --decoders ${DECODERS} \
-        ${FLUSTER_RUNNER_OPTIONS} \
-        -v -v
-
-FLUSTER_EXITCODE=$?
-
-set -e
-
-# Report the flakes to the IRC channel for monitoring (if configured):
-if [ -n "${FLAKES_CHANNEL:-}" ]; then
-    python3 $INSTALL/report-flakes.py \
-     --host irc.oftc.net \
-     --port 6667 \
-     --results $RESULTS/results.csv \
-     --known-flakes ${FLUSTER_FLAKES} \
-     --channel "$FLAKES_CHANNEL" \
-     --runner "$CI_RUNNER_DESCRIPTION" \
-     --job "$CI_JOB_ID" \
-     --url "$CI_JOB_URL" \
-     --branch "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-$CI_COMMIT_BRANCH}" \
-     --branch-title "${CI_MERGE_REQUEST_TITLE:-$CI_COMMIT_TITLE}" || true
-fi
-
-deqp-runner junit \
-   --testsuite "fluster-${FLUSTER_CODECS// /-}" \
-   --results $RESULTS/results.csv \
-   --output $RESULTS/junit.xml \
-   --template "See https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/results/{{testcase}}.xml"
-
-# Compress results.csv to save on bandwidth during the upload of artifacts to
-# GitLab.
-zstd --rm -T0 -8qc $RESULTS/results.csv -o $RESULTS/results.csv.zst
-
-exit $FLUSTER_EXITCODE
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -13,10 +13,10 @@

 variables:
   DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
-   DEBIAN_BASE_TAG: "20250130-vvless"
+   DEBIAN_BASE_TAG: "20241106-wlproto2"

   DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "20250128-llvm19-up"
+   DEBIAN_BUILD_TAG: "20241106-wlproto2"

   DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
   DEBIAN_ARM64_TEST_BASE_IMAGE: "debian/arm64_test-base"
@@ -27,23 +27,20 @@ variables:
   DEBIAN_ARM64_TEST_IMAGE_VK_PATH: "debian/arm64_test-vk"
   DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"

-   DEBIAN_TEST_ANDROID_TAG: "20250130-vvless"
-   DEBIAN_TEST_GL_TAG: "20250327-piglit-250"
-   DEBIAN_TEST_VK_TAG: "20250327-piglit-250"
-   KERNEL_ROOTFS_TAG: "20250327-trace-250"
+   DEBIAN_TEST_ANDROID_TAG: "20241106-wlproto2"
+   DEBIAN_TEST_GL_TAG: "20241106-wlproto2"
+   DEBIAN_TEST_VK_TAG: "20241107-setup"
+   KERNEL_ROOTFS_TAG: "20241107-setup"

   DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
-   DEBIAN_PYUTILS_TAG: "20250129-lavacli"
+   DEBIAN_PYUTILS_TAG: "20241002-pyutils"

-   ALPINE_X86_64_BUILD_TAG: "20250128-llversionm"
-   ALPINE_X86_64_LAVA_SSH_TAG: "20250124-spirv-tools"
-   FEDORA_X86_64_BUILD_TAG: "20250128-llversionm"
-
-   KERNEL_TAG: "v6.13-rc4-mesa-5e77"
+   ALPINE_X86_64_BUILD_TAG: "20241106-wlproto2"
+   ALPINE_X86_64_LAVA_SSH_TAG: "20241106-wlproto2"
+   FEDORA_X86_64_BUILD_TAG: "20241106-wlproto2"
+   KERNEL_TAG: "v6.6.21-mesa-f8ea"
   KERNEL_REPO: "gfx-ci/linux"
-   PKG_REPO_REV: "95bf62c"
-
-   FLUSTER_VECTORS_VERSION: "5"
+   PKG_REPO_REV: "bca9635d"

   WINDOWS_X64_MSVC_PATH: "windows/x86_64_msvc"
   WINDOWS_X64_MSVC_TAG: "20240827-v143"
--- a/.gitlab-ci/lava/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava/lava-gitlab-ci.yml
@@ -18,12 +18,10 @@ variables:
    JOB_ROOTFS_OVERLAY_PATH: "${JOB_ARTIFACTS_BASE}/job-rootfs-overlay.tar.gz"
    JOB_RESULTS_PATH: "${JOB_ARTIFACTS_BASE}/results.tar.zst"
    LAVA_S3_ARTIFACT_NAME: "mesa-${ARCH}-default-debugoptimized"
-    S3_ARTIFACT_NAME: "mesa-python-ci-artifacts"
+    S3_ARTIFACT_NAME: "mesa-python-test"
    S3_RESULTS_UPLOAD: "${JOB_ARTIFACTS_BASE}"
    PIGLIT_NO_WINDOW: 1
    VISIBILITY_GROUP: "Collabora+fdo"
-    STORAGE_MAINLINE_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${FDO_UPSTREAM_REPO}/${DATA_STORAGE_PATH}"
-    STORAGE_FORK_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${CI_PROJECT_PATH}/${DATA_STORAGE_PATH}"
  before_script:
    - !reference [.download_s3, before_script]
  script:
@@ -48,7 +46,7 @@ variables:
      artifacts: false
    - job: debian/x86_64_pyutils
      artifacts: false
-    - job: python-artifacts
+    - job: python-test
      artifacts: false

 .lava-test:arm32:
@@ -159,12 +157,12 @@ variables:
    - .lava-piglit
    - .lava-traces-base

-.lava-fluster:
-  variables:
-    FLUSTER_RESULTS: "${GPU_VERSION}-${FLUSTER_CODEC}"
-    HWCI_TEST_SCRIPT: "/install/fluster/fluster-runner.sh"
-
-.lava-fluster:x86_64:
+.lava-piglit:x86_64:
  extends:
-    - .lava-fluster
+    - .lava-test:x86_64
+    - .lava-piglit

+.lava-piglit:arm64:
+  extends:
+    - .lava-test:arm64
+    - .lava-piglit
--- a/.gitlab-ci/lava/lava-submit.sh
+++ b/.gitlab-ci/lava/lava-submit.sh
@@ -48,11 +48,14 @@ rm -rf results
 mkdir -p results/job-rootfs-overlay/

 artifacts/ci-common/generate-env.sh > results/job-rootfs-overlay/set-job-env-vars.sh
+cp artifacts/ci-common/capture-devcoredump.sh results/job-rootfs-overlay/
 cp artifacts/ci-common/init-*.sh results/job-rootfs-overlay/
+cp artifacts/ci-common/intel-gpu-freq.sh results/job-rootfs-overlay/
+cp artifacts/ci-common/kdl.sh results/job-rootfs-overlay/
 cp "$SCRIPTS_DIR"/setup-test-env.sh results/job-rootfs-overlay/

 tar zcf job-rootfs-overlay.tar.gz -C results/job-rootfs-overlay/ .
-s3_upload job-rootfs-overlay.tar.gz "https://${JOB_ARTIFACTS_BASE}"
+ci-fairy s3cp --token-file "${S3_JWT_FILE}" job-rootfs-overlay.tar.gz "https://${JOB_ROOTFS_OVERLAY_PATH}"

 # Prepare env vars for upload.
 section_switch variables "Environment variables passed through to device:"
@@ -66,7 +69,7 @@ PYTHONPATH=artifacts/ artifacts/lava/lava_job_submitter.py \
 	--farm "${FARM}" \
 	--device-type "${DEVICE_TYPE}" \
 	--boot-method "${BOOT_METHOD}" \
-	--job-timeout-min $((CI_JOB_TIMEOUT/60 - 5)) \
+	--job-timeout-min ${JOB_TIMEOUT:-30} \
 	--dump-yaml \
 	--pipeline-info "$CI_JOB_NAME: $CI_PIPELINE_URL on $CI_COMMIT_REF_NAME ${CI_NODE_INDEX}/${CI_NODE_TOTAL}" \
 	--rootfs-url "${ROOTFS_URL}" \
--- a/.gitlab-ci/lava/lava_job_submitter.py
+++ b/.gitlab-ci/lava/lava_job_submitter.py
@@ -103,22 +103,20 @@ def raise_exception_from_metadata(metadata: dict, job_id: int) -> None:
    if "result" not in metadata or metadata["result"] != "fail":
        return
    if "error_type" in metadata:
-        error_type: str = metadata["error_type"]
-        error_msg: str = metadata.get("error_msg", "")
-        full_err_msg: str = error_type if not error_msg else f"{error_type}: {error_msg}"
+        error_type = metadata["error_type"]
+        if error_type == "Infrastructure":
+            raise MesaCIRetriableException(
+                f"LAVA job {job_id} failed with Infrastructure Error. Retry."
+            )
        if error_type == "Job":
            # This happens when LAVA assumes that the job cannot terminate or
            # with mal-formed job definitions. As we are always validating the
            # jobs, only the former is probable to happen. E.g.: When some LAVA
            # action timed out more times than expected in job definition.
            raise MesaCIRetriableException(
-                f"LAVA job {job_id} failed with {full_err_msg}. Retry."
+                f"LAVA job {job_id} failed with JobError "
                "(possible LAVA timeout misconfiguration/bug). Retry."
            )
-        if error_type:
-            raise MesaCIRetriableException(
-                f"LAVA job {job_id} failed with error type: {full_err_msg}. Retry."
-            )
    if "case" in metadata and metadata["case"] == "validate":
        raise MesaCIRetriableException(
            f"LAVA job {job_id} failed validation (possible download error). Retry."
--- a/.gitlab-ci/lava/utils/lava_job.py
+++ b/.gitlab-ci/lava/utils/lava_job.py
@@ -35,10 +35,7 @@ class LAVAJob:
        self._is_finished = False
        self.log: dict[str, Any] = log
        self.status = "not_submitted"
-        # Set the default exit code to 1 because we should set it to 0 only if the job has passed.
-        # If it fails or if it is interrupted, the exit code should be set to a non-zero value to
-        # make the GitLab job fail.
-        self._exit_code: int = 1
+        self._exit_code = None
        self.__exception: Optional[Exception] = None

    def heartbeat(self) -> None:
--- a/.gitlab-ci/lava/utils/lava_job_definition.py
+++ b/.gitlab-ci/lava/utils/lava_job_definition.py
@@ -162,16 +162,6 @@ class LAVAJobDefinition:
                        "minutes": 5
                        * NUMBER_OF_ATTEMPTS_LAVA_BOOT,
                    },
-                    "uboot-action": {
-                        # For rockchip DUTs, U-Boot auto-login action downloads the kernel and
-                        # setup early network. This takes 72 seconds on average.
-                        # The LAVA action that wraps it is `uboot-commands`, but we can't set a
-                        # timeout for it directly, it is overridden by one third of `uboot-action`
-                        # timeout.
-                        # So actually, this timeout is here to enforce that `uboot-commands`
-                        # timeout to be 100 seconds (300 sec / 3), which is more than enough.
-                        "minutes": 5
-                    },
                },
            },
        }
--- a/.gitlab-ci/lava/utils/log_section.py
+++ b/.gitlab-ci/lava/utils/log_section.py
@@ -35,13 +35,9 @@ LAVA_QUEUE_TIMEOUT = int(getenv("LAVA_QUEUE_TIMEOUT", 60))
 # the enqueue delay.
 LAVA_BOOT_TIMEOUT = int(getenv("LAVA_BOOT_TIMEOUT", 9))

-# Estimated overhead in minutes for a job from GitLab to reach the test phase,
-# including LAVA scheduling and boot duration
-LAVA_TEST_OVERHEAD_MIN = 5
-
 # Test DUT suite phase is where the initialization happens in DUT, not on docker.
 # The device will be listening to SSH session until the end of the job.
-LAVA_TEST_DUT_SUITE_TIMEOUT = int(getenv("CI_JOB_TIMEOUT")) // 60 - LAVA_TEST_OVERHEAD_MIN
+LAVA_TEST_DUT_SUITE_TIMEOUT = int(getenv("JOB_TIMEOUT", 60))

 # Test suite phase is where the initialization happens on docker.
 LAVA_TEST_SUITE_TIMEOUT = int(getenv("LAVA_TEST_SUITE_TIMEOUT", 5))
@@ -49,7 +45,7 @@ LAVA_TEST_SUITE_TIMEOUT = int(getenv("LAVA_TEST_SUITE_TIMEOUT", 5))
 # Test cases may take a long time, this script has no right to interrupt
 # them. But if the test case takes almost 1h, it will never succeed due to
 # Gitlab job timeout.
-LAVA_TEST_CASE_TIMEOUT = int(getenv("CI_JOB_TIMEOUT")) // 60 - LAVA_TEST_OVERHEAD_MIN
+LAVA_TEST_CASE_TIMEOUT = int(getenv("JOB_TIMEOUT", 60))

 # LAVA post processing may refer to a test suite teardown, or the
 # adjustments to start the next test_case
--- a/.gitlab-ci/lava/utils/ssh_job_definition.py
+++ b/.gitlab-ci/lava/utils/ssh_job_definition.py
@@ -68,7 +68,7 @@ EOF
 ping -c 5 -w 60 $(lava-target-ip)

 lava_ssh_test_case() {
-    set -ex
+    set -x
    local test_case="${1}"
    shift
    lava-test-case \"${test_case}\" --shell \\
@@ -170,7 +170,7 @@ def generate_docker_test(
        # maintainers with monitoring
        f"lava_ssh_test_case '{args.project_name}_{args.mesa_job_name}' "
        # Changing directory to /, as the HWCI_SCRIPT expects that
-        "'cd / && /init-stage2.sh'",
+        "'\"cd / && /init-stage2.sh\"'",
    ]

    return init_stages_test
--- a/.gitlab-ci/meson/build.sh
+++ b/.gitlab-ci/meson/build.sh
@@ -10,25 +10,15 @@ section_switch meson-cross-file "meson: cross file generate"
 set -e
 set -o xtrace

-comma_separated() {
-  local IFS=,
-  echo "$*"
-}
-
-no_werror() {
-  # shellcheck disable=SC2048
-  for i in $*; do
-    echo "-D${i}:werror=false "
-  done
-}
-
 CROSS_FILE=/cross_file-"$CROSS".txt

 export PATH=$PATH:$PWD/.gitlab-ci/build

 touch native.file
 printf > native.file "%s\n" \
-  "[binaries]"
+  "[binaries]" \
+  "c = 'compiler-wrapper-${CC:-gcc}.sh'" \
+  "cpp = 'compiler-wrapper-${CXX:-g++}.sh'"

 # We need to control the version of llvm-config we're using, so we'll
 # tweak the cross file or generate a native file to do so.
@@ -137,42 +127,22 @@ else
    MAX_LD=${FDO_CI_CONCURRENT:-4}
 fi

-# these are built as Meson subprojects; we want to use Meson's
-# --force-fallback-for to ensure that we build the subprojects from their wrap
-# files, and we also want to disable Werror on those, since we do not control
-# these projects and making them warning-free is not our goal.
-# shellcheck disable=2206
-meson_subprojects=(
-  perfetto
-  syn
-  paste
-  pest
-  pest_derive
-  pest_generator
-  pest_meta
-  roxmltree
-  indexmap
-  ${FORCE_FALLBACK_FOR:-}
-)
-
 section_switch meson-configure "meson: configure"

 rm -rf _build
-# shellcheck disable=SC2046
 meson setup _build \
      --native-file=native.file \
      --wrap-mode=nofallback \
-      --force-fallback-for "$(comma_separated "${meson_subprojects[@]}")" \
-      $(no_werror "${meson_subprojects[@]}") \
+      --force-fallback-for perfetto,syn,paste,pest,pest_derive,pest_generator,pest_meta,roxmltree,indexmap \
      ${CROSS+--cross "$CROSS_FILE"} \
      -D prefix=$PWD/install \
      -D libdir=lib \
      -D buildtype=${BUILDTYPE:?} \
-      -D build-tests=${RUN_MESON_TESTS} \
+      -D build-tests=true \
      -D c_args="$(echo -n $C_ARGS)" \
-      -D c_link_args="$(echo -n $C_LINK_ARGS) -Wl,--fatal-warnings" \
+      -D c_link_args="$(echo -n $C_LINK_ARGS)" \
      -D cpp_args="$(echo -n $CPP_ARGS)" \
-      -D cpp_link_args="$(echo -n $CPP_LINK_ARGS) -Wl,--fatal-warnings" \
+      -D cpp_link_args="$(echo -n $CPP_LINK_ARGS)" \
      -D enable-glcpp-tests=false \
      -D libunwind=${UNWIND} \
      ${DRI_LOADERS} \
@@ -190,14 +160,20 @@ meson configure

 uncollapsed_section_switch meson-build "meson: build"

-ninja
-
-if [ "${RUN_MESON_TESTS}" = "true" ]; then
-    uncollapsed_section_switch meson-test "meson: test"
-    LC_ALL=C.UTF-8 meson test --num-processes "${FDO_CI_CONCURRENT:-4}" --print-errorlogs ${MESON_TEST_ARGS}
+if command -V mold &> /dev/null ; then
+    mold --run ninja
+else
+    ninja
 fi

+
+uncollapsed_section_switch meson-test "meson: test"
+LC_ALL=C.UTF-8 meson test --num-processes "${FDO_CI_CONCURRENT:-4}" --print-errorlogs ${MESON_TEST_ARGS}
 section_switch meson-install "meson: install"
-ninja install
+if command -V mold &> /dev/null ; then
+    mold --run ninja install
+else
+    ninja install
+fi
 cd ..
 section_end meson-install
--- a/.gitlab-ci/piglit/piglit-traces.sh
+++ b/.gitlab-ci/piglit/piglit-traces.sh
@@ -13,6 +13,7 @@ set -ex
 export PAGER=cat  # FIXME: export everywhere

 INSTALL=$(realpath -s "$PWD"/install)
+S3_ARGS="--token-file ${S3_JWT_FILE}"

 export PIGLIT_REPLAY_DESCRIPTION_FILE="$INSTALL/$PIGLIT_TRACES_FILE"

@@ -119,7 +120,7 @@ replay_s3_upload_images() {
            fi
            __S3_PATH="$PIGLIT_REPLAY_REFERENCE_IMAGES_BASE"
            __DESTINATION_FILE_PATH="${line##*-}"
-            if curl --fail -L -s -I "https://${__S3_PATH}/${__DESTINATION_FILE_PATH}" | grep -q "content-type: application/octet-stream" 2>/dev/null; then
+            if curl -L -s -I "https://${__S3_PATH}/${__DESTINATION_FILE_PATH}" | grep -q "content-type: application/octet-stream" 2>/dev/null; then
                continue
            fi
        else
@@ -127,7 +128,8 @@ replay_s3_upload_images() {
            __DESTINATION_FILE_PATH="$__S3_TRACES_PREFIX/${line##*-}"
        fi

-        s3_upload "$RESULTS_DIR/$__PREFIX/$line" "https://${__S3_PATH}/${__DESTINATION_FILE_PATH%/*}"
+        ci-fairy s3cp $S3_ARGS "$RESULTS_DIR/$__PREFIX/$line" \
+            "https://${__S3_PATH}/${__DESTINATION_FILE_PATH}"
    done
 }

@@ -167,9 +169,7 @@ rm -rf replayer-db
 if [ -n "$PIGLIT_REPLAY_ANGLE_TAG" ]; then
  ARCH="amd64"
  FILE="angle-bin-${ARCH}-${PIGLIT_REPLAY_ANGLE_TAG}.tar.zst"
-  curl --location --fail --retry-all-errors --retry 4 --retry-delay 60 \
-    --header "Authorization: Bearer $(cat "${S3_JWT_FILE}")" \
-    "https://s3.freedesktop.org/mesa-tracie-private/${FILE}" --output "${FILE}"
+  ci-fairy s3cp $S3_ARGS "https://s3.freedesktop.org/mesa-tracie-private/${FILE}" "${FILE}"
  mkdir -p replayer-db/angle
  tar --zstd -xf ${FILE} -C replayer-db/angle/
 fi
--- a/.gitlab-ci/prepare-artifacts-python.sh
+++ b/.gitlab-ci/prepare-artifacts-python.sh
@@ -53,7 +53,7 @@ if [ -n "$S3_ARTIFACT_NAME" ]; then
    # Pass needed files to the test stage
    S3_ARTIFACT_TAR="$S3_ARTIFACT_NAME.tar.zst"
    tar cv artifacts/ | zstd -o "${S3_ARTIFACT_TAR}"
-    s3_upload "${S3_ARTIFACT_TAR}" "https://${PIPELINE_ARTIFACTS_BASE}/"
+    ci-fairy s3cp --token-file "${S3_JWT_FILE}" "${S3_ARTIFACT_TAR}" "https://${PIPELINE_ARTIFACTS_BASE}/${S3_ARTIFACT_TAR}"
    rm "${S3_ARTIFACT_TAR}"
 fi

--- a/.gitlab-ci/prepare-artifacts.sh
+++ b/.gitlab-ci/prepare-artifacts.sh
@@ -36,7 +36,6 @@ echo "$(cat VERSION) (git-$(git rev-parse HEAD | cut -b -10))" > install/VERSION
 cp -Rp .gitlab-ci/bare-metal install/
 cp -Rp .gitlab-ci/common install/
 cp -Rp .gitlab-ci/piglit install/
-cp -Rp .gitlab-ci/fluster install/
 cp -Rp .gitlab-ci/fossils.yml install/
 cp -Rp .gitlab-ci/fossils install/
 cp -Rp .gitlab-ci/fossilize-runner.sh install/
@@ -84,7 +83,7 @@ if [ -n "$S3_ARTIFACT_NAME" ]; then
    # Pass needed files to the test stage
    S3_ARTIFACT_NAME="$S3_ARTIFACT_NAME.tar.zst"
    zstd --quiet --threads ${FDO_CI_CONCURRENT:-0} artifacts/install.tar -o ${S3_ARTIFACT_NAME}
-    s3_upload "${S3_ARTIFACT_NAME}" "https://${PIPELINE_ARTIFACTS_BASE}/"
+    ci-fairy s3cp --token-file "${S3_JWT_FILE}" ${S3_ARTIFACT_NAME} https://${PIPELINE_ARTIFACTS_BASE}/${S3_ARTIFACT_NAME}
 fi

 section_end prepare-artifacts
--- a/.gitlab-ci/run-pytest.sh
+++ b/.gitlab-ci/run-pytest.sh
@@ -7,46 +7,33 @@
 # shellcheck disable=SC1091 # The relative paths in this file only become valid at runtime.
 # shellcheck disable=SC2086 # quoting PYTEST_VERBOSE makes us pass an empty path

-set -eu
+. "${SCRIPTS_DIR}/setup-test-env.sh"

-PYTHON_BIN="python3.11"
+section_start pytest_setup "Setting up pytest environment"

-if [ -z "${SCRIPTS_DIR:-}" ]; then
-    SCRIPTS_DIR="$(dirname "${0}")"
-fi
-
-if [ -z "${CI_JOB_STARTED_AT:-}" ]; then
-    CI_JOB_STARTED_AT=$(date -u +%Y-%m-%dT%H:%M:%SZ) # isoformat
-fi
-
-source "${SCRIPTS_DIR}/setup-test-env.sh"
+set -exu

 if [ -z "${CI_PROJECT_DIR:-}" ]; then
    CI_PROJECT_DIR="$(dirname "${0}")/../"
 fi

-if [ -z "${CI_JOB_TIMEOUT:-}" ]; then
-    # Export this default value, 1 hour in seconds, to test the lava job submitter
-    export CI_JOB_TIMEOUT=3600
+if [ -z "${MESA_PYTEST_VENV:-}" ]; then
+    MESA_PYTEST_VENV="${CI_PROJECT_DIR}/.venv-pytest"
 fi

-# If running outside of the debian/x86_64_pyutils container,
-# run in a virtual environment for isolation
-# e.g. USE_VENV=true ./.gitlab-ci/run-pytest.sh
-if [ "${USE_VENV:-}" == true ]; then
-    echo "Setting up virtual environment for local testing."
-    MESA_PYTEST_VENV="${CI_PROJECT_DIR}/.venv-pytest"
-    ${PYTHON_BIN} -m venv "${MESA_PYTEST_VENV}"
-    source "${MESA_PYTEST_VENV}"/bin/activate
-    ${PYTHON_BIN} -m pip install --break-system-packages -r "${CI_PROJECT_DIR}/bin/ci/test/requirements.txt"
-fi
+# Use this script in a python virtualenv for isolation
+python3 -m venv "${MESA_PYTEST_VENV}"
+. "${MESA_PYTEST_VENV}"/bin/activate
+
+python3 -m pip install --break-system-packages -r "${CI_PROJECT_DIR}/bin/ci/requirements.txt"
+python3 -m pip install --break-system-packages -r "${CI_PROJECT_DIR}/bin/ci/test/requirements.txt"

 LIB_TEST_DIR=${CI_PROJECT_DIR}/.gitlab-ci/tests
 SCRIPT_TEST_DIR=${CI_PROJECT_DIR}/bin/ci

-uncollapsed_section_start pytest "Running pytest"
+uncollapsed_section_switch pytest "Running pytest"

-PYTHONPATH="${LIB_TEST_DIR}:${SCRIPT_TEST_DIR}:${PYTHONPATH:-}" ${PYTHON_BIN} -m \
+PYTHONPATH="${LIB_TEST_DIR}:${SCRIPT_TEST_DIR}:${PYTHONPATH:-}" python3 -m \
    pytest "${LIB_TEST_DIR}" "${SCRIPT_TEST_DIR}" \
            -W ignore::DeprecationWarning \
            --junitxml=artifacts/ci_scripts_report.xml \
@@ -54,9 +41,3 @@ PYTHONPATH="${LIB_TEST_DIR}:${SCRIPT_TEST_DIR}:${PYTHONPATH:-}" ${PYTHON_BIN} -m
 	    ${PYTEST_VERBOSE:-}

 section_end pytest
-
-section_start flake8 "flake8"
-${PYTHON_BIN} -m flake8 \
--config "${CI_PROJECT_DIR}/.gitlab-ci/.flake8" \
-"${LIB_TEST_DIR}" "${SCRIPT_TEST_DIR}"
-section_end flake8
--- a/.gitlab-ci/setup-test-env.sh
+++ b/.gitlab-ci/setup-test-env.sh
@@ -34,6 +34,24 @@ function get_current_minsec {
    printf "%02d:%02d" $((CURR_TIME/60)) $((CURR_TIME%60))
 }

+function error {
+    x_off 2>/dev/null
+    RED="\e[0;31m"
+    ENDCOLOR="\e[0m"
+    # we force the following to be not in a section
+    if [ -n "${CURRENT_SECTION:-}" ]; then
+      _section_end $CURRENT_SECTION
+    fi
+
+    CURR_MINSEC=$(get_current_minsec)
+    echo -e "\n${RED}[${CURR_MINSEC}] ERROR: $*${ENDCOLOR}\n"
+    x_restore
+}
+
+function trap_err {
+    error ${CURRENT_SECTION:-'unknown-section'}: ret code: $*
+}
+
 function _build_section_start {
    local section_params=$1
    shift
@@ -50,13 +68,13 @@ function _build_section_start {
 alias build_section_start="x_off; _build_section_start"

 function _section_start {
-    build_section_start "[collapsed=true]" $*
+    _build_section_start "[collapsed=true]" $*
    x_restore
 }
 alias section_start="x_off; _section_start"

 function _uncollapsed_section_start {
-    build_section_start "" $*
+    _build_section_start "" $*
    x_restore
 }
 alias uncollapsed_section_start="x_off; _uncollapsed_section_start"
@@ -69,7 +87,7 @@ function _build_section_end {
 alias build_section_end="x_off; _build_section_end"

 function _section_end {
-    build_section_end $*
+    _build_section_end $*
    x_restore
 }
 alias section_end="x_off; _section_end"
@@ -77,10 +95,9 @@ alias section_end="x_off; _section_end"
 function _section_switch {
    if [ -n "$CURRENT_SECTION" ]
    then
-        build_section_end $CURRENT_SECTION
-        x_off
+	_build_section_end $CURRENT_SECTION
    fi
-    build_section_start "[collapsed=true]" $*
+    _build_section_start "[collapsed=true]" $*
    x_restore
 }
 alias section_switch="x_off; _section_switch"
@@ -88,10 +105,9 @@ alias section_switch="x_off; _section_switch"
 function _uncollapsed_section_switch {
    if [ -n "$CURRENT_SECTION" ]
    then
-        build_section_end $CURRENT_SECTION
-        x_off
+	_build_section_end $CURRENT_SECTION
    fi
-    build_section_start "" $*
+    _build_section_start "" $*
    x_restore
 }
 alias uncollapsed_section_switch="x_off; _uncollapsed_section_switch"
@@ -100,6 +116,8 @@ export -f _x_store_state
 export -f _x_off
 export -f _x_restore
 export -f get_current_minsec
+export -f error
+export -f trap_err
 export -f _build_section_start
 export -f _section_start
 export -f _build_section_end
@@ -111,50 +129,12 @@ export -f _uncollapsed_section_switch
 [ -n "${XDG_RUNTIME_DIR:-}" ] || export XDG_RUNTIME_DIR="$(mktemp -p "$PWD" -d xdg-runtime-XXXXXX)"

 if [ -z "${RESULTS_DIR:-}" ]; then
-	export RESULTS_DIR="${PWD%/}/results"
+	export RESULTS_DIR="$(pwd)/results"
 	if [ -e "${RESULTS_DIR}" ]; then
 		rm -rf "${RESULTS_DIR}"
 	fi
 	mkdir -p "${RESULTS_DIR}"
 fi

-function error {
-    RED="\e[0;31m"
-    ENDCOLOR="\e[0m"
-    # we force the following to be not in a section
-    if [ -n "${CURRENT_SECTION:-}" ]; then
-      section_end $CURRENT_SECTION
-      x_off
-    fi
-
-    CURR_MINSEC=$(get_current_minsec)
-    echo -e "\n${RED}[${CURR_MINSEC}] ERROR: $*${ENDCOLOR}\n"
-    x_restore
-}
-
-function trap_err {
-    x_off
-    error ${CURRENT_SECTION:-'unknown-section'}: ret code: $*
-}
-
-export -f error
-export -f trap_err
-
-s3_upload() {
-    x_off
-    local file=$1 s3_folder_url=$2
-    if [ ! -f "$file" ] || [[ "$s3_folder_url" != https://* ]]
-    then
-      echo "s3_upload used incorrectly: first argument is the file, second argument is the s3 folder url"
-      exit 1
-    fi
-    curl --fail --retry-all-errors --retry 4 --retry-delay 60 \
-      --header "Authorization: Bearer $(cat "${S3_JWT_FILE}")" \
-      -X PUT --form file=@"$file" \
-      "$s3_folder_url"
-    x_restore
-}
-export -f s3_upload
-
 set -E
 trap 'trap_err $?' ERR
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -40,7 +40,7 @@
 .restricted-rules:
  rules:
    # If the triggerer has access to the restricted traces and if it is pre-merge
-    - if: '($GITLAB_USER_LOGIN !~ "/^(robclark|anholt|flto|cwabbott0|Danil|tomeu|okias|gallo|kwg|llanderwelin|zmike|vigneshraman|Valentine)$/") &&
+    - if: '($GITLAB_USER_LOGIN !~ "/^(robclark|anholt|flto|cwabbott0|Danil|tomeu|okias|gallo|kwg|llanderwelin|zmike|vigneshraman)$/") &&
           ($GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH)'
      when: never

@@ -122,7 +122,7 @@
    LAVA_TAGS: "cbg-0"
    # Ensure that we are using the release build artifact
    LAVA_S3_ARTIFACT_NAME: mesa-${ARCH}-default-release
-    S3_ARTIFACT_NAME: mesa-python-ci-artifacts
+    S3_ARTIFACT_NAME: mesa-python-test
  # Reset dependencies in performance jobs to enforce the release build artifact
  dependencies: null
  # Don't run in parallel. It is okay to performance jobs to take a little
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -13,7 +13,7 @@
    - section_end ldd_section
  artifacts:
    when: always
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
+    name: "mesa_${CI_JOB_NAME}"
    paths:
      - results/
  rules:
@@ -43,50 +43,34 @@ rustfmt:
    - rustfmt --version
    - rustfmt --verbose src/**/lib.rs

-yaml-toml-shell-py-test:
+yaml-toml-shell-test:
  extends:
-    - .use-debian/x86_64_pyutils
+    - python-test
    - .no-auto-retry  # this job can't be flaky
  stage: code-validation
  script:
    - uncollapsed_section_start tomllint "tomllint"
    - echo "If your change looks right but this script rejects it, contact @eric (GitLab) / eric_engestrom (IRC)."
    - python3 bin/toml_lint.py
-    - section_end tomllint
-    - section_start yamllint "yamllint"
+    - uncollapsed_section_switch yamllint "yamllint"
    - .gitlab-ci/run-yamllint.sh
-    - section_end yamllint
-    - section_start shellcheck "shellcheck"
+    - uncollapsed_section_switch shellcheck "shellcheck"
    - .gitlab-ci/run-shellcheck.sh
-    - section_end shellcheck
-    - .gitlab-ci/run-pytest.sh
+    - section_end
  rules:
    - !reference [.disable-farm-mr-rules, rules]
    - !reference [.never-post-merge-rules, rules]
    - !reference [.no_scheduled_pipelines-rules, rules]
-    # merge pipeline
-    - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes: &lint_files
+    - if: $GITLAB_USER_LOGIN == "marge-bot"
+      changes: &toml_lint_files
        - .gitlab-ci/test/gitlab-ci.yml
        - .gitlab-ci/**/*.sh
        - .shellcheckrc
        - bin/toml_lint.py
        - src/**/ci/*.toml
-        - .gitlab-ci/tests/**/*
-        - bin/ci/**/*
      when: on_success
-    # direct pushes that bypassed the CI
-    - if: $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
-      changes: *lint_files
-      when: on_success
-    # direct pushes from release manager
-    - if: $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME =~ /^staging\//
-      changes: *lint_files
-      when: on_success
-    - changes: *lint_files
+    - changes: *toml_lint_files
      when: manual
-  tags:
-    - placeholder-job

 .test-gl:
  extends:
@@ -123,13 +107,7 @@ yaml-toml-shell-py-test:
    - .test
    - .use-debian/x86_64_test-android
  variables:
-    # This is for the guest artifacts from debian-android which will be
-    # downloaded explicitly by cuttlefish-runner.sh
-    S3_ANDROID_ARTIFACT_NAME: mesa-x86_64-android-debug
-    # Set the default Vulkan driver to lavapipe for some preliminary checks
-    # that Cuttlefish always performs before starting the VM. This can be
-    # overwritten depending on the physical machine running the job.
-    VK_DRIVER: "lvp"
+    S3_ARTIFACT_NAME: mesa-x86_64-android-debug
  needs:
    - job: debian-testing
      artifacts: true  # On the host we want the Linux build
@@ -144,8 +122,6 @@ yaml-toml-shell-py-test:
  artifacts:
    paths:
      - results/
-  tags:
-    - kvm

 .b2c-vkd3d-proton-test:
  variables:
@@ -154,7 +130,7 @@ yaml-toml-shell-py-test:
 .piglit-traces-test:
  artifacts:
    when: on_failure
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
+    name: "mesa_${CI_JOB_NAME}"
    reports:
      junit: results/junit.xml
    paths:
@@ -188,7 +164,7 @@ yaml-toml-shell-py-test:
    - ./install/fossilize-runner.sh
  artifacts:
    when: on_failure
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
+    name: "mesa_${CI_JOB_NAME}"
    paths:
      - results/

@@ -216,7 +192,7 @@ yaml-toml-shell-py-test:
    BM_ROOTFS: /rootfs-${DEBIAN_ARCH}
  artifacts:
    when: always
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
+    name: "mesa_${CI_JOB_NAME}"
    paths:
      - results/
      - serial*.txt
@@ -256,8 +232,8 @@ yaml-toml-shell-py-test:
 # ARM32/64 testing of bare-metal boards attached to an x86 gitlab-runner system, using an asan mesa build
 .baremetal-arm32-asan-test:
  variables:
+    DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so"
    S3_ARTIFACT_NAME: mesa-arm32-asan-debugoptimized
-    DEQP_FORCE_ASAN: 1
  needs:
    - debian/baremetal_arm32_test
    - job: debian-arm32-asan
@@ -266,26 +242,14 @@ yaml-toml-shell-py-test:

 .baremetal-arm64-asan-test:
  variables:
+    DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so"
    S3_ARTIFACT_NAME: mesa-arm64-asan-debugoptimized
-    DEQP_FORCE_ASAN: 1
  needs:
    - debian/baremetal_arm64_test
    - job: debian-arm64-asan
      artifacts: false
    - !reference [.required-for-hardware-jobs, needs]

-.baremetal-arm64-ubsan-test:
-  extends:
-    - .baremetal-test
-    - .use-debian/baremetal_arm64_test
-  variables:
-    S3_ARTIFACT_NAME: mesa-arm64-ubsan-debugoptimized
-  needs:
-    - debian/baremetal_arm64_test
-    - job: debian-arm64-ubsan
-      artifacts: false
-    - !reference [.required-for-hardware-jobs, needs]
-
 .baremetal-deqp-test:
  variables:
    HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
@@ -309,7 +273,8 @@ yaml-toml-shell-py-test:
    # No need by default to pull the whole repo
    GIT_STRATEGY: none
    # boot2container initrd configuration parameters.
-    B2C_VERSION: v0.9.14
+    B2C_KERNEL_URL: 'https://gitlab.freedesktop.org/gfx-ci/ci-tron/-/package_files/519/download'  # Linux 6.1
+    B2C_INITRAMFS_URL: 'https://gitlab.freedesktop.org/mupuf/boot2container/-/releases/v0.9.10/downloads/initramfs.linux_amd64.cpio.xz'
    B2C_JOB_SUCCESS_REGEX: 'hwci: mesa: pass, exit_code: 0\r$'
    B2C_LOG_LEVEL: 6
    B2C_POWEROFF_DELAY: 15
@@ -405,75 +370,39 @@ yaml-toml-shell-py-test:
  after_script:
    # Keep the results path the same as baremetal and LAVA
    - mkdir -p "${JOB_FOLDER}"/results
-    - mv "${JOB_FOLDER}"/results ./
+    - mv "${JOB_FOLDER}"/results results/
    - !reference [default, after_script]

  artifacts:
    when: always
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
+    name: "mesa_${CI_JOB_NAME}"
    paths:
      - results
    reports:
      junit: results/**/junit.xml

-.b2c-x86_64-test:
-  extends:
-    - .b2c-test
-  variables:
-    B2C_KERNEL_URL: 'https://gitlab.freedesktop.org/gfx-ci/ci-tron/-/package_files/519/download'  # Linux 6.1
-    B2C_INITRAMFS_URL: 'https://gitlab.freedesktop.org/gfx-ci/boot2container/-/releases/${B2C_VERSION}/downloads/initramfs.linux_amd64.cpio.xz'
-
 .b2c-x86_64-test-vk:
  extends:
    - .use-debian/x86_64_test-vk
-    - .b2c-x86_64-test
+    - .b2c-test
  needs:
    - debian/x86_64_test-vk
    - debian-testing
    - !reference [.required-for-hardware-jobs, needs]

-.b2c-x86_64-test-vk-manual:
-  extends:
-    - .use-debian/x86_64_test-vk
-    - .b2c-x86_64-test
-  variables:
-    S3_ARTIFACT_NAME: "debian-build-testing"
-  needs:
-    - debian/x86_64_test-vk
-    - debian-build-testing
-    - !reference [.required-for-hardware-jobs, needs]
-
 .b2c-x86_64-test-gl:
  extends:
    - .use-debian/x86_64_test-gl
-    - .b2c-x86_64-test
+    - .b2c-test
  needs:
    - debian/x86_64_test-gl
    - debian-testing
    - !reference [.required-for-hardware-jobs, needs]

-.b2c-x86_64-test-gl-manual:
-  extends:
-    - .use-debian/x86_64_test-gl
-    - .b2c-x86_64-test
-  variables:
-    S3_ARTIFACT_NAME: "debian-build-testing"
-  needs:
-    - debian/x86_64_test-gl
-    - debian-build-testing
-    - !reference [.required-for-hardware-jobs, needs]
-
-.b2c-arm64-test:
-  extends:
-    - .b2c-test
-  variables:
-    B2C_INITRAMFS_URL: 'https://gitlab.freedesktop.org/gfx-ci/boot2container/-/releases/${B2C_VERSION}/downloads/initramfs.linux_arm64.cpio.xz'
-    B2C_KERNEL_URL: 'https://gitlab.freedesktop.org/gfx-ci/boot2container/-/releases/${B2C_VERSION}/downloads/linux-arm64'
-
 .b2c-arm64-test-vk:
  extends:
    - .use-debian/arm64_test-vk
-    - .b2c-arm64-test
+    - .b2c-test
  needs:
    - debian/arm64_test-vk
    - debian-arm64
@@ -482,7 +411,7 @@ yaml-toml-shell-py-test:
 .b2c-arm64-test-gl:
  extends:
    - .use-debian/arm64_test-gl
-    - .b2c-arm64-test
+    - .b2c-test
  needs:
    - debian/arm64_test-gl
    - debian-arm64
--- a/.gitlab-ci/tests/conftest.py
+++ b/.gitlab-ci/tests/conftest.py
@@ -25,7 +25,7 @@ def mock_sleep():

@pytest.fixture
 def frozen_time(mock_sleep):
-    with freeze_time("2024-01-01") as frozen_time:
+    with freeze_time() as frozen_time:
        yield frozen_time


@@ -34,10 +34,6 @@ RESULT_GET_TESTJOB_RESULTS = [{"metadata": {"result": "test"}}]

@pytest.fixture
 def mock_proxy(frozen_time):
-    def mock_job_state(jid) -> dict[str, str]:
-        frozen_time.tick(1)
-        return {"job_state": "Running"}
-
    def create_proxy_mock(
        job_results=RESULT_GET_TESTJOB_RESULTS,
        testsuite_results=[generate_testsuite_result()],
@@ -57,7 +53,8 @@ def mock_proxy(frozen_time):
        proxy_logs_mock.return_value = jobs_logs_response()

        proxy_job_state = proxy_mock.scheduler.job_state
-        proxy_job_state.side_effect = mock_job_state
+        proxy_job_state.return_value = {"job_state": "Running"}
+        proxy_job_state.side_effect = frozen_time.tick(1)

        proxy_show_mock = proxy_mock.scheduler.jobs.show
        proxy_show_mock.return_value = defaultdict(
--- a/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml
+++ b/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml
@@ -16,8 +16,6 @@ timeouts:
      minutes: 1
    depthcharge-action:
      minutes: 15
-    uboot-action:
-      minutes: 5
 actions:
 - deploy:
    timeout:
@@ -45,8 +43,7 @@ actions:
        steps:
        - cat Image.gz my_dtb_filename.dtb > Image.gz+dtb
        - mkbootimg --kernel Image.gz+dtb --cmdline "root=/dev/nfs rw nfsroot=$NFS_SERVER_IP:$NFS_ROOTFS,tcp,hard,v3
-          ip=dhcp init=/init rootwait usbcore.quirks=0bda:8153:k" --pagesize 4096
-          --base 0x80000000 -o boot.img
+          ip=dhcp init=/init rootwait usbcore.quirks=0bda:8153:k" --pagesize 4096 --base 0x80000000 -o boot.img
    namespace: dut
 - deploy:
    timeout:
@@ -121,7 +118,7 @@ actions:
            ping -c 5 -w 60 $(lava-target-ip)

            lava_ssh_test_case() {
-                set -ex
+                set -x
                local test_case="${1}"
                shift
                lava-test-case "${test_case}" --shell \
@@ -140,6 +137,6 @@ actions:
            sed -i '/S3_RESULTS_UPLOAD/d' /set-job-env-vars.sh
            EOF
          - export SSH_PTY_ARGS=-tt
-          - lava_ssh_test_case 'test-project_dut' 'cd / && /init-stage2.sh'
+          - lava_ssh_test_case 'test-project_dut' '"cd / && /init-stage2.sh"'
    docker:
      image:
--- a/.gitlab-ci/tests/data/FASTBOOT_force_uart=True_job_definition.yaml
+++ b/.gitlab-ci/tests/data/FASTBOOT_force_uart=True_job_definition.yaml
@@ -16,8 +16,6 @@ timeouts:
      minutes: 1
    depthcharge-action:
      minutes: 15
-    uboot-action:
-      minutes: 5
 actions:
 - deploy:
    timeout:
@@ -44,8 +42,7 @@ actions:
        steps:
        - cat Image.gz my_dtb_filename.dtb > Image.gz+dtb
        - mkbootimg --kernel Image.gz+dtb --cmdline "root=/dev/nfs rw nfsroot=$NFS_SERVER_IP:$NFS_ROOTFS,tcp,hard,v3
-          ip=dhcp init=/init rootwait usbcore.quirks=0bda:8153:k" --pagesize 4096
-          --base 0x80000000 -o boot.img
+          ip=dhcp init=/init rootwait usbcore.quirks=0bda:8153:k" --pagesize 4096 --base 0x80000000 -o boot.img
 - deploy:
    timeout:
      minutes: 2
--- a/.gitlab-ci/tests/data/UBOOT_force_uart=False_job_definition.yaml
+++ b/.gitlab-ci/tests/data/UBOOT_force_uart=False_job_definition.yaml
@@ -16,8 +16,6 @@ timeouts:
      minutes: 1
    depthcharge-action:
      minutes: 15
-    uboot-action:
-      minutes: 5
 actions:
 - deploy:
    timeout:
@@ -92,7 +90,7 @@ actions:
            ping -c 5 -w 60 $(lava-target-ip)

            lava_ssh_test_case() {
-                set -ex
+                set -x
                local test_case="${1}"
                shift
                lava-test-case "${test_case}" --shell \
@@ -111,6 +109,6 @@ actions:
            sed -i '/S3_RESULTS_UPLOAD/d' /set-job-env-vars.sh
            EOF
          - export SSH_PTY_ARGS=-tt
-          - lava_ssh_test_case 'test-project_dut' 'cd / && /init-stage2.sh'
+          - lava_ssh_test_case 'test-project_dut' '"cd / && /init-stage2.sh"'
    docker:
      image:
--- a/.gitlab-ci/tests/data/UBOOT_force_uart=True_job_definition.yaml
+++ b/.gitlab-ci/tests/data/UBOOT_force_uart=True_job_definition.yaml
@@ -16,8 +16,6 @@ timeouts:
      minutes: 1
    depthcharge-action:
      minutes: 15
-    uboot-action:
-      minutes: 5
 actions:
 - deploy:
    timeout:
--- a/Show More
+++ b/Show More