wsi: Implement linux-drm-syncobj-v1

This implements explicit sync with linux-drm-syncobj-v1 for the Wayland WSI. Signed-off-by: Joshua Ashton <joshua@froggi.es>
wsi: Add common infrastructure for explicit sync
2024-03-27 17:49:03 +00:00 · 2024-03-27 17:49:03 +00:00 · 2024-03-27 17:44:16 +00:00 · 2024-03-25 21:00:54 +00:00 · 2024-03-25 21:00:54 +00:00 · 2024-03-22 00:24:26 +00:00
6794 changed files with 413960 additions and 948253 deletions
--- a/.ci-farms-disabled/google-freedreno
+++ b/.ci-farms-disabled/google-freedreno
--- a/.clang-format-include
+++ b/.clang-format-include
@@ -2,7 +2,6 @@
 # enforcement in the CI.

 src/gallium/drivers/i915
-src/gallium/drivers/r300/compiler/*
 src/gallium/targets/teflon/**/*
 src/amd/vulkan/**/*
 src/amd/compiler/**/*
--- a/.editorconfig
+++ b/.editorconfig
@@ -31,7 +31,7 @@ indent_size = 3
 [*.patch]
 trim_trailing_whitespace = false

-[{meson.build,meson.options}]
+[{meson.build,meson_options.txt}]
 indent_style = space
 indent_size = 2

--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -65,12 +65,3 @@ c7bf3b69ebc8f2252dbf724a4de638e6bb2ac402

 # ir3: Reformat source with clang-format
 177138d8cb0b4f6a42ef0a1f8593e14d79f17c54
-
-# ir3: reformat after refactoring in previous commit
-8ae5b27ee0331a739d14b42e67586784d6840388
-
-# ir3: don't use deprecated NIR_PASS_V anymore
-2fedc82c0cc9d3fb2e54707b57941b79553b640c
-
-# ir3: reformat after previous commit
-7210054db8cfb445a8ccdeacfdcfecccf44fa266
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-.cache
 .vscode*
 *.pyc
 *.pyo
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,80 +30,56 @@ 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:
+        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
        MESA_CI_PERFORMANCE_ENABLED: 1
-        FDO_RUNNER_JOB_PRIORITY_TAG_X86_64: priority:high
-        FDO_RUNNER_JOB_PRIORITY_TAG_X86_64_KVM: priority:high-kvm
-        FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64: priority:high-aarch64
-        CI_TRON_JOB_PRIORITY_TAG: ""  # 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
+        VALVE_INFRA_VANGOGH_JOB_PRIORITY: ""  # Empty tags are ignored by gitlab
    # post-merge pipeline
    - if: &is-post-merge $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "push"
-    # Pre-merge pipeline
-    - if: &is-pre-merge $CI_PIPELINE_SOURCE == "merge_request_event"
-    # Push to a branch on a fork
-    - if: &is-fork-push $CI_PROJECT_NAMESPACE != "mesa" && $CI_PIPELINE_SOURCE == "push"
    # nightly pipeline
    - if: &is-scheduled-pipeline $CI_PIPELINE_SOURCE == "schedule"
      variables:
-        FDO_RUNNER_JOB_PRIORITY_TAG_X86_64: priority:low
-        FDO_RUNNER_JOB_PRIORITY_TAG_X86_64_KVM: priority:low-kvm
-        FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64: priority:low-aarch64
-        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
+        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
+        JOB_PRIORITY: 50
+        VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
    # 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\//
+        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
+        JOB_PRIORITY: 40
+        VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
+    # pre-merge or fork pipeline
+    - if: $FORCE_KERNEL_TAG != null
      variables:
-        JOB_PRIORITY: 70
+        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${FORCE_KERNEL_TAG}
+        JOB_PRIORITY: 50
+        VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
+    - if: $FORCE_KERNEL_TAG == null
+      variables:
+        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
+        JOB_PRIORITY: 50
+        VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low


 variables:
  FDO_UPSTREAM_REPO: mesa/mesa
-  MESA_TEMPLATES_COMMIT: &ci-templates-commit 48e4b6c9a2015f969fbe648999d16d5fb3eef6c4
+  MESA_TEMPLATES_COMMIT: &ci-templates-commit d5aa3941aa03c2f716595116354fb81eb8012acb
  CI_PRE_CLONE_SCRIPT: |-
          set -o xtrace
          wget -q -O download-git-cache.sh ${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/download-git-cache.sh
          bash download-git-cache.sh
          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
+  CI_JOB_JWT_FILE: /minio_jwt
  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
-  S3_GITCACHE_BUCKET: git-cache
-  # Bucket for the pipeline artifacts pushed to S3
-  S3_ARTIFACTS_BUCKET: artifacts
-  # Buckets for traces
-  S3_TRACIE_RESULTS_BUCKET: mesa-tracie-results
-  S3_TRACIE_PUBLIC_BUCKET: mesa-tracie-public
-  S3_TRACIE_PRIVATE_BUCKET: mesa-tracie-private
  # per-pipeline artifact storage on MinIO
-  PIPELINE_ARTIFACTS_BASE: ${S3_HOST}/${S3_ARTIFACTS_BUCKET}/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
+  PIPELINE_ARTIFACTS_BASE: ${S3_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
  # per-job artifact storage on MinIO
  JOB_ARTIFACTS_BASE: ${PIPELINE_ARTIFACTS_BASE}/${CI_JOB_ID}
  # reference images stored for traces
-  PIGLIT_REPLAY_REFERENCE_IMAGES_BASE: "${S3_HOST}/${S3_TRACIE_RESULTS_BUCKET}/$FDO_UPSTREAM_REPO"
+  PIGLIT_REPLAY_REFERENCE_IMAGES_BASE: "${S3_HOST}/mesa-tracie-results/$FDO_UPSTREAM_REPO"
  # For individual CI farm status see .ci-farms folder
  # Disable farm with   `git mv .ci-farms{,-disabled}/$farm_name`
  # Re-enable farm with `git mv .ci-farms{-disabled,}/$farm_name`
@@ -111,38 +87,27 @@ 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
-  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
-  FDO_RUNNER_JOB_PRIORITY_TAG_X86_64: ""  # Empty tags are ignored by gitlab
-  FDO_RUNNER_JOB_PRIORITY_TAG_X86_64_KVM: kvm
-  FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64: aarch64
-  CI_TRON_JOB_PRIORITY_TAG: ci-tron:priority:low
-  JOB_PRIORITY: 50
-  DATA_STORAGE_PATH: data_storage

 default:
-  timeout: 1m # catch any jobs which don't specify a timeout
-  id_tokens:
-    S3_JWT:
-      aud: https://s3.freedesktop.org
  before_script:
-    - |
-      if [ -z "${KERNEL_IMAGE_BASE:-}" ]; then
-        export KERNEL_IMAGE_BASE="https://${S3_HOST}/${S3_KERNEL_BUCKET}/${KERNEL_REPO}/${EXTERNAL_KERNEL_TAG:-$KERNEL_TAG}"
-      fi
    - >
      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 "${CI_JOB_JWT}" > "${CI_JOB_JWT_FILE}" &&
+      unset CI_JOB_JWT  # Unsetting vulnerable env variables

  after_script:
    # Work around https://gitlab.com/gitlab-org/gitlab/-/issues/20338
    - find -name '*.log' -exec mv {} {}.txt \;

+    - >
+      set +x
+
+      test -e "${CI_JOB_JWT_FILE}" &&
+      export CI_JOB_JWT="$(<${CI_JOB_JWT_FILE})" &&
+      rm "${CI_JOB_JWT_FILE}"
+
  # Retry when job fails. Failed jobs can be found in the Mesa CI Daily Reports:
  # https://gitlab.freedesktop.org/mesa/mesa/-/issues/?sort=created_date&state=opened&label_name%5B%5D=CI%20daily
  retry:
@@ -162,28 +127,18 @@ stages:
  - sanity
  - container
  - git-archive
-  - build-for-tests
-  - build-only
+  - build-x86_64
+  - build-misc
  - code-validation
  - amd
-  - amd-postmerge
  - intel
-  - intel-postmerge
  - nouveau
-  - nouveau-postmerge
  - arm
-  - arm-postmerge
  - broadcom
-  - broadcom-postmerge
  - freedreno
-  - freedreno-postmerge
  - etnaviv
-  - etnaviv-postmerge
  - software-renderer
-  - software-renderer-postmerge
  - layered-backends
-  - layered-backends-postmerge
-  - performance
  - deploy

 include:
@@ -208,11 +163,12 @@ include:
  - local: 'src/**/ci/gitlab-ci.yml'


-# Rules applied to every job in the pipeline
-.common-rules:
-  rules:
-    - if: *is-fork-push
-      when: manual
+# YAML anchors for rule conditions
+# --------------------------------
+.rules-anchors:
+  # Pre-merge pipeline
+  - &is-pre-merge '$CI_PIPELINE_SOURCE == "merge_request_event"'
+

 .never-post-merge-rules:
  rules:
@@ -220,11 +176,8 @@ include:
      when: never


-# Note: make sure the branches in this list are the same as in
-# `.build-only-delayed-rules` below.
 .container+build-rules:
  rules:
-    - !reference [.common-rules, rules]
    # Run when re-enabling a disabled farm, but not when disabling it
    - !reference [.disable-farm-mr-rules, rules]
    # Never run immediately after merging, as we just ran everything
@@ -237,7 +190,6 @@ include:
        - bin/git_sha1_gen.py
        - bin/install_megadrivers.py
        - bin/symbols-check.py
-        - bin/ci/**/*
        # GitLab CI
        - .gitlab-ci.yml
        - .gitlab-ci/**/*
@@ -268,9 +220,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
@@ -278,53 +227,10 @@ include:
    # manually triggered
    - when: manual

-# Repeat of the above but with `when: on_success` replaced with
-# `when: delayed` + `start_in:`, for build-only jobs.
-# Note: make sure the branches in this list are the same as in
-# `.container+build-rules` above.
-.build-only-delayed-rules:
-  rules:
-    - !reference [.common-rules, rules]
-    # Run when re-enabling a disabled farm, but not when disabling it
-    - !reference [.disable-farm-mr-rules, rules]
-    # Never run immediately after merging, as we just ran everything
-    - !reference [.never-post-merge-rules, rules]
-    # Build everything in merge pipelines, if any files affecting the pipeline
-    # were changed
-    - if: *is-merge-attempt
-      changes: *all_paths
-      when: delayed
-      start_in: &build-delay 5 minutes
-    # Same as above, but for pre-merge pipelines
-    - if: *is-pre-merge
-      changes: *all_paths
-      when: manual
-    # Skip everything for pre-merge and merge pipelines which don't change
-    # anything in the build
-    - if: *is-merge-attempt
-      when: never
-    - if: *is-pre-merge
-      when: never
-    # Build everything after someone bypassed the CI
-    - if: *is-direct-push
-      when: delayed
-      start_in: *build-delay
-    # Build everything when pushing to staging branches
-    - if: *is-staging-push
-      when: delayed
-      start_in: *build-delay
-    # Build everything in scheduled pipelines
-    - if: *is-scheduled-pipeline
-      when: delayed
-      start_in: *build-delay
-    # Allow building everything in fork pipelines, but build nothing unless
-    # manually triggered
-    - when: manual
-

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

 # Git archive

@@ -343,23 +248,25 @@ make git archive:
  stage: git-archive
  rules:
    - !reference [.scheduled_pipeline-rules, rules]
+  # ensure we are running on packet
+  tags:
+    - packet.net
  script:
    # 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 "${CI_JOB_JWT_FILE}" ../$CI_PROJECT_NAME.tar.gz https://$S3_HOST/git-cache/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_PROJECT_NAME.tar.gz
+

 # Sanity checks of MR settings and commit logs
 sanity:
  extends:
    - .fdo.ci-fairy
  stage: sanity
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64
  rules:
    - if: *is-pre-merge
      when: on_success
@@ -372,20 +279,19 @@ sanity:
    - |
      set -eu
      image_tags=(
-        ALPINE_X86_64_BUILD_TAG
-        ALPINE_X86_64_LAVA_SSH_TAG
        DEBIAN_BASE_TAG
        DEBIAN_BUILD_TAG
-        DEBIAN_PYUTILS_TAG
-        DEBIAN_TEST_ANDROID_TAG
-        DEBIAN_TEST_GL_TAG
-        DEBIAN_TEST_VK_TAG
+        DEBIAN_X86_64_TEST_ANDROID_TAG
+        DEBIAN_X86_64_TEST_GL_TAG
+        DEBIAN_X86_64_TEST_VK_TAG
+        ALPINE_X86_64_BUILD_TAG
+        ALPINE_X86_64_LAVA_SSH_TAG
        FEDORA_X86_64_BUILD_TAG
        KERNEL_ROOTFS_TAG
        KERNEL_TAG
        PKG_REPO_REV
-        WINDOWS_X64_BUILD_TAG
        WINDOWS_X64_MSVC_TAG
+        WINDOWS_X64_BUILD_TAG
        WINDOWS_X64_TEST_TAG
      )
      for var in "${image_tags[@]}"
@@ -400,32 +306,14 @@ sanity:
    when: on_failure
    reports:
      junit: check-*.xml
-
-
-mr-label-maker-test:
-  extends:
-    - .fdo.ci-fairy
-  stage: sanity
  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64
-  rules:
-    - !reference [.mr-label-maker-rules, rules]
-  variables:
-    GIT_STRATEGY: fetch
-  timeout: 10m
-  script:
-    - set -eu
-    - python3 -m venv .venv
-    - source .venv/bin/activate
-    - pip install git+https://gitlab.freedesktop.org/freedesktop/mr-label-maker
-    - mr-label-maker --dry-run --mr $CI_MERGE_REQUEST_IID
+    - placeholder-job
+

 # 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
-      artifacts: false
-    - job: yaml-toml-shell-py-test
-      optional: true
-      artifacts: false
--- 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/all-skips.txt
+++ b/.gitlab-ci/all-skips.txt
@@ -80,36 +80,3 @@ wayland-dEQP-EGL.functional.render.multi_context.gles2_gles3.other
 wayland-dEQP-EGL.functional.render.multi_thread.gles2.other
 wayland-dEQP-EGL.functional.render.multi_thread.gles3.other
 wayland-dEQP-EGL.functional.render.multi_thread.gles2_gles3.other
-
-# These test the loader more than the implementation and are broken because the
-# Vulkan loader in Debian is too old
-dEQP-VK.api.get_device_proc_addr.non_enabled
-dEQP-VK.api.version_check.unavailable_entry_points
-
-# These tests are flaking too much recently on almost all drivers, so better skip them until the cause is identified
-spec@arb_program_interface_query@arb_program_interface_query-getprogramresourceindex
-spec@arb_program_interface_query@arb_program_interface_query-getprogramresourceindex@'vs_input2[1][0]' on GL_PROGRAM_INPUT
-
-# These tests attempt to read from the front buffer after a swap. They are skipped
-# on both X11 and gbm, but for different reasons:
-#
-# On X11: Given that we run piglit tests in parallel in Mesa CI, and don't have a
-# compositor running, the frontbuffer reads may end up with undefined results from
-# windows overlapping us.
-# Piglit does mark these tests as not to be run in parallel, but deqp-runner
-# doesn't respect that.  We need to extend deqp-runner to allow some tests to be
-# marked as single-threaded and run after the rayon loop if we want to support
-# them.
-# Other front-buffer access tests like fbo-sys-blit, fbo-sys-sub-blit, or
-# fcc-front-buffer-distraction don't appear here, because the DRI3 fake-front
-# handling should be holding the pixels drawn by the test even if we happen to fail
-# GL's window system pixel occlusion test.
-# Note that glx skips don't appear here, they're in all-skips.txt (in case someone
-# sets PIGLIT_PLATFORM=gbm to mostly use gbm, but still has an X server running).
-#
-# On gbm: gbm does not support reading the front buffer after a swapbuffers, and
-# that's intentional. Don't bother running these tests when PIGLIT_PLATFORM=gbm.
-# Note that this doesn't include tests like fbo-sys-blit, which draw/read front
-# but don't swap.
-spec@!opengl 1.0@gl-1.0-swapbuffers-behavior
-spec@!opengl 1.1@read-front
--- a/.gitlab-ci/android-cts-runner.sh
+++ b/.gitlab-ci/android-cts-runner.sh
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-# shellcheck disable=SC1091 # paths only become valid at runtime
-
-. "${SCRIPTS_DIR}/setup-test-env.sh"
-
-export PATH=/android-tools/android-cts/jdk/bin/:/android-tools/build-tools:$PATH
-export JAVA_HOME=/android-tools/android-cts/jdk
-
-# Wait for the appops service to show up
-while [ "$($ADB shell dumpsys -l | grep appops)" = "" ] ; do sleep 1; done
-
-SKIP_FILE="$INSTALL/${GPU_VERSION}-android-cts-skips.txt"
-
-EXCLUDE_FILTERS=""
-if [ -e "$SKIP_FILE" ]; then
-  EXCLUDE_FILTERS="$(grep -v -E "(^#|^[[:space:]]*$)" "$SKIP_FILE" | sed -s 's/.*/--exclude-filter "\0" /g')"
-fi
-
-INCLUDE_FILE="$INSTALL/${GPU_VERSION}-android-cts-include.txt"
-
-if [ -e "$INCLUDE_FILE" ]; then
-  INCLUDE_FILTERS="$(grep -v -E "(^#|^[[:space:]]*$)" "$INCLUDE_FILE" | sed -s 's/.*/--include-filter "\0" /g')"
-else
-  INCLUDE_FILTERS=$(printf -- "--include-filter %s " $ANDROID_CTS_MODULES | sed -e 's/ $//g')
-fi
-
-set +e
-eval "/android-tools/android-cts/tools/cts-tradefed" run commandAndExit cts-dev \
-  $EXCLUDE_FILTERS \
-  $INCLUDE_FILTERS
-
-[ "$(grep "^FAILED" /android-tools/android-cts/results/latest/invocation_summary.txt | tr -d ' ' | cut -d ':' -f 2)" = "0" ]
-
-# shellcheck disable=SC2034 # EXIT_CODE is used by the script that sources this one
-EXIT_CODE=$?
-set -e
-
-section_switch cuttlefish_results "cuttlefish: gathering the results"
-
-cp -r "/android-tools/android-cts/results/latest"/* $RESULTS_DIR
-cp -r "/android-tools/android-cts/logs/latest"/* $RESULTS_DIR
-
-section_end cuttlefish_results
--- a/.gitlab-ci/android-deqp-runner.sh
+++ b/.gitlab-ci/android-deqp-runner.sh
@@ -1,96 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-# shellcheck disable=SC1091 # paths only become valid at runtime
-
-. "${SCRIPTS_DIR}/setup-test-env.sh"
-
-# deqp
-
-$ADB shell mkdir -p /data/deqp
-$ADB push /deqp-gles/modules/egl/deqp-egl-android /data/deqp
-$ADB push /deqp-gles/mustpass/egl-main.txt.zst /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 "$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
-
-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 "$ANGLE_TAG" ]; then
-    DEQP_SKIPS="$DEQP_SKIPS /data/deqp/angle-skips.txt"
-fi
-
-AOSP_RESULTS=/data/deqp/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 \
-    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 \
-    --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\"} \
-    "
-
-# shellcheck disable=SC2034 # EXIT_CODE is used by the script that sources this one
-EXIT_CODE=$?
-set -e
-section_switch cuttlefish_results "cuttlefish: gathering the results"
-
-$ADB pull "$AOSP_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"
-
-section_end cuttlefish_results
--- a/.gitlab-ci/android-runner.sh
+++ b/.gitlab-ci/android-runner.sh
@@ -1,118 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-# shellcheck disable=SC1091 # paths only become valid at runtime
-
-# Set default ADB command if not set already
-
-: "${ADB:=adb}"
-
-$ADB wait-for-device root
-sleep 1
-
-# overlay 
-
-REMOUNT_PATHS="/vendor"
-if [ "$ANDROID_VERSION" -ge 15 ]; then
-  REMOUNT_PATHS="$REMOUNT_PATHS /system"
-fi
-
-OV_TMPFS="/data/overlay-remount"
-$ADB shell mkdir -p "$OV_TMPFS"
-$ADB shell mount -t tmpfs none "$OV_TMPFS"
-
-for path in $REMOUNT_PATHS; do
-  $ADB shell mkdir -p "${OV_TMPFS}${path}-upper"
-  $ADB shell mkdir -p "${OV_TMPFS}${path}-work"
-
-  opts="lowerdir=${path},upperdir=${OV_TMPFS}${path}-upper,workdir=${OV_TMPFS}${path}-work"
-  $ADB shell mount -t overlay -o "$opts" none ${path}
-done
-
-$ADB shell setenforce 0
-
-# 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" &
-
-INSTALL="/mesa-android/install"
-
-# replace libraries
-
-$ADB shell rm -f /vendor/lib64/libgallium_dri.so*
-$ADB shell rm -f /vendor/lib64/egl/libEGL_mesa.so*
-$ADB shell rm -f /vendor/lib64/egl/libGLESv1_CM_mesa.so*
-$ADB shell rm -f /vendor/lib64/egl/libGLESv2_mesa.so*
-
-$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 shell rm -f /vendor/lib64/hw/vulkan.lvp.so*
-$ADB shell rm -f /vendor/lib64/hw/vulkan.virtio.so*
-$ADB shell rm -f /vendor/lib64/hw/vulkan.intel.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 push "$INSTALL/lib/libvulkan_intel.so" /vendor/lib64/hw/vulkan.intel.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*
-
-ANGLE_DEST_PATH=/vendor/lib64/egl
-if [ "$ANDROID_VERSION" -ge 15 ]; then
-  ANGLE_DEST_PATH=/system/lib64
-fi
-
-$ADB shell rm -f "$ANGLE_DEST_PATH/libEGL_angle.so"*
-$ADB shell rm -f "$ANGLE_DEST_PATH/libGLESv1_CM_angle.so"*
-$ADB shell rm -f "$ANGLE_DEST_PATH/libGLESv2_angle.so"*
-
-$ADB push /angle/libEGL_angle.so "$ANGLE_DEST_PATH/libEGL_angle.so"
-$ADB push /angle/libGLESv1_CM_angle.so "$ANGLE_DEST_PATH/libGLESv1_CM_angle.so"
-$ADB push /angle/libGLESv2_angle.so "$ANGLE_DEST_PATH/libGLESv2_angle.so"
-
-get_gles_runtime_version() {
-  while [ "$($ADB shell dumpsys SurfaceFlinger | grep GLES:)" = "" ] ; do sleep 1; done
-  $ADB shell dumpsys SurfaceFlinger | grep GLES
-}
-
-# Check what GLES implementation is used before loading the new libraries
-get_gles_runtime_version
-
-# restart Android shell, so that services use the new libraries
-$ADB shell stop
-$ADB shell start
-
-# Check what GLES implementation is used after loading the new libraries
-GLES_RUNTIME_VERSION="$(get_gles_runtime_version)"
-
-if [ -n "$ANGLE_TAG" ]; then
-  # Note: we are injecting the ANGLE libs too, so we need to check if the
-  #       ANGLE libs are being used after the shell restart.
-  ANGLE_HASH=$(head -c 12 /angle/version)
-  if ! printf "%s" "$GLES_RUNTIME_VERSION" | grep --quiet "${ANGLE_HASH}"; then
-    echo "Fatal: Android is loading a wrong version of the ANGLE libs: ${ANGLE_HASH}" 1>&2
-    exit 1
-  fi
-else
-  MESA_BUILD_VERSION=$(cat "$INSTALL/VERSION")
-  if ! printf "%s" "$GLES_RUNTIME_VERSION" | grep --quiet "${MESA_BUILD_VERSION}$"; then
-     echo "Fatal: Android is loading a wrong version of the Mesa3D GLES libs: ${GLES_RUNTIME_VERSION}" 1>&2
-     exit 1
-  fi
-fi
-
-if [ -n "$USE_ANDROID_CTS" ]; then
-  # The script sets EXIT_CODE
-  . "$(dirname "$0")/android-cts-runner.sh"
-else
-  # The script sets EXIT_CODE
-  . "$(dirname "$0")/android-deqp-runner.sh"
-fi
-
-exit $EXIT_CODE
--- a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2
+++ b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2
@@ -2,154 +2,62 @@ version: 1

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

 timeouts:
-
  first_console_activity:  # This limits the time it can take to receive the first console log
-    minutes: {{ B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_MINUTES | default(0, true) }}
-    seconds: {{ B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_SECONDS | default(0, true) }}
-    retries: {{ B2C_TIMEOUT_FIRST_CONSOLE_ACTIVITY_RETRIES }}
-
+    minutes: {{ timeout_first_minutes }}
+    retries: {{ timeout_first_retries }}
  console_activity:        # Reset every time we receive a message from the logs
-    minutes: {{ B2C_TIMEOUT_CONSOLE_ACTIVITY_MINUTES | default(0, true) }}
-    seconds: {{ B2C_TIMEOUT_CONSOLE_ACTIVITY_SECONDS | default(0, true) }}
-    retries: {{ B2C_TIMEOUT_CONSOLE_ACTIVITY_RETRIES }}
-
+    minutes: {{ timeout_minutes }}
+    retries: {{ timeout_retries }}
  boot_cycle:
-    minutes: {{ B2C_TIMEOUT_BOOT_MINUTES | default(0, true) }}
-    seconds: {{ B2C_TIMEOUT_BOOT_SECONDS | default(0, true) }}
-    retries: {{ B2C_TIMEOUT_BOOT_RETRIES }}
-
+    minutes: {{ timeout_boot_minutes }}
+    retries: {{ timeout_boot_retries }}
  overall:                 # Maximum time the job can take, not overrideable by the "continue" deployment
-    minutes: {{ B2C_TIMEOUT_OVERALL_MINUTES | default(0, true) }}
-    seconds: {{ B2C_TIMEOUT_OVERALL_SECONDS | default(0, true) }}
+    minutes: {{ timeout_overall_minutes }}
    retries: 0
    # no retries possible here

-  watchdogs:
-    boot:
-      minutes: {{ B2C_TIMEOUT_BOOT_WD_MINUTES | default(0, true) }}
-      seconds: {{ B2C_TIMEOUT_BOOT_WD_SECONDS | default(0, true) }}
-      retries: {{ B2C_TIMEOUT_BOOT_WD_RETRIES | default(0, true) }}
-
 console_patterns:
    session_end:
        regex: >-
-          {{ B2C_SESSION_END_REGEX }}
-{% if B2C_SESSION_REBOOT_REGEX %}
+          {{ session_end_regex }}
+{% if session_reboot_regex %}
    session_reboot:
        regex: >-
-          {{ B2C_SESSION_REBOOT_REGEX }}
+          {{ session_reboot_regex }}
 {% endif %}
    job_success:
        regex: >-
-          {{ B2C_JOB_SUCCESS_REGEX }}
-{% if B2C_JOB_WARN_REGEX %}
+          {{ job_success_regex }}
    job_warn:
        regex: >-
-          {{ B2C_JOB_WARN_REGEX }}
-{% endif %}
-
-{% if B2C_BOOT_WD_START_REGEX and B2C_BOOT_WD_STOP_REGEX %}
-    watchdogs:
-        boot:
-            start:
-              regex: >-
-                {{ B2C_BOOT_WD_START_REGEX }}
-            reset:
-              regex: >-
-                {{ B2C_BOOT_WD_RESET_REGEX | default(B2C_BOOT_WD_START_REGEX, true) }}
-            stop:
-              regex: >-
-                {{ B2C_BOOT_WD_STOP_REGEX }}
-{% endif %}
+          {{ job_warn_regex }}

 # Environment to deploy
 deployment:
  # Initial boot
  start:
-    storage:
-{% if B2C_IMAGESTORE_PLATFORM %}
-        imagestore:
-          public:
-            # List of images that should be pulled into the image store ahead of execution
-            images:
-              mars:
-                name: "{{ B2C_MACHINE_REGISTRATION_IMAGE }}"
-                platform: "{{ B2C_IMAGESTORE_PLATFORM }}"
-                tls_verify: false
-                {% set machine_registration_image="{% raw %}{{ job.imagestore.public.mars.image_id }}{% endraw %}" %}
-              telegraf:
-                name: "{{ B2C_TELEGRAF_IMAGE }}"
-                platform: "{{ B2C_IMAGESTORE_PLATFORM }}"
-                tls_verify: false
-                {% set telegraf_image="{% raw %}{{ job.imagestore.public.telegraf.image_id }}{% endraw %}" %}
-              image_under_test:
-                name: "{{ B2C_IMAGE_UNDER_TEST }}"
-                platform: "{{ B2C_IMAGESTORE_PLATFORM }}"
-                tls_verify: false
-                {% set image_under_test="{% raw %}{{ job.imagestore.public.image_under_test.image_id }}{% endraw %}" %}
-        nbd:
-          storage:
-            max_connections: 5
-            size: 10G
-{% endif %}
-
-        http:
-          - path: "/install.tar.zst"
-            url: "{{ B2C_INSTALL_TARBALL_URL }}"
-          - path: "/b2c-extra-args"
-            data: >
-              b2c.pipefail b2c.poweroff_delay={{ B2C_POWEROFF_DELAY }}
-              b2c.minio="gateway,{{ '{{' }} minio_url }},{{ '{{' }} job_bucket_access_key }},{{ '{{' }} job_bucket_secret_key }}"
-              b2c.volume="{{ '{{' }} job_bucket }}-results,mirror=gateway/{{ '{{' }} job_bucket }},pull_on=pipeline_start,push_on=changes,overwrite{% for excl in B2C_JOB_VOLUME_EXCLUSIONS.split(',') %},exclude={{ excl }}{% endfor %},remove,expiration=pipeline_end,preserve"
-              {% for volume in B2C_VOLUMES %}
-              b2c.volume={{ volume }}
-              {% endfor %}
-              b2c.run_service="--privileged --tls-verify=false --pid=host {{ B2C_TELEGRAF_IMAGE }}" b2c.hostname=dut-{{ '{{' }} machine.full_name }}
-              b2c.run="-ti --tls-verify=false {{ B2C_MACHINE_REGISTRATION_IMAGE }} {% if B2C_MARS_SETUP_TAGS %}setup --tags {{ B2C_MARS_SETUP_TAGS }}{% else %}check{% endif %}"
-              b2c.run="-v {{ '{{' }} job_bucket }}-results:{{ CI_PROJECT_DIR }} -w {{ CI_PROJECT_DIR }} {% for mount_volume in B2C_MOUNT_VOLUMES %} -v {{ mount_volume }}{% endfor %} --tls-verify=false --entrypoint bash {{ B2C_IMAGE_UNDER_TEST }} -euc 'curl --fail -q {{ '{{' }} job.http.url }}/install.tar.zst | tar --zstd -x; {{ B2C_CONTAINER_CMD }}'"
    kernel:
-{% if B2C_KERNEL_URL %}
-      url: '{{ B2C_KERNEL_URL }}'
-{% endif %}
-
-      # NOTE: b2c.cache_device should not be here, but this works around
-      # a limitation of b2c which will be removed in the next release
+      url: '{{ kernel_url }}'
      cmdline: >
        SALAD.machine_id={{ '{{' }} machine_id }}
-        console={{ '{{' }} local_tty_device }},115200
-        b2c.ntp_peer=10.42.0.1
-        b2c.extra_args_url={{ '{{' }} job.http.url }}/b2c-extra-args
-        {% if B2C_IMAGESTORE_PLATFORM is defined %}
-        {{ '{{' }} imagestore.mount("public").nfs.to_b2c_filesystem("publicimgstore") }}
-        b2c.storage="additionalimagestores=publicimgstore"
-        b2c.nbd=/dev/nbd0,host=ci-gateway,port={% raw %}{{ '{{' }} job.nbd.storage.tcp_port }}{% endraw %},connections=5
-        b2c.cache_device=/dev/nbd0
-        {% else %}
-        b2c.cache_device=auto
-        {% endif %}
-        {% if B2C_KERNEL_CMDLINE_EXTRAS is defined %}
-        {{ B2C_KERNEL_CMDLINE_EXTRAS }}
+        console={{ '{{' }} local_tty_device }},115200 earlyprintk=vga,keep
+        loglevel={{ log_level }} no_hash_pointers
+        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="-ti --tls-verify=false docker://{{ '{{' }} fdo_proxy_registry }}/gfx-ci/ci-tron/machine-registration:latest check"
+        b2c.ntp_peer=10.42.0.1 b2c.pipefail b2c.cache_device=auto b2c.poweroff_delay={{ poweroff_delay }}
+        b2c.minio="gateway,{{ '{{' }} minio_url }},{{ '{{' }} job_bucket_access_key }},{{ '{{' }} job_bucket_secret_key }}"
+        b2c.volume="{{ '{{' }} job_bucket }}-results,mirror=gateway/{{ '{{' }} job_bucket }},pull_on=pipeline_start,push_on=changes,overwrite{% for excl in job_volume_exclusions %},exclude={{ excl }}{% endfor %},remove,expiration=pipeline_end,preserve"
+{% for volume in volumes %}
+        b2c.volume={{ volume }}
+{% endfor %}
+        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 }}"
+        {% if kernel_cmdline_extras is defined %}
+        {{ kernel_cmdline_extras }}
        {% endif %}

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

-{% if B2C_DTB_URL %}
-    dtb:
-      url: '{{ B2C_DTB_URL }}'
-{% if B2C_DTB_MATCH %}
-      format:
-        archive:
-          match: "{{ B2C_DTB_MATCH }}"
-{% endif %}
-{% endif %}
--- a/.gitlab-ci/b2c/generate_b2c.py
+++ b/.gitlab-ci/b2c/generate_b2c.py
@@ -25,16 +25,31 @@ from jinja2 import Environment, FileSystemLoader
 from os import environ, path


-# Pass through all the CI and B2C environment variables
+# Pass all the environment variables prefixed by B2C_
 values = {
-    key: environ[key]
-    for key in environ if key.startswith("B2C_") or key.startswith("CI_")
+    key.removeprefix("B2C_").lower(): environ[key]
+    for key in environ if key.startswith("B2C_")
 }

-env = Environment(loader=FileSystemLoader(path.dirname(environ['B2C_JOB_TEMPLATE'])),
+env = Environment(loader=FileSystemLoader(path.dirname(values['job_template'])),
                  trim_blocks=True, lstrip_blocks=True)

-template = env.get_template(path.basename(environ['B2C_JOB_TEMPLATE']))
+template = env.get_template(path.basename(values['job_template']))

-with open(path.splitext(path.basename(environ['B2C_JOB_TEMPLATE']))[0], "w") as f:
+values['ci_job_id'] = environ['CI_JOB_ID']
+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']
+
+# Use the gateway's pull-through registry caches to reduce load on fd.o.
+values['local_container'] = environ['IMAGE_UNDER_TEST']
+values['local_container'] = values['local_container'].replace(
+    'registry.freedesktop.org',
+    '{{ fdo_proxy_registry }}'
+)
+
+if 'kernel_cmdline_extras' not in values:
+    values['kernel_cmdline_extras'] = ''
+
+with open(path.splitext(path.basename(values['job_template']))[0], "w") as f:
    f.write(template.render(values))
--- a/.gitlab-ci/bare-metal/bm-init.sh
+++ b/.gitlab-ci/bare-metal/bm-init.sh
@@ -5,8 +5,6 @@
 # First stage: very basic setup to bring up network and /dev etc
 /init-stage1.sh

-export CURRENT_SECTION=dut_boot
-
 # Second stage: run jobs
 test $? -eq 0 && /init-stage2.sh

--- a/.gitlab-ci/bare-metal/cros-servo.sh
+++ b/.gitlab-ci/bare-metal/cros-servo.sh
@@ -50,10 +50,6 @@ if [ -z "$BM_CMDLINE" ]; then
  exit 1
 fi

-. "${SCRIPTS_DIR}/setup-test-env.sh"
-
-section_start prepare_rootfs "Preparing rootfs components"
-
 set -ex

 # Clear out any previous run's artifacts.
@@ -90,7 +86,7 @@ rm -rf /tftp/*
 if echo "$BM_KERNEL" | grep -q http; then
  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
      $BM_KERNEL -o /tftp/vmlinuz
-elif [ -n "${EXTERNAL_KERNEL_TAG}" ]; then
+elif [ -n "${FORCE_KERNEL_TAG}" ]; then
  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
    "${FDO_HTTP_CACHE_URI:-}${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${BM_KERNEL}" -o /tftp/vmlinuz
  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
@@ -103,20 +99,16 @@ fi
 echo "$BM_CMDLINE" > /tftp/cmdline

 set +e
-STRUCTURED_LOG_FILE=results/job_detail.json
+STRUCTURED_LOG_FILE=job_detail.json
 python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update dut_job_type "${DEVICE_TYPE}"
 python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update farm "${FARM}"
 python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --create-dut-job dut_name "${CI_RUNNER_DESCRIPTION}"
 python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update-dut-time submit "${CI_JOB_STARTED_AT}"
-section_end prepare_rootfs
-
 python3 $BM/cros_servo_run.py \
        --cpu $BM_SERIAL \
        --ec $BM_SERIAL_EC \
-        --test-timeout ${TEST_PHASE_TIMEOUT_MINUTES:-20}
+        --test-timeout ${TEST_PHASE_TIMEOUT:-20}
 ret=$?
-
-section_start dut_cleanup "Cleaning up after job"
 python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --close-dut-job
 python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --close
 set -e
@@ -124,6 +116,9 @@ set -e
 # Bring artifacts back from the NFS dir to the build dir where gitlab-runner
 # will look for them.
 cp -Rp /nfs/results/. results/
-section_end dut_cleanup
+if [ -f "${STRUCTURED_LOG_FILE}" ]; then
+  cp -p ${STRUCTURED_LOG_FILE} results/
+  echo "Structured log file is available at https://${CI_PROJECT_ROOT_NAMESPACE}.pages.freedesktop.org/-/${CI_PROJECT_NAME}/-/jobs/${CI_JOB_ID}/artifacts/results/${STRUCTURED_LOG_FILE}"
+fi

 exit $ret
--- a/.gitlab-ci/bare-metal/cros_servo_run.py
+++ b/.gitlab-ci/bare-metal/cros_servo_run.py
@@ -4,29 +4,21 @@
 # SPDX-License-Identifier: MIT

 import argparse
-import datetime
-import math
-import os
 import re
 import sys

 from custom_logger import CustomLogger
 from serial_buffer import SerialBuffer

-ANSI_ESCAPE="\x1b[0K"
-ANSI_COLOUR="\x1b[0;36m"
-ANSI_RESET="\x1b[0m"
-SECTION_START="start"
-SECTION_END="end"

 class CrosServoRun:
    def __init__(self, cpu, ec, test_timeout, logger):
        self.cpu_ser = SerialBuffer(
-            cpu, "results/serial.txt", ": ")
+            cpu, "results/serial.txt", "R SERIAL-CPU> ")
        # Merge the EC serial into the cpu_ser's line stream so that we can
        # effectively poll on both at the same time and not have to worry about
        self.ec_ser = SerialBuffer(
-            ec, "results/serial-ec.txt", " EC: ", line_queue=self.cpu_ser.line_queue)
+            ec, "results/serial-ec.txt", "R SERIAL-EC> ", line_queue=self.cpu_ser.line_queue)
        self.test_timeout = test_timeout
        self.logger = logger

@@ -35,11 +27,11 @@ class CrosServoRun:
        self.cpu_ser.close()

    def ec_write(self, s):
-        print("EC> %s" % s)
+        print("W SERIAL-EC> %s" % s)
        self.ec_ser.serial.write(s.encode())

    def cpu_write(self, s):
-        print("> %s" % s)
+        print("W SERIAL-CPU> %s" % s)
        self.cpu_ser.serial.write(s.encode())

    def print_error(self, message):
@@ -48,31 +40,6 @@ class CrosServoRun:
        print(RED + message + NO_COLOR)
        self.logger.update_status_fail(message)

-    def get_rel_timestamp(self):
-        now = datetime.datetime.now(tz=datetime.UTC)
-        then_env = os.getenv("CI_JOB_STARTED_AT")
-        if not then_env:
-            return ""
-        delta = now - datetime.datetime.fromisoformat(then_env)
-        return f"[{math.floor(delta.seconds / 60):02}:{(delta.seconds % 60):02}]"
-
-    def get_cur_timestamp(self):
-        return str(int(datetime.datetime.timestamp(datetime.datetime.now())))
-
-    def print_gitlab_section(self, action, name, description, collapse=True):
-        assert action in [SECTION_START, SECTION_END]
-        out = ANSI_ESCAPE + "section_" + action + ":"
-        out += self.get_cur_timestamp() + ":"
-        out += name
-        if action == "start" and collapse:
-            out += "[collapsed=true]"
-        out += "\r" + ANSI_ESCAPE + ANSI_COLOUR
-        out += self.get_rel_timestamp() + " " + description + ANSI_RESET
-        print(out)
-
-    def boot_section(self, action):
-        self.print_gitlab_section(action, "dut_boot", "Booting hardware device", True)
-
    def run(self):
        # Flush any partial commands in the EC's prompt, then ask for a reboot.
        self.ec_write("\n")
@@ -80,7 +47,6 @@ class CrosServoRun:

        bootloader_done = False
        self.logger.create_job_phase("boot")
-        self.boot_section(SECTION_START)
        tftp_failures = 0
        # This is emitted right when the bootloader pauses to check for input.
        # Emit a ^N character to request network boot, because we don't have a
@@ -161,18 +127,14 @@ class CrosServoRun:
                self.print_error("Detected cheza MMU fail, abandoning run.")
                return 1

-            result = re.search(r"hwci: mesa: (\S*), exit_code: (\d+)", line)
+            result = re.search("hwci: mesa: (\S*)", line)
            if result:
-                status = result.group(1)
-                exit_code = int(result.group(2))
-
-                if status == "pass":
+                if result.group(1) == "pass":
                    self.logger.update_dut_job("status", "pass")
+                    return 0
                else:
                    self.logger.update_status_fail("test fail")
-
-                self.logger.update_dut_job("exit_code", exit_code)
-                return exit_code
+                    return 1

        self.print_error(
            "Reached the end of the CPU serial log without finding a result")
@@ -189,7 +151,7 @@ def main():
        '--test-timeout', type=int, help='Test phase timeout (minutes)', required=True)
    args = parser.parse_args()

-    logger = CustomLogger("results/job_detail.json")
+    logger = CustomLogger("job_detail.json")
    logger.update_dut_time("start", None)
    servo = CrosServoRun(args.cpu, args.ec, args.test_timeout * 60, logger)
    retval = servo.run()
--- a/.gitlab-ci/bare-metal/fastboot.sh
+++ b/.gitlab-ci/bare-metal/fastboot.sh
@@ -55,8 +55,6 @@ if echo $BM_CMDLINE | grep -q "root=/dev/nfs"; then
  BM_FASTBOOT_NFSROOT=1
 fi

-section_start prepare_rootfs "Preparing rootfs components"
-
 set -ex

 # Clear out any previous run's artifacts.
@@ -82,7 +80,11 @@ else
  # Finally, pack it up into a cpio rootfs.  Skip the vulkan CTS since none of
  # these devices use it and it would take up space in the initrd.

-  EXCLUDE_FILTER="deqp|arb_gpu_shader5|arb_gpu_shader_fp64|arb_gpu_shader_int64|glsl-4.[0123456]0|arb_tessellation_shader"
+  if [ -n "$PIGLIT_PROFILES" ]; then
+    EXCLUDE_FILTER="deqp|arb_gpu_shader5|arb_gpu_shader_fp64|arb_gpu_shader_int64|glsl-4.[0123456]0|arb_tessellation_shader"
+  else
+    EXCLUDE_FILTER="piglit|python"
+  fi

  pushd rootfs
  find -H . | \
@@ -103,7 +105,7 @@ if echo "$BM_KERNEL $BM_DTB" | grep -q http; then

  cat kernel dtb > Image.gz-dtb

-elif [ -n "${EXTERNAL_KERNEL_TAG}" ]; then
+elif [ -n "${FORCE_KERNEL_TAG}" ]; then
  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
      "${FDO_HTTP_CACHE_URI:-}${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${BM_KERNEL}" -o kernel
  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
@@ -146,12 +148,10 @@ if [ -n "$BM_SERIAL_SCRIPT" ]; then
  done
 fi

-section_end prepare_rootfs
-
 set +e
 $BM/fastboot_run.py \
  --dev="$BM_SERIAL" \
-  --test-timeout ${TEST_PHASE_TIMEOUT_MINUTES:-20} \
+  --test-timeout ${TEST_PHASE_TIMEOUT:-20} \
  --fbserial="$BM_FASTBOOT_SERIAL" \
  --powerup="$BM_POWERUP" \
  --powerdown="$BM_POWERDOWN"
--- a/.gitlab-ci/bare-metal/fastboot_run.py
+++ b/.gitlab-ci/bare-metal/fastboot_run.py
@@ -119,12 +119,12 @@ class FastbootRun:
                if print_more_lines == -1:
                    print_more_lines = 30

-            result = re.search(r"hwci: mesa: (\S*), exit_code: (\d+)", line)
+            result = re.search("hwci: mesa: (\S*)", line)
            if result:
-                status = result.group(1)
-                exit_code = int(result.group(2))
-
-                return exit_code
+                if result.group(1) == "pass":
+                    return 0
+                else:
+                    return 1

        self.print_error(
            "Reached the end of the CPU serial log without finding a result, abandoning run.")
--- a/.gitlab-ci/bare-metal/poe-off
+++ b/.gitlab-ci/bare-metal/poe-off
@@ -10,7 +10,7 @@ if [ -z "$BM_POE_ADDRESS" ]; then
    exit 1
 fi

-SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.$((${BM_POE_BASE:-0} + BM_POE_INTERFACE))"
+SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.$((48 + BM_POE_INTERFACE))"
 SNMP_OFF="i 2"

 flock /var/run/poe.lock -c "snmpset -v2c -r 3 -t 30 -cmesaci $BM_POE_ADDRESS $SNMP_KEY $SNMP_OFF"
--- a/.gitlab-ci/bare-metal/poe-on
+++ b/.gitlab-ci/bare-metal/poe-on
@@ -10,7 +10,7 @@ if [ -z "$BM_POE_ADDRESS" ]; then
    exit 1
 fi

-SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.$((${BM_POE_BASE:-0} + BM_POE_INTERFACE))"
+SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.$((48 + BM_POE_INTERFACE))"
 SNMP_ON="i 1"
 SNMP_OFF="i 2"

--- a/.gitlab-ci/bare-metal/poe-powered.sh
+++ b/.gitlab-ci/bare-metal/poe-powered.sh
@@ -71,8 +71,6 @@ if [ -z "$BM_CMDLINE" ]; then
  exit 1
 fi

-section_start prepare_rootfs "Preparing rootfs components"
-
 set -ex

 date +'%F %T'
@@ -104,7 +102,7 @@ if [ -f "${BM_BOOTFS}" ]; then
 fi

 # If BM_KERNEL and BM_DTS is present
-if [ -n "${EXTERNAL_KERNEL_TAG}" ]; then
+if [ -n "${FORCE_KERNEL_TAG}" ]; then
  if [ -z "${BM_KERNEL}" ] || [ -z "${BM_DTB}" ]; then
    echo "This machine cannot be tested with external kernel since BM_KERNEL or BM_DTB missing!"
    exit 1
@@ -122,7 +120,7 @@ date +'%F %T'

 # Install kernel modules (it could be either in /lib/modules or
 # /usr/lib/modules, but we want to install in the latter)
-if [ -n "${EXTERNAL_KERNEL_TAG}" ]; then
+if [ -n "${FORCE_KERNEL_TAG}" ]; then
  tar --keep-directory-symlink --zstd -xf modules.tar.zst -C /nfs/
  rm modules.tar.zst &
 elif [ -n "${BM_BOOTFS}" ]; then
@@ -136,7 +134,7 @@ fi
 date +'%F %T'

 # Install kernel image + bootloader files
-if [ -n "${EXTERNAL_KERNEL_TAG}" ] || [ -z "$BM_BOOTFS" ]; then
+if [ -n "${FORCE_KERNEL_TAG}" ] || [ -z "$BM_BOOTFS" ]; then
  mv "${BM_KERNEL}" "${BM_DTB}.dtb" /tftp/
 else  # BM_BOOTFS
  rsync -aL --delete $BM_BOOTFS/boot/ /tftp/
@@ -183,16 +181,13 @@ if [ -n "$BM_BOOTCONFIG" ]; then
  printf "$BM_BOOTCONFIG" >> /tftp/config.txt
 fi

-section_end prepare_rootfs
-
 set +e
-STRUCTURED_LOG_FILE=results/job_detail.json
+STRUCTURED_LOG_FILE=job_detail.json
 python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update dut_job_type "${DEVICE_TYPE}"
 python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update farm "${FARM}"
 ATTEMPTS=3
 first_attempt=True
 while [ $((ATTEMPTS--)) -gt 0 ]; do
-  section_start dut_boot "Booting hardware device ..."
  python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --create-dut-job dut_name "${CI_RUNNER_DESCRIPTION}"
  # Update subtime time to CI_JOB_STARTED_AT only for the first run
  if [ "$first_attempt" = "True" ]; then
@@ -204,22 +199,17 @@ while [ $((ATTEMPTS--)) -gt 0 ]; do
          --dev="$BM_SERIAL" \
          --powerup="$BM_POWERUP" \
          --powerdown="$BM_POWERDOWN" \
-          --boot-timeout-seconds ${BOOT_PHASE_TIMEOUT_SECONDS:-300} \
-          --test-timeout-minutes ${TEST_PHASE_TIMEOUT_MINUTES:-$((CI_JOB_TIMEOUT/60 - ${TEST_SETUP_AND_UPLOAD_MARGIN_MINUTES:-5}))}
+          --test-timeout ${TEST_PHASE_TIMEOUT:-20}
  ret=$?

  if [ $ret -eq 2 ]; then
+    echo "Did not detect boot sequence, retrying..."
    python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --close-dut-job
    first_attempt=False
-    error "Device failed to boot; will retry"
  else
-    # We're no longer in dut_boot by this point
-    unset CURRENT_SECTION
    ATTEMPTS=0
  fi
 done
-
-section_start dut_cleanup "Cleaning up after job"
 python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --close-dut-job
 python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --close
 set -e
@@ -229,8 +219,11 @@ date +'%F %T'
 # Bring artifacts back from the NFS dir to the build dir where gitlab-runner
 # will look for them.
 cp -Rp /nfs/results/. results/
+if [ -f "${STRUCTURED_LOG_FILE}" ]; then
+  cp -p ${STRUCTURED_LOG_FILE} results/
+  echo "Structured log file is available at ${ARTIFACTS_BASE_URL}/results/${STRUCTURED_LOG_FILE}"
+fi

 date +'%F %T'
-section_end dut_cleanup

 exit $ret
--- a/.gitlab-ci/bare-metal/poe_run.py
+++ b/.gitlab-ci/bare-metal/poe_run.py
@@ -31,12 +31,11 @@ from custom_logger import CustomLogger
 from serial_buffer import SerialBuffer

 class PoERun:
-    def __init__(self, args, boot_timeout, test_timeout, logger):
+    def __init__(self, args, test_timeout, logger):
        self.powerup = args.powerup
        self.powerdown = args.powerdown
        self.ser = SerialBuffer(
-            args.dev, "results/serial-output.txt", ": ")
-        self.boot_timeout = boot_timeout
+            args.dev, "results/serial-output.txt", "")
        self.test_timeout = test_timeout
        self.logger = logger

@@ -57,7 +56,7 @@ class PoERun:

        boot_detected = False
        self.logger.create_job_phase("boot")
-        for line in self.ser.lines(timeout=self.boot_timeout, phase="bootloader"):
+        for line in self.ser.lines(timeout=5 * 60, phase="bootloader"):
            if re.search("Booting Linux", line):
                boot_detected = True
                break
@@ -65,7 +64,7 @@ class PoERun:
        if not boot_detected:
            self.print_error(
                "Something wrong; couldn't detect the boot start up sequence")
-            return 2
+            return 1

        self.logger.create_job_phase("test")
        for line in self.ser.lines(timeout=self.test_timeout, phase="test"):
@@ -87,18 +86,14 @@ class PoERun:
                self.print_error("nouveau jetson tk1 network fail, abandoning run.")
                return 1

-            result = re.search(r"hwci: mesa: (\S*), exit_code: (\d+)", line)
+            result = re.search("hwci: mesa: (\S*)", line)
            if result:
-                status = result.group(1)
-                exit_code = int(result.group(2))
-
-                if status == "pass":
+                if result.group(1) == "pass":
                    self.logger.update_dut_job("status", "pass")
+                    return 0
                else:
                    self.logger.update_status_fail("test fail")
-
-                self.logger.update_dut_job("exit_code", exit_code)
-                return exit_code
+                    return 1

        self.print_error(
            "Reached the end of the CPU serial log without finding a result")
@@ -114,14 +109,12 @@ def main():
    parser.add_argument('--powerdown', type=str,
                        help='shell command for powering off', required=True)
    parser.add_argument(
-        '--boot-timeout-seconds', type=int, help='Boot phase timeout (seconds)', required=True)
-    parser.add_argument(
-        '--test-timeout-minutes', type=int, help='Test phase timeout (minutes)', required=True)
+        '--test-timeout', type=int, help='Test phase timeout (minutes)', required=True)
    args = parser.parse_args()

-    logger = CustomLogger("results/job_detail.json")
+    logger = CustomLogger("job_detail.json")
    logger.update_dut_time("start", None)
-    poe = PoERun(args, args.boot_timeout_seconds, args.test_timeout_minutes * 60, logger)
+    poe = PoERun(args, args.test_timeout * 60, logger)
    retval = poe.run()

    poe.logged_system(args.powerdown)
--- a/.gitlab-ci/bare-metal/rootfs-setup.sh
+++ b/.gitlab-ci/bare-metal/rootfs-setup.sh
@@ -13,17 +13,20 @@ date +'%F %T'

 # Make JWT token available as file in the bare-metal storage to enable access
 # to MinIO
-cp "${S3_JWT_FILE}" "${rootfs_dst}${S3_JWT_FILE}"
+cp "${CI_JOB_JWT_FILE}" "${rootfs_dst}${CI_JOB_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

 # Pass through relevant env vars from the gitlab job to the baremetal init script
 echo "Variables passed through:"
-"$CI_COMMON"/export-gitlab-job-env-for-dut.sh | tee $rootfs_dst/set-job-env-vars.sh
+"$CI_COMMON"/generate-env.sh | tee $rootfs_dst/set-job-env-vars.sh

 set -x

--- a/.gitlab-ci/bare-metal/serial_buffer.py
+++ b/.gitlab-ci/bare-metal/serial_buffer.py
@@ -22,7 +22,7 @@
 # IN THE SOFTWARE.

 import argparse
-from datetime import datetime, UTC
+from datetime import datetime, timezone
 import queue
 import serial
 import threading
@@ -130,10 +130,9 @@ class SerialBuffer:
                if b == b'\n'[0]:
                    line = line.decode(errors="replace")

-                    ts = datetime.now(tz=UTC)
-                    ts_str = f"{ts.hour:02}:{ts.minute:02}:{ts.second:02}.{int(ts.microsecond / 1000):03}"
-                    print("{endc}{time}{prefix}{line}".format(
-                        time=ts_str, prefix=self.prefix, line=line, endc='\033[0m'), flush=True, end='')
+                    time = datetime.now().strftime('%y-%m-%d %H:%M:%S')
+                    print("{endc}{time} {prefix}{line}".format(
+                        time=time, prefix=self.prefix, line=line, endc='\033[0m'), flush=True, end='')

                    self.line_queue.put(line)
                    line = bytearray()
--- 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
@@ -3,35 +3,23 @@
  extends: .container+build-rules
  # Cancel job if a newer commit is pushed to the same branch
  interruptible: true
-  variables:
-    # Build jobs are typically taking between 5-12 minutes, depending on how
-    # much they build and how many new Rust compilers we have to build twice.
-    # Allow 25 minutes as a reasonable margin: beyond this point, something
-    # has gone badly wrong, and we should try again to see if we can get
-    # something from it.
-    #
-    # Some jobs not in the critical path use a higher timeout, particularly
-    # when building with ASan or UBSan.
-    BUILD_JOB_TIMEOUT: 12m
-    RUN_MESON_TESTS: "true"
-  timeout: 16m
-  # We don't want to download any previous job's artifacts
-  dependencies: []
+  # Build jobs don't take more than 1-3 minutes. 5-8 min max on a fresh runner
+  # without a populated ccache.
+  # These jobs are never slow, either they finish within reasonable time or
+  # something has gone wrong and the job will never terminate, so we should
+  # instead timeout so that the retry mechanism can kick in.
+  # A few exception are made, see `timeout:` overrides in the rest of this
+  # file.
+  timeout: 30m
  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
+      - shader-db
      - artifacts

-.build-run-long:
-  variables:
-    BUILD_JOB_TIMEOUT: 18m
-  timeout: 25m
-
-
 # Just Linux
 .build-linux:
  extends: .build-common
@@ -63,51 +51,45 @@
    paths:
      - subprojects/packagecache

-.meson-build-for-tests:
+.meson-build:
  extends:
    - .build-linux
-  stage: build-for-tests
+    - .use-debian/x86_64_build
+  stage: build-x86_64
+  variables:
+    LLVM_VERSION: 15
  script:
-    - &meson-build timeout --verbose ${BUILD_JOB_TIMEOUT_OVERRIDE:-$BUILD_JOB_TIMEOUT} bash --login .gitlab-ci/meson/build.sh
-    - .gitlab-ci/prepare-artifacts.sh
-
-.meson-build-only:
-  extends:
-    - .meson-build-for-tests
-    - .build-only-delayed-rules
-  stage: build-only
-  script:
-    - *meson-build
-
+    - .gitlab-ci/meson/build.sh

 debian-testing:
  extends:
-    - .meson-build-for-tests
-    - .use-debian/x86_64_build
-    - .build-run-long # but it really shouldn't! tracked in mesa#12544
+    - .meson-build
    - .ci-deqp-artifacts
  variables:
    UNWIND: "enabled"
    DRI_LOADERS: >
-      -D egl=enabled
-      -D gbm=enabled
-      -D glvnd=disabled
      -D glx=dri
+      -D gbm=enabled
+      -D egl=enabled
      -D platforms=x11,wayland
    GALLIUM_ST: >
-      -D gallium-nine=false
-      -D gallium-rusticl=true
+      -D dri3=enabled
+      -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: "swrast,virgl,radeonsi,zink,crocus,iris,i915,r300"
+    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:
+    - .gitlab-ci/meson/build.sh
+    - .gitlab-ci/prepare-artifacts.sh
  artifacts:
    reports:
      junit: artifacts/ci_scripts_report.xml
@@ -115,65 +97,51 @@ debian-testing:
 debian-testing-asan:
  extends:
    - debian-testing
-    - .meson-build-for-tests
-    - .build-run-long
  variables:
-    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
  # msan cannot fully work until it's used together with msan libc
  extends:
    - debian-clang
-    - .meson-build-only
-    - .build-run-long
  variables:
    # l_undef is incompatible with msan
    EXTRA_OPTION:
      -D b_sanitize=memory
      -D b_lundef=false
-      -D mesa-clc=system
-      -D precomp-compiler=system
+      -D intel-clc=system
    S3_ARTIFACT_NAME: ""
    ARTIFACTS_DEBUG_SYMBOLS: 1
    # Don't run all the tests yet:
    # GLSL has some issues in sexpression reading.
    # gtest has issues in its test initialization.
    MESON_TEST_ARGS: "--suite glcpp --suite format"
-    GALLIUM_DRIVERS: "freedreno,iris,nouveau,r300,r600,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus"
+    GALLIUM_DRIVERS: "freedreno,iris,nouveau,kmsro,r300,r600,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus"
    VULKAN_DRIVERS: intel,amd,broadcom,virtio
-    RUN_MESON_TESTS: "false" # just too slow
-    # Do a host build for mesa-clc and precomp-compiler (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
@@ -183,82 +151,54 @@ debian-testing-msan:
      -D video-codecs=
      -D glx=disabled
      -D platforms=
-      -D mesa-clc=enabled
-      -D install-mesa-clc=true
-      -D precomp-compiler=enabled
-      -D install-precomp-compiler=true
-      -D tools=panfrost
-
-debian-testing-ubsan:
-  extends:
-    - debian-testing
-    - .meson-build-for-tests
-    - .build-run-long
-  variables:
-    C_ARGS: >
-      -Wno-error=stringop-overflow
-      -Wno-error=stringop-truncation
-    CPP_ARGS: >
-      -Wno-error=array-bounds
-    GALLIUM_DRIVERS: "llvmpipe,softpipe"
-    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-for-tests
-    - .use-debian/x86_64_build
+  extends: .meson-build
  variables:
+    BUILDTYPE: debug
    UNWIND: "enabled"
    DRI_LOADERS: >
      -D glx=dri
      -D gbm=enabled
      -D egl=enabled
-      -D glvnd=disabled
      -D platforms=x11,wayland
-      -D legacy-x11=dri2
    GALLIUM_ST: >
+      -D dri3=enabled
      -D gallium-extra-hud=true
      -D gallium-vdpau=enabled
+      -D gallium-omx=bellagio
      -D gallium-va=enabled
      -D gallium-xa=enabled
      -D gallium-nine=true
      -D gallium-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,kmsro,r300,r600,freedreno,swrast,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
-    S3_ARTIFACT_NAME: debian-build-testing
+      -D b_lto=true
+    LLVM_VERSION: 15
+  script: |
+    section_start lava-pytest "lava-pytest"
+    .gitlab-ci/lava/lava-pytest.sh
+    section_switch shellcheck "shellcheck"
+    .gitlab-ci/run-shellcheck.sh
+    section_switch yamllint "yamllint"
+    .gitlab-ci/run-yamllint.sh
+    section_switch meson "meson"
+    .gitlab-ci/meson/build.sh
+    section_switch shader-db "shader-db"
+    .gitlab-ci/run-shader-db.sh
+  timeout: 30m

 # Test a release build with -Werror so new warnings don't sneak in.
 debian-release:
-  extends:
-    - .meson-build-only
-    - .use-debian/x86_64_build
+  extends: .meson-build
  variables:
+    LLVM_VERSION: 15
    UNWIND: "enabled"
    C_ARGS: >
      -Wno-error=stringop-overread
@@ -266,53 +206,56 @@ debian-release:
      -D glx=dri
      -D gbm=enabled
      -D egl=enabled
-      -D glvnd=disabled
      -D platforms=x11,wayland
    GALLIUM_ST: >
+      -D dri3=enabled
      -D gallium-extra-hud=true
      -D gallium-vdpau=enabled
+      -D gallium-omx=disabled
      -D gallium-va=enabled
      -D gallium-xa=enabled
      -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,kmsro,freedreno,r300,svga,swrast,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 precomp-compiler=enabled
+      -D intel-clc=enabled
      -D intel-rt=enabled
      -D imagination-srv=true
    BUILDTYPE: "release"
    S3_ARTIFACT_NAME: "mesa-x86_64-default-${BUILDTYPE}"
  script:
-    - *meson-build
+    - .gitlab-ci/meson/build.sh
    - 'if [ -n "$MESA_CI_PERFORMANCE_ENABLED" ]; then .gitlab-ci/prepare-artifacts.sh; fi'

 alpine-build-testing:
  extends:
-    - .meson-build-only
+    - .meson-build
    - .use-alpine/x86_64_build
+  stage: build-x86_64
  variables:
    BUILDTYPE: "release"
    C_ARGS: >
      -Wno-error=cpp
      -Wno-error=array-bounds
-      -Wno-error=stringop-overflow
      -Wno-error=stringop-overread
-      -Wno-error=misleading-indentation
    DRI_LOADERS: >
      -D glx=disabled
      -D gbm=enabled
      -D egl=enabled
-      -D glvnd=disabled
+      -D glvnd=false
      -D platforms=wayland
-    GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,iris,lima,nouveau,panfrost,r300,r600,radeonsi,svga,llvmpipe,softpipe,tegra,v3d,vc4,virgl,zink"
+    LLVM_VERSION: "16"
+    GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,iris,kmsro,lima,nouveau,panfrost,r300,r600,radeonsi,svga,swrast,tegra,v3d,vc4,virgl,zink"
    GALLIUM_ST: >
+      -D dri3=enabled
      -D gallium-extra-hud=true
      -D gallium-vdpau=disabled
+      -D gallium-omx=disabled
      -D gallium-va=enabled
      -D gallium-xa=disabled
      -D gallium-nine=true
@@ -320,7 +263,6 @@ alpine-build-testing:
      -D gles1=disabled
      -D gles2=enabled
      -D llvm=enabled
-      -D llvm-orcjit=true
      -D microsoft-clc=disabled
      -D shared-llvm=enabled
    UNWIND: "disabled"
@@ -328,41 +270,40 @@ alpine-build-testing:

 fedora-release:
  extends:
-    - .meson-build-only
+    - .meson-build
    - .use-fedora/x86_64_build
-    - .build-run-long
-  # LTO builds can be really very slow, and we have no way to specify different
-  # timeouts for pre-merge and nightly jobs
-  timeout: 1h
  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.
-    C_ARGS: >
+    C_LINK_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
+    CPP_LINK_ARGS: >
+      -Wno-error=stringop-overflow
+      -Wno-error=stringop-overread
    DRI_LOADERS: >
      -D glx=dri
      -D gbm=enabled
      -D egl=enabled
-      -D glvnd=enabled
+      -D glvnd=true
      -D platforms=x11,wayland
    EXTRA_OPTION: >
+      -D b_lto=true
+      -D osmesa=true
+      -D selinux=true
      -D tools=drm-shim,etnaviv,freedreno,glsl,intel,nir,nouveau,lima,panfrost,imagination
      -D vulkan-layers=device-select,overlay
      -D intel-rt=enabled
      -D imagination-srv=true
      -D teflon=true
-    GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,i915,iris,lima,nouveau,panfrost,r300,r600,radeonsi,svga,llvmpipe,softpipe,tegra,v3d,vc4,virgl,zink"
+    GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,i915,iris,kmsro,lima,nouveau,panfrost,r300,r600,radeonsi,svga,swrast,tegra,v3d,vc4,virgl,zink"
    GALLIUM_ST: >
+      -D dri3=enabled
      -D gallium-extra-hud=true
      -D gallium-vdpau=enabled
+      -D gallium-omx=disabled
      -D gallium-va=enabled
      -D gallium-xa=enabled
      -D gallium-nine=false
@@ -372,16 +313,15 @@ 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"
+    VULKAN_DRIVERS: "amd,broadcom,freedreno,imagination-experimental,intel,intel_hasvk"

 debian-android:
  extends:
-    - .android-variables
    - .meson-cross
    - .use-debian/android_build
    - .ci-deqp-artifacts
-    - .meson-build-for-tests
  variables:
    BUILDTYPE: debug
    UNWIND: "disabled"
@@ -400,23 +340,23 @@ debian-android:
      -D glx=disabled
      -D gbm=disabled
      -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 precomp-compiler=system
+      -D intel-clc=system
    GALLIUM_ST: >
+      -D dri3=disabled
      -D gallium-vdpau=disabled
+      -D gallium-omx=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
@@ -427,37 +367,24 @@ debian-android:
      -D video-codecs=
      -D glx=disabled
      -D platforms=
-      -D mesa-clc=enabled
-      -D install-mesa-clc=true
-      -D precomp-compiler=enabled
-      -D install-precomp-compiler=true
-      -D tools=panfrost
+      -D intel-clc=enabled
+      -D install-intel-clc=true
+    ARTIFACTS_DEBUG_SYMBOLS: 1
    S3_ARTIFACT_NAME: mesa-x86_64-android-${BUILDTYPE}
  script:
+    - CROSS=aarch64-linux-android GALLIUM_DRIVERS=etnaviv,freedreno,lima,panfrost,vc4,v3d VULKAN_DRIVERS=freedreno,broadcom,virtio .gitlab-ci/meson/build.sh
    # x86_64 build:
-    # Can't do AMD drivers because they require LLVM, which is currently
-    # problematic in our Android builds.
-    - export CROSS=x86_64-linux-android
-    - export GALLIUM_DRIVERS=iris,virgl,zink,softpipe
-    - export VULKAN_DRIVERS=intel,virtio,swrast
-    - .gitlab-ci/create-llvm-meson-wrap-file.sh
-    - *meson-build
+    # Can't do Intel because gen_decoder.c currently requires libexpat, which
+    # is not a dependency that AOSP wants to accept.  Can't do Radeon Gallium
+    # drivers because they requires LLVM, which we don't have an Android build
+    # of.
+    - CROSS=x86_64-linux-android GALLIUM_DRIVERS=iris,virgl VULKAN_DRIVERS=amd,intel .gitlab-ci/meson/build.sh
    - .gitlab-ci/prepare-artifacts.sh
-    # remove all the files created by the previous build before the next build
-    - git clean -dxf .
-    # aarch64 build:
-    # build-only, to catch compilation regressions
-    # without calling .gitlab-ci/prepare-artifacts.sh so that the
-    # artifacts are not shipped in mesa-x86_64-android-${BUILDTYPE}
-    - export CROSS=aarch64-linux-android
-    - export GALLIUM_DRIVERS=etnaviv,freedreno,lima,panfrost,vc4,v3d
-    - export VULKAN_DRIVERS=freedreno,broadcom,virtio
-    - *meson-build

 .meson-cross:
  extends:
-    - .meson-build-only
-    - .use-debian/x86_64_build
+    - .meson-build
+  stage: build-misc
  variables:
    UNWIND: "disabled"
    DRI_LOADERS: >
@@ -465,8 +392,11 @@ debian-android:
      -D gbm=enabled
      -D egl=enabled
      -D platforms=x11,wayland
+      -D osmesa=false
    GALLIUM_ST: >
+      -D dri3=enabled
      -D gallium-vdpau=disabled
+      -D gallium-omx=disabled
      -D gallium-va=disabled
      -D gallium-xa=disabled
      -D gallium-nine=false
@@ -475,151 +405,91 @@ debian-android:
  extends:
    - .meson-cross
    - .use-debian/arm64_build
+  needs:
+    - debian/arm64_build
  variables:
-    VULKAN_DRIVERS: "asahi,broadcom,freedreno"
-    GALLIUM_DRIVERS: "etnaviv,freedreno,lima,nouveau,panfrost,llvmpipe,softpipe,tegra,v3d,vc4,zink"
+    VULKAN_DRIVERS: freedreno,broadcom
+    GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,swrast,tegra,v3d,vc4,zink"
    BUILDTYPE: "debugoptimized"
+  tags:
+    - aarch64

 debian-arm32:
  extends:
    - .meson-arm
    - .ci-deqp-artifacts
-    - .meson-build-for-tests
  variables:
    CROSS: armhf
-    DRI_LOADERS:
-      -D glvnd=disabled
-    # remove asahi & llvmpipe from the .meson-arm list because here we have llvm=disabled
-    VULKAN_DRIVERS: "broadcom,freedreno"
-    GALLIUM_DRIVERS: "etnaviv,freedreno,lima,nouveau,panfrost,softpipe,tegra,v3d,vc4,zink"
    EXTRA_OPTION: >
      -D llvm=disabled
      -D valgrind=disabled
-      -D gallium-rusticl=false
-      -D mesa-clc=system
-      -D precomp-compiler=system
-    HOST_BUILD_OPTIONS: >
-      -D build-tests=false
-      -D enable-glcpp-tests=false
-      -D gallium-opencl=disabled
-      -D gallium-drivers=
-      -D vulkan-drivers=
-      -D video-codecs=
-      -D glx=disabled
-      -D platforms=
-      -D mesa-clc=enabled
-      -D install-mesa-clc=true
-      -D precomp-compiler=enabled
-      -D install-precomp-compiler=true
-      -D tools=panfrost
    S3_ARTIFACT_NAME: mesa-arm32-default-${BUILDTYPE}
    # The strip command segfaults, failing to strip the binary and leaving
    # tempfiles in our artifacts.
    ARTIFACTS_DEBUG_SYMBOLS: 1
+  script:
+    - .gitlab-ci/meson/build.sh
+    - .gitlab-ci/prepare-artifacts.sh

 debian-arm32-asan:
  extends:
    - debian-arm32
-    - .meson-build-for-tests
-    - .build-run-long
  variables:
-    GALLIUM_DRIVERS: "etnaviv"
-    VULKAN_DRIVERS: ""
-    DRI_LOADERS:
-      -D glvnd=disabled
    EXTRA_OPTION: >
      -D llvm=disabled
      -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:
    - .meson-arm
    - .ci-deqp-artifacts
-    - .meson-build-for-tests
  variables:
    C_ARGS: >
      -Wno-error=array-bounds
      -Wno-error=stringop-truncation
-    GALLIUM_DRIVERS: "etnaviv,freedreno,lima,panfrost,v3d,vc4,zink"
-    VULKAN_DRIVERS: "broadcom,freedreno,panfrost"
-    DRI_LOADERS:
-      -D glvnd=disabled
+    VULKAN_DRIVERS: "freedreno,broadcom,panfrost,imagination-experimental"
    EXTRA_OPTION: >
+      -D llvm=disabled
      -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:
+    - .gitlab-ci/meson/build.sh
+    - .gitlab-ci/prepare-artifacts.sh

 debian-arm64-asan:
  extends:
    - debian-arm64
-    - .meson-build-for-tests
-    - .build-run-long
  variables:
-    VULKAN_DRIVERS: "broadcom,freedreno"
-    GALLIUM_DRIVERS: "freedreno,vc4,v3d"
-    DRI_LOADERS:
-      -D glvnd=disabled
    EXTRA_OPTION: >
+      -D llvm=disabled
      -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
-    - .meson-build-for-tests
-    - .build-run-long
-  variables:
-    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:
    - .meson-arm
    - .ci-deqp-artifacts
-    - .meson-build-only
  variables:
-    VULKAN_DRIVERS: "amd,asahi,imagination-experimental,nouveau"
-    DRI_LOADERS:
-      -D glvnd=disabled
+    VULKAN_DRIVERS: "amd"
    EXTRA_OPTION: >
-      -D tools=panfrost,imagination
-      -D perfetto=true
+      -Dtools=panfrost,imagination

 debian-arm64-release:
  extends:
    - debian-arm64
-    - .meson-build-only
  variables:
    BUILDTYPE: release
    S3_ARTIFACT_NAME: mesa-arm64-default-${BUILDTYPE}
@@ -628,34 +498,14 @@ debian-arm64-release:
      -Wno-error=stringop-truncation
      -Wno-error=stringop-overread
  script:
-    - *meson-build
+    - .gitlab-ci/meson/build.sh
    - 'if [ -n "$MESA_CI_PERFORMANCE_ENABLED" ]; then .gitlab-ci/prepare-artifacts.sh; fi'

-debian-no-libdrm:
-  extends:
-    - .meson-arm
-    - .meson-build-only
-  variables:
-    VULKAN_DRIVERS: freedreno
-    GALLIUM_DRIVERS: "zink,llvmpipe"
-    BUILDTYPE: release
-    C_ARGS: >
-      -Wno-error=array-bounds
-      -Wno-error=stringop-truncation
-      -Wno-error=stringop-overread
-    EXTRA_OPTION: >
-      -D freedreno-kmds=kgsl
-      -D glx=disabled
-      -D gbm=disabled
-      -D egl=disabled
-      -D perfetto=true
-
 debian-clang:
-  extends:
-    - .meson-build-only
-    - .use-debian/x86_64_build
+  extends: .meson-build
  variables:
    BUILDTYPE: debug
+    LLVM_VERSION: 15
    UNWIND: "enabled"
    C_ARGS: >
      -Wno-error=constant-conversion
@@ -668,16 +518,17 @@ 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
      -D egl=enabled
-      -D glvnd=enabled
+      -D glvnd=true
      -D platforms=x11,wayland
    GALLIUM_ST: >
+      -D dri3=enabled
      -D gallium-extra-hud=true
      -D gallium-vdpau=enabled
+      -D gallium-omx=bellagio
      -D gallium-va=enabled
      -D gallium-xa=enabled
      -D gallium-nine=true
@@ -686,17 +537,18 @@ debian-clang:
      -D llvm=enabled
      -D microsoft-clc=disabled
      -D shared-llvm=enabled
-    GALLIUM_DRIVERS: "iris,nouveau,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus,i915,asahi"
+      -D opencl-spirv=true
+      -D shared-glapi=enabled
+    GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus,i915,asahi"
    VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,swrast,panfrost,imagination-experimental,microsoft-experimental,nouveau
    EXTRA_OPTION:
      -D spirv-to-dxil=true
+      -D osmesa=true
      -D imagination-srv=true
      -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,lima,panfrost,asahi,imagination
      -D vulkan-layers=device-select,overlay
-      -D build-radv-tests=true
      -D build-aco-tests=true
-      -D mesa-clc=enabled
-      -D precomp-compiler=enabled
+      -D intel-clc=enabled
      -D intel-rt=enabled
      -D imagination-srv=true
      -D teflon=true
@@ -704,18 +556,17 @@ debian-clang:
    CXX: clang++-${LLVM_VERSION}

 debian-clang-release:
-  extends:
-    - debian-clang
-    - .meson-build-only
-    - .build-run-long
+  extends: debian-clang
  variables:
    BUILDTYPE: "release"
    DRI_LOADERS: >
      -D glx=xlib
      -D platforms=x11,wayland
    GALLIUM_ST: >
+      -D dri3=enabled
      -D gallium-extra-hud=true
      -D gallium-vdpau=enabled
+      -D gallium-omx=bellagio
      -D gallium-va=enabled
      -D gallium-xa=enabled
      -D gallium-nine=true
@@ -724,13 +575,15 @@ debian-clang-release:
      -D llvm=enabled
      -D microsoft-clc=disabled
      -D shared-llvm=enabled
+      -D opencl-spirv=true
+      -D shared-glapi=disabled

 windows-msvc:
  extends:
    - .build-windows
    - .use-windows_build_msvc
    - .windows-build-rules
-  stage: build-for-tests
+  stage: build-misc
  script:
    - pwsh -ExecutionPolicy RemoteSigned .\.gitlab-ci\windows\mesa_build.ps1
  artifacts:
@@ -739,11 +592,10 @@ windows-msvc:
      - _install/

 debian-vulkan:
-  extends:
-    - .meson-build-only
-    - .use-debian/x86_64_build
+  extends: .meson-build
  variables:
    BUILDTYPE: debug
+    LLVM_VERSION: 15
    UNWIND: "disabled"
    DRI_LOADERS: >
      -D glx=disabled
@@ -752,10 +604,12 @@ debian-vulkan:
      -D opengl=false
      -D gles1=disabled
      -D gles2=disabled
-      -D glvnd=disabled
      -D platforms=x11,wayland
+      -D osmesa=false
    GALLIUM_ST: >
+      -D dri3=enabled
      -D gallium-vdpau=disabled
+      -D gallium-omx=disabled
      -D gallium-va=disabled
      -D gallium-xa=disabled
      -D gallium-nine=false
@@ -764,10 +618,9 @@ debian-vulkan:
      -D c_args=-fno-sanitize-recover=all
      -D cpp_args=-fno-sanitize-recover=all
    UBSAN_OPTIONS: "print_stacktrace=1"
-    VULKAN_DRIVERS: amd,asahi,broadcom,freedreno,intel,intel_hasvk,panfrost,virtio,imagination-experimental,microsoft-experimental,nouveau
+    VULKAN_DRIVERS: amd,broadcom,freedreno,intel,intel_hasvk,panfrost,virtio,imagination-experimental,microsoft-experimental,nouveau
    EXTRA_OPTION: >
      -D vulkan-layers=device-select,overlay
-      -D build-radv-tests=true
      -D build-aco-tests=true
      -D intel-rt=disabled
      -D imagination-srv=true
@@ -776,22 +629,15 @@ debian-x86_32:
  extends:
    - .meson-cross
    - .use-debian/x86_32_build
-    - .meson-build-only
-    - .build-run-long # it's not clear why this runs long, but it also doesn't matter much
  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"
-    DRI_LOADERS:
-      -D glvnd=disabled
+    VULKAN_DRIVERS: intel,amd,swrast,virtio
+    GALLIUM_DRIVERS: "iris,nouveau,r300,r600,radeonsi,swrast,virgl,zink,crocus,d3d12"
+    LLVM_VERSION: 15
    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
@@ -801,51 +647,29 @@ 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.
-# In case of issues with this job, contact @ajax
 debian-s390x:
  extends:
-    - .meson-cross
+    - debian-ppc64el
    - .use-debian/s390x_build
-    - .meson-build-only
+    - .s390x-rules
  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64_KVM
+    - kvm
  variables:
-    BUILDTYPE: debug
    CROSS: s390x
-    GALLIUM_DRIVERS: "llvmpipe,virgl,zink"
-    VULKAN_DRIVERS: "swrast,virtio"
-    DRI_LOADERS:
-      -D glvnd=disabled
+    GALLIUM_DRIVERS: "swrast,zink"
+    LLVM_VERSION: 15
+    VULKAN_DRIVERS: "swrast"

 debian-ppc64el:
  extends:
    - .meson-cross
    - .use-debian/ppc64el_build
-    - .meson-build-only
+    - .ppc64el-rules
  variables:
    BUILDTYPE: debug
    CROSS: ppc64el
-    GALLIUM_DRIVERS: "nouveau,llvmpipe,softpipe,virgl,zink"
-    VULKAN_DRIVERS: "swrast"
-    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:
-  stage: build-for-tests
-  extends:
-    - .use-debian/x86_64_pyutils
-    - .build-common
-    - .meson-build-for-tests
-  variables:
-    GIT_STRATEGY: fetch
-    S3_ARTIFACT_NAME: mesa-python-ci-artifacts
-  timeout: 10m
-  script:
-    - .gitlab-ci/prepare-artifacts-python.sh
+    GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl,zink"
+    VULKAN_DRIVERS: "amd,swrast"
--- a/.gitlab-ci/common/capture-devcoredump.sh
+++ b/.gitlab-ci/common/capture-devcoredump.sh
@@ -7,7 +7,7 @@ while true; do
  devcds=$(find /sys/devices/virtual/devcoredump/ -name data 2>/dev/null)
  for i in $devcds; do
    echo "Found a devcoredump at $i."
-    if cp $i $RESULTS_DIR/first.devcore; then
+    if cp $i /results/first.devcore; then
      echo 1 > $i
      echo "Saved to the job artifacts at /first.devcore"
      exit 0
@@ -23,7 +23,7 @@ while true; do
        rm "$tmpfile"
    else
        echo "Found an i915 error state at $i size=$filesize."
-        if cp "$tmpfile" $RESULTS_DIR/first.i915_error_state; then
+        if cp "$tmpfile" /results/first.i915_error_state; then
            rm "$tmpfile"
            echo 1 > "$i"
            echo "Saved to the job artifacts at /first.i915_error_state"
--- a/.gitlab-ci/common/export-gitlab-job-env-for-dut.sh
+++ b/.gitlab-ci/common/export-gitlab-job-env-for-dut.sh
@@ -1,142 +0,0 @@
-#!/bin/bash
-
-VARS=(
-    ACO_DEBUG
-    ANGLE_TAG
-    ANGLE_TRACE_FILES_TAG
-    ANV_DEBUG
-    ARTIFACTS_BASE_URL
-    ASAN_OPTIONS
-    BASE_SYSTEM_FORK_HOST_PREFIX
-    BASE_SYSTEM_MAINLINE_HOST_PREFIX
-    CI_COMMIT_BRANCH
-    CI_COMMIT_REF_NAME
-    CI_COMMIT_TITLE
-    CI_JOB_ID
-    CI_JOB_NAME
-    CI_JOB_STARTED_AT
-    CI_JOB_URL
-    CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
-    CI_MERGE_REQUEST_TITLE
-    CI_NODE_INDEX
-    CI_NODE_TOTAL
-    CI_PAGES_DOMAIN
-    CI_PIPELINE_ID
-    CI_PIPELINE_URL
-    CI_PROJECT_DIR
-    CI_PROJECT_NAME
-    CI_PROJECT_PATH
-    CI_PROJECT_ROOT_NAMESPACE
-    CI_RUNNER_DESCRIPTION
-    CI_SERVER_URL
-    CROSVM_GALLIUM_DRIVER
-    CROSVM_GPU_ARGS
-    CURRENT_SECTION
-    DEQP_BIN_DIR
-    DEQP_FORCE_ASAN
-    DEQP_FRACTION
-    DEQP_RUNNER_MAX_FAILS
-    DEQP_SUITE
-    DEQP_TEMP_DIR
-    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
-    GPU_VERSION
-    GTEST
-    GTEST_FAILS
-    GTEST_FRACTION
-    GTEST_RUNNER_OPTIONS
-    GTEST_SKIPS
-    HWCI_FREQ_MAX
-    HWCI_KERNEL_MODULES
-    HWCI_KVM
-    HWCI_START_WESTON
-    HWCI_START_XORG
-    HWCI_TEST_ARGS
-    HWCI_TEST_SCRIPT
-    INTEL_XE_IGNORE_EXPERIMENTAL_WARNING
-    IR3_SHADER_DEBUG
-    JOB_ARTIFACTS_BASE
-    JOB_RESULTS_PATH
-    JOB_ROOTFS_OVERLAY_PATH
-    KERNEL_IMAGE_BASE
-    KERNEL_IMAGE_NAME
-    LD_LIBRARY_PATH
-    LIBGL_ALWAYS_SOFTWARE
-    LP_NUM_THREADS
-    LVP_POISON_MEMORY
-    MESA_BASE_TAG
-    MESA_BUILD_PATH
-    MESA_DEBUG
-    MESA_GLES_VERSION_OVERRIDE
-    MESA_GLSL_VERSION_OVERRIDE
-    MESA_GL_VERSION_OVERRIDE
-    MESA_IMAGE
-    MESA_IMAGE_PATH
-    MESA_IMAGE_TAG
-    MESA_LOADER_DRIVER_OVERRIDE
-    MESA_SPIRV_LOG_LEVEL
-    MESA_TEMPLATES_COMMIT
-    MESA_VK_ABORT_ON_DEVICE_LOSS
-    MESA_VK_IGNORE_CONFORMANCE_WARNING
-    NIR_DEBUG
-    PANVK_DEBUG
-    PAN_I_WANT_A_BROKEN_VULKAN_DRIVER
-    PAN_MESA_DEBUG
-    PIGLIT_FRACTION
-    PIGLIT_NO_WINDOW
-    PIGLIT_OPTIONS
-    PIGLIT_PLATFORM
-    PIGLIT_REPLAY_ANGLE_ARCH
-    PIGLIT_REPLAY_ARTIFACTS_BASE_URL
-    PIGLIT_REPLAY_DEVICE_NAME
-    PIGLIT_REPLAY_EXTRA_ARGS
-    PIGLIT_REPLAY_LOOP_TIMES
-    PIGLIT_REPLAY_REFERENCE_IMAGES_BASE
-    PIGLIT_REPLAY_SUBCOMMAND
-    PIGLIT_RESULTS
-    PIGLIT_RUNNER_OPTIONS
-    PIGLIT_TESTS
-    PIGLIT_TRACES_FILE
-    PIPELINE_ARTIFACTS_BASE
-    RADEON_DEBUG
-    RADV_DEBUG
-    radv_enable_float16_gfx8
-    RADV_PERFTEST
-    S3_HOST
-    S3_JWT_FILE
-    S3_RESULTS_UPLOAD
-    SKQP_ASSETS_DIR
-    SKQP_BACKENDS
-    STORAGE_FORK_HOST_PATH
-    STORAGE_MAINLINE_HOST_PATH
-    TU_DEBUG
-    VIRGL_HOST_API
-    VIRGL_RENDER_SERVER
-    VK_DRIVER
-    WAFFLE_PLATFORM
-    ZINK_DEBUG
-    ZINK_DESCRIPTORS
-
-    # Dead code within Mesa CI, but required by virglrender CI
-    # (because they include our files in their CI)
-    VK_DRIVER_FILES
-)
-
-for var in "${VARS[@]}"; do
-  if [ -n "${!var+x}" ]; then
-    echo "export $var=${!var@Q}"
-  fi
-done
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -0,0 +1,131 @@
+#!/bin/bash
+
+for var in \
+    ACO_DEBUG \
+    ARTIFACTS_BASE_URL \
+    ASAN_OPTIONS \
+    BASE_SYSTEM_FORK_HOST_PREFIX \
+    BASE_SYSTEM_MAINLINE_HOST_PREFIX \
+    CI_COMMIT_BRANCH \
+    CI_COMMIT_REF_NAME \
+    CI_COMMIT_TITLE \
+    CI_JOB_ID \
+    CI_JOB_JWT_FILE \
+    CI_JOB_STARTED_AT \
+    CI_JOB_NAME \
+    CI_JOB_URL \
+    CI_MERGE_REQUEST_SOURCE_BRANCH_NAME \
+    CI_MERGE_REQUEST_TITLE \
+    CI_NODE_INDEX \
+    CI_NODE_TOTAL \
+    CI_PAGES_DOMAIN \
+    CI_PIPELINE_ID \
+    CI_PIPELINE_URL \
+    CI_PROJECT_DIR \
+    CI_PROJECT_NAME \
+    CI_PROJECT_PATH \
+    CI_PROJECT_ROOT_NAMESPACE \
+    CI_RUNNER_DESCRIPTION \
+    CI_SERVER_URL \
+    CROSVM_GALLIUM_DRIVER \
+    CROSVM_GPU_ARGS \
+    CURRENT_SECTION \
+    DEQP_BIN_DIR \
+    DEQP_CONFIG \
+    DEQP_EXPECTED_RENDERER \
+    DEQP_FRACTION \
+    DEQP_HEIGHT \
+    DEQP_RESULTS_DIR \
+    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_UPSTREAM_REPO \
+    FD_MESA_DEBUG \
+    FLAKES_CHANNEL \
+    FREEDRENO_HANGCHECK_MS \
+    GALLIUM_DRIVER \
+    GALLIVM_PERF \
+    GPU_VERSION \
+    GTEST \
+    GTEST_FAILS \
+    GTEST_FRACTION \
+    GTEST_RESULTS_DIR \
+    GTEST_RUNNER_OPTIONS \
+    GTEST_SKIPS \
+    HWCI_FREQ_MAX \
+    HWCI_KERNEL_MODULES \
+    HWCI_KVM \
+    HWCI_START_WESTON \
+    HWCI_START_XORG \
+    HWCI_TEST_SCRIPT \
+    IR3_SHADER_DEBUG \
+    JOB_ARTIFACTS_BASE \
+    JOB_RESULTS_PATH \
+    JOB_ROOTFS_OVERLAY_PATH \
+    KERNEL_IMAGE_BASE \
+    KERNEL_IMAGE_NAME \
+    LD_LIBRARY_PATH \
+    LP_NUM_THREADS \
+    MESA_BASE_TAG \
+    MESA_BUILD_PATH \
+    MESA_DEBUG \
+    MESA_GLES_VERSION_OVERRIDE \
+    MESA_GLSL_VERSION_OVERRIDE \
+    MESA_GL_VERSION_OVERRIDE \
+    MESA_IMAGE \
+    MESA_IMAGE_PATH \
+    MESA_IMAGE_TAG \
+    MESA_LOADER_DRIVER_OVERRIDE \
+    MESA_TEMPLATES_COMMIT \
+    MESA_VK_IGNORE_CONFORMANCE_WARNING \
+    S3_HOST \
+    S3_RESULTS_UPLOAD \
+    NIR_DEBUG \
+    PAN_I_WANT_A_BROKEN_VULKAN_DRIVER \
+    PAN_MESA_DEBUG \
+    PANVK_DEBUG \
+    PIGLIT_FRACTION \
+    PIGLIT_NO_WINDOW \
+    PIGLIT_OPTIONS \
+    PIGLIT_PLATFORM \
+    PIGLIT_PROFILES \
+    PIGLIT_REPLAY_ARTIFACTS_BASE_URL \
+    PIGLIT_REPLAY_DEVICE_NAME \
+    PIGLIT_REPLAY_EXTRA_ARGS \
+    PIGLIT_REPLAY_LOOP_TIMES \
+    PIGLIT_REPLAY_REFERENCE_IMAGES_BASE \
+    PIGLIT_REPLAY_SUBCOMMAND \
+    PIGLIT_RESULTS \
+    PIGLIT_TESTS \
+    PIGLIT_TRACES_FILE \
+    PIPELINE_ARTIFACTS_BASE \
+    RADEON_DEBUG \
+    RADV_DEBUG \
+    RADV_PERFTEST \
+    SKQP_ASSETS_DIR \
+    SKQP_BACKENDS \
+    TU_DEBUG \
+    USE_ANGLE \
+    VIRGL_HOST_API \
+    WAFFLE_PLATFORM \
+    VK_CPU \
+    VK_DRIVER \
+    VK_ICD_FILENAMES \
+    VKD3D_PROTON_RESULTS \
+    VKD3D_CONFIG \
+    VKD3D_TEST_EXCLUDE \
+    ZINK_DESCRIPTORS \
+    ZINK_DEBUG \
+    LVP_POISON_MEMORY \
+    ; do
+  if [ -n "${!var+x}" ]; then
+    echo "export $var=${!var@Q}"
+  fi
+done
--- a/.gitlab-ci/common/init-stage2.sh
+++ b/.gitlab-ci/common/init-stage2.sh
@@ -47,13 +47,6 @@ for path in '/dut-env-vars.sh' '/set-job-env-vars.sh' './set-job-env-vars.sh'; d
 done
 . "$SCRIPTS_DIR"/setup-test-env.sh

-# Flush out anything which might be stuck in a serial buffer
-echo
-echo
-echo
-
-section_switch init_stage2 "Pre-testing hardware setup"
-
 set -ex

 # Set up any devices required by the jobs
@@ -92,9 +85,9 @@ if [ "$HWCI_KVM" = "true" ]; then
    } || \
        modprobe ${KVM_KERNEL_MODULE}

-    mkdir -p /kernel
+    mkdir -p /lava-files
    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-	-o "/kernel/${KERNEL_IMAGE_NAME}" \
+	-o "/lava-files/${KERNEL_IMAGE_NAME}" \
        "${KERNEL_IMAGE_BASE}/amd64/${KERNEL_IMAGE_NAME}"
 fi

@@ -120,7 +113,7 @@ export PYTHONPATH=$(python3 -c "import sys;print(\":\".join(sys.path))")
 if [ -n "$MESA_LOADER_DRIVER_OVERRIDE" ]; then
  rm /install/lib/dri/!($MESA_LOADER_DRIVER_OVERRIDE)_dri.so
 fi
-ls -1 /install/lib/dri/*_dri.so || true
+ls -1 /install/lib/dri/*_dri.so

 if [ "$HWCI_FREQ_MAX" = "true" ]; then
  # Ensure initialization of the DRM device (needed by MSM)
@@ -140,14 +133,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,15 +153,11 @@ 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

-ARCH=$(uname -m)
-export VK_DRIVER_FILES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json"
-
 # If we want Xorg to be running for the test, then we start it up before the
 # HWCI_TEST_SCRIPT because we need to use xinit to start X (otherwise
 # without using -displayfd you can race with Xorg's startup), but xinit will eat
@@ -177,7 +165,8 @@ export VK_DRIVER_FILES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json"
 if [ -n "$HWCI_START_XORG" ]; then
  echo "touch /xorg-started; sleep 100000" > /xorg-script
  env \
-    xinit /bin/sh /xorg-script -- /usr/bin/Xorg -noreset -s 0 -dpms -logfile "$RESULTS_DIR/Xorg.0.log" &
+    VK_ICD_FILENAMES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
+    xinit /bin/sh /xorg-script -- /usr/bin/Xorg -noreset -s 0 -dpms -logfile /Xorg.0.log &
  BACKGROUND_PIDS="$! $BACKGROUND_PIDS"

  # Wait for xorg to be ready for connections.
@@ -203,34 +192,32 @@ if [ -n "$HWCI_START_WESTON" ]; then
  mkdir -p /tmp/.X11-unix

  env \
+    VK_ICD_FILENAMES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
    weston -Bheadless-backend.so --use-gl -Swayland-0 --xwayland --idle-time=0 &
  BACKGROUND_PIDS="$! $BACKGROUND_PIDS"

  while [ ! -S "$WESTON_X11_SOCK" ]; do sleep 1; done
 fi

-set +x
-
-section_end init_stage2
-
-echo "Running ${HWCI_TEST_SCRIPT} ${HWCI_TEST_ARGS} ..."
-
 set +e
-$HWCI_TEST_SCRIPT ${HWCI_TEST_ARGS:-}; EXIT_CODE=$?
+bash -c ". $SCRIPTS_DIR/setup-test-env.sh && $HWCI_TEST_SCRIPT"
+EXIT_CODE=$?
 set -e

-section_start post_test_cleanup "Cleaning up after testing, uploading results"
-set -x
+# Let's make sure the results are always stored in current working directory
+mv -f ${CI_PROJECT_DIR}/results ./ 2>/dev/null || true
+
+[ ${EXIT_CODE} -ne 0 ] || rm -rf results/trace/"$PIGLIT_REPLAY_DEVICE_NAME"

 # Make sure that capture-devcoredump is done before we start trying to tar up
 # artifacts -- if it's writing while tar is reading, tar will throw an error and
 # kill the job.
 cleanup

-# upload artifacts (lava jobs)
+# 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 "${CI_JOB_JWT_FILE}" results.tar.zst https://"$S3_RESULTS_UPLOAD"/results.tar.zst;
 fi

 # We still need to echo the hwci: mesa message, as some scripts rely on it, such
@@ -238,12 +225,11 @@ fi
 [ ${EXIT_CODE} -eq 0 ] && RESULT=pass || RESULT=fail

 set +x
-section_end post_test_cleanup

 # Print the final result; both bare-metal and LAVA look for this string to get
 # the result of our run, so try really hard to get it out rather than losing
 # the run. The device gets shut down right at this point, and a630 seems to
 # enjoy corrupting the last line of serial output before shutdown.
-for _ in $(seq 0 3); do echo "hwci: mesa: $RESULT, exit_code: $EXIT_CODE"; sleep 1; echo; done
+for _ in $(seq 0 3); do echo "hwci: mesa: $RESULT"; sleep 1; echo; done

 exit $EXIT_CODE
--- a/.gitlab-ci/common/intel-gpu-freq.sh
+++ b/.gitlab-ci/common/intel-gpu-freq.sh
@@ -35,27 +35,6 @@
 # - gt_act_freq_mhz (the actual GPU freq)
 # - gt_cur_freq_mhz (the last requested freq)
 #
-# Intel later switched to per-tile sysfs interfaces, which is what the Xe DRM
-# driver exlusively uses, and the capabilites are now located under the
-# following directory for the first tile:
-#
-# /sys/class/drm/card<n>/device/tile0/gt0/freq0/<freq_info>
-#
-# Where <n> is the DRM card index and <freq_info> one of the following:
-#
-# - max_freq (enforced maximum freq)
-# - min_freq (enforced minimum freq)
-#
-# The hardware capabilities can be accessed via:
-#
-# - rp0_freq (supported maximum freq)
-# - rpn_freq (supported minimum freq)
-# - rpe_freq (most efficient freq)
-#
-# The current frequency can be read from:
-# - act_freq (the actual GPU freq)
-# - cur_freq (the last requested freq)
-#
 # Also note that in addition to GPU management, the script offers the
 # possibility to adjust CPU operating frequencies. However, this is currently
 # limited to just setting the maximum scaling frequency as percentage of the
@@ -71,25 +50,10 @@
 # Constants
 #

-# Check if any /sys/class/drm/cardX/device/tile0 directory exists to detect Xe
-USE_XE=0
-for i in $(seq 0 15); do
-    if [ -d "/sys/class/drm/card$i/device/tile0" ]; then
-        USE_XE=1
-        break
-    fi
-done
-
 # GPU
-if [ "$USE_XE" -eq 1 ]; then
-    DRM_FREQ_SYSFS_PATTERN="/sys/class/drm/card%d/device/tile0/gt0/freq0/%s_freq"
-    ENF_FREQ_INFO="max min"
-    CAP_FREQ_INFO="rp0 rpn rpe"
-else
-    DRM_FREQ_SYSFS_PATTERN="/sys/class/drm/card%d/gt_%s_freq_mhz"
-    ENF_FREQ_INFO="max min boost"
-    CAP_FREQ_INFO="RP0 RPn RP1"
-fi
+DRM_FREQ_SYSFS_PATTERN="/sys/class/drm/card%d/gt_%s_freq_mhz"
+ENF_FREQ_INFO="max min boost"
+CAP_FREQ_INFO="RP0 RPn RP1"
 ACT_FREQ_INFO="act cur"
 THROTT_DETECT_SLEEP_SEC=2
 THROTT_DETECT_PID_FILE_PATH=/tmp/thrott-detect.pid
@@ -148,11 +112,7 @@ identify_intel_gpu() {
        }

        path=$(print_freq_sysfs_path "" ${i})
-        if [ "$USE_XE" -eq 1 ]; then
-            path=${path%/*/*/*/*/*}/device/vendor
-        else
-            path=${path%/*}/device/vendor
-        fi
+        path=${path%/*}/device/vendor

        [ -r "${path}" ] && read vendor < "${path}" && \
            [ "${vendor}" = "0x8086" ] && INTEL_DRM_CARD_INDEX=$i && return 0
@@ -237,13 +197,13 @@ compute_freq_set() {

    case "$1" in
    +)
-        val=$(eval "echo \${FREQ_$(echo $CAP_FREQ_INFO | cut -d' ' -f1)}")  # FREQ_rp0 or FREQ_RP0
+        val=${FREQ_RP0}
        ;;
    -)
-        val=$(eval "echo \${FREQ_$(echo $CAP_FREQ_INFO | cut -d' ' -f2)}")  # FREQ_rpn or FREQ_RPn
+        val=${FREQ_RPn}
        ;;
    *%)
-        val=$((${1%?} * $(eval "echo \${FREQ_$(echo $CAP_FREQ_INFO | cut -d' ' -f1)}") / 100))
+        val=$((${1%?} * FREQ_RP0 / 100))
        # Adjust freq to comply with 50 MHz increments
        val=$((val / 50 * 50))
        ;;
@@ -272,17 +232,15 @@ set_freq_max() {

    read_freq_info n min || return $?

-    # FREQ_rp0 or FREQ_RP0
-    [ ${SET_MAX_FREQ} -gt $(eval "echo \${FREQ_$(echo $CAP_FREQ_INFO | cut -d' ' -f1)}") ] && {
+    [ ${SET_MAX_FREQ} -gt ${FREQ_RP0} ] && {
        log ERROR "Cannot set GPU max freq (%s) to be greater than hw max freq (%s)" \
-            "${SET_MAX_FREQ}" "$(eval "echo \${FREQ_$(echo $CAP_FREQ_INFO | cut -d' ' -f1)}")"
+            "${SET_MAX_FREQ}" "${FREQ_RP0}"
        return 1
    }

-    # FREQ_rpn or FREQ_RPn
-    [ ${SET_MAX_FREQ} -lt $(eval "echo \${FREQ_$(echo $CAP_FREQ_INFO | cut -d' ' -f2)}") ] && {
+    [ ${SET_MAX_FREQ} -lt ${FREQ_RPn} ] && {
        log ERROR "Cannot set GPU max freq (%s) to be less than hw min freq (%s)" \
-            "${SET_MIN_FREQ}" "$(eval "echo \${FREQ_$(echo $CAP_FREQ_INFO | cut -d' ' -f2)}")"
+            "${SET_MIN_FREQ}" "${FREQ_RPn}"
        return 1
    }

@@ -294,21 +252,12 @@ set_freq_max() {

    [ -z "${DRY_RUN}" ] || return 0

-    # Write to max freq path
-    if ! printf "%s" ${SET_MAX_FREQ} | tee $(print_freq_sysfs_path max) > /dev/null;
+    if ! printf "%s" ${SET_MAX_FREQ} | tee $(print_freq_sysfs_path max) \
+        $(print_freq_sysfs_path boost) > /dev/null;
    then
        log ERROR "Failed to set GPU max frequency"
        return 1
    fi
-
-    # Only write to boost if the sysfs file exists, as it's removed in Xe
-    if [ -e "$(print_freq_sysfs_path boost)" ]; then
-        if ! printf "%s" ${SET_MAX_FREQ} | tee $(print_freq_sysfs_path boost) > /dev/null;
-        then
-            log ERROR "Failed to set GPU boost frequency"
-            return 1
-        fi
-    fi
 }

 #
@@ -325,9 +274,9 @@ set_freq_min() {
        return 1
    }

-    [ ${SET_MIN_FREQ} -lt $(eval "echo \${FREQ_$(echo $CAP_FREQ_INFO | cut -d' ' -f2)}") ] && {
+    [ ${SET_MIN_FREQ} -lt ${FREQ_RPn} ] && {
        log ERROR "Cannot set GPU min freq (%s) to be less than hw min freq (%s)" \
-            "${SET_MIN_FREQ}" "$(eval "echo \${FREQ_$(echo $CAP_FREQ_INFO | cut -d' ' -f2)}")"
+            "${SET_MIN_FREQ}" "${FREQ_RPn}"
        return 1
    }

@@ -345,7 +294,7 @@ set_freq_min() {
 #
 set_freq() {
    # Get hw max & min frequencies
-    read_freq_info n $(echo $CAP_FREQ_INFO | cut -d' ' -f1,2) || return $? # RP0 RPn
+    read_freq_info n RP0 RPn || return $?

    [ -z "${SET_MAX_FREQ}" ] || {
        SET_MAX_FREQ=$(compute_freq_set "${SET_MAX_FREQ}")
@@ -448,7 +397,7 @@ detect_throttling() {
        }

        (
-            read_freq_info n $(echo $CAP_FREQ_INFO | cut -d' ' -f2) || return $? # RPn
+            read_freq_info n RPn || exit $?

            while true; do
                sleep ${THROTT_DETECT_SLEEP_SEC}
@@ -457,13 +406,13 @@ detect_throttling() {
                #
                # The throttling seems to occur when act freq goes below min.
                # However, it's necessary to exclude the idle states, where
-                # act freq normally reaches rpn and cur goes below min.
+                # act freq normally reaches RPn and cur goes below min.
                #
                [ ${FREQ_act} -lt ${FREQ_min} ] && \
-                [ ${FREQ_act} -gt $(eval "echo \${FREQ_$(echo $CAP_FREQ_INFO | cut -d' ' -f2)}") ] && \
+                [ ${FREQ_act} -gt ${FREQ_RPn} ] && \
                [ ${FREQ_cur} -ge ${FREQ_min} ] && \
-                    printf "GPU throttling detected: act=%s min=%s cur=%s rpn=%s\n" \
-                    ${FREQ_act} ${FREQ_min} ${FREQ_cur} $(eval "echo \${FREQ_$(echo $CAP_FREQ_INFO | cut -d' ' -f2)}")
+                    printf "GPU throttling detected: act=%s min=%s cur=%s RPn=%s\n" \
+                    ${FREQ_act} ${FREQ_min} ${FREQ_cur} ${FREQ_RPn}
            done
        ) &

@@ -611,8 +560,7 @@ set_cpu_freq_max() {
        read_cpu_freq_info ${cpu_index} n ${CAP_CPU_FREQ_INFO} || { res=$?; continue; }

        target_freq=$(compute_cpu_freq_set "${CPU_SET_MAX_FREQ}")
-        tf_res=$?
-        [ -z "${target_freq}" ] && { res=$tf_res; continue; }
+        [ -z "${target_freq}" ] && { res=$?; continue; }

        log INFO "Setting CPU%s max scaling freq to %s Hz" ${cpu_index} "${target_freq}"
        [ -n "${DRY_RUN}" ] && continue
--- a/.gitlab-ci/common/kdl.sh
+++ b/.gitlab-ci/common/kdl.sh
@@ -1,18 +1,24 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC1091  # the path is created in build-kdl and
 # here is check if exist
-# shellcheck disable=SC2086 # we want the arguments to be expanded

-if ! [ -f /ci-kdl/bin/activate ]; then
-  echo -e "ci-kdl not installed; not monitoring temperature"
-  exit 0
+terminate() {
+  echo "ci-kdl.sh caught SIGTERM signal! propagating to child processes"
+  for job in $(jobs -p)
+  do
+    kill -15 "$job"
+  done
+}
+
+trap terminate SIGTERM
+
+if [ -f /ci-kdl.venv/bin/activate ]; then
+  source /ci-kdl.venv/bin/activate
+  /ci-kdl.venv/bin/python /ci-kdl.venv/bin/ci-kdl | tee -a /results/kdl.log &
+  child=$!
+  wait $child
+  mv kdl_*.json /results/kdl.json
+else
+  echo -e "Not possible to activate ci-kdl virtual environment"
 fi

-KDL_ARGS="
-	--output-file=${RESULTS_DIR}/kdl.json
-	--log-level=WARNING
-	--num-samples=-1
-"
-
-source /ci-kdl/bin/activate
-exec /ci-kdl/bin/ci-kdl ${KDL_ARGS}
--- a/.gitlab-ci/common/start-x.sh
+++ b/.gitlab-ci/common/start-x.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -ex
+
+_XORG_SCRIPT="/xorg-script"
+_FLAG_FILE="/xorg-started"
+
+echo "touch ${_FLAG_FILE}; sleep 100000" > "${_XORG_SCRIPT}"
+if [ "x$1" != "x" ]; then
+    export LD_LIBRARY_PATH="${1}/lib"
+    export LIBGL_DRIVERS_PATH="${1}/lib/dri"
+fi
+xinit /bin/sh "${_XORG_SCRIPT}" -- /usr/bin/Xorg vt45 -noreset -s 0 -dpms -logfile /Xorg.0.log &
+
+# Wait for xorg to be ready for connections.
+for _ in 1 2 3 4 5; do
+    if [ -e "${_FLAG_FILE}" ]; then
+        break
+    fi
+    sleep 5
+done
--- a/.gitlab-ci/conditional-build-image-tags.yml
+++ b/.gitlab-ci/conditional-build-image-tags.yml
@@ -1,2 +0,0 @@
-variables:
-  CONDITIONAL_BUILD_ANGLE_TAG: ab19bccfd3858c539ba8cb8d9b52a003
--- a/.gitlab-ci/container/alpine/x86_64_build.sh
+++ b/.gitlab-ci/container/alpine/x86_64_build.sh
@@ -6,11 +6,10 @@
 # ALPINE_X86_64_BUILD_TAG

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

+export LLVM_VERSION="${LLVM_VERSION:=16}"
+
 EPHEMERAL=(
 )

@@ -19,7 +18,7 @@ DEPS=(
    bash
    bison
    ccache
-    "clang${LLVM_VERSION}-dev"
+    clang16-dev
    cmake
    clang-dev
    coreutils
@@ -30,52 +29,38 @@ DEPS=(
    git
    gettext
    glslang
-    graphviz
    linux-headers
-    "llvm${LLVM_VERSION}-static"
-    "llvm${LLVM_VERSION}-dev"
+    llvm16-static
+    llvm16-dev
    meson
-    mold
-    musl-dev
    expat-dev
    elfutils-dev
-    libclc-dev
    libdrm-dev
+    libselinux-dev
    libva-dev
    libpciaccess-dev
    zlib-dev
    python3-dev
-    py3-clang
-    py3-cparser
    py3-mako
-    py3-packaging
-    py3-pip
    py3-ply
-    py3-yaml
    vulkan-headers
    spirv-tools-dev
-    spirv-llvm-translator-dev
    util-macros
+    wayland-dev
+    wayland-protocols
 )

 apk --no-cache add "${DEPS[@]}" "${EPHEMERAL[@]}"

-pip3 install --break-system-packages sphinx===8.2.3 hawkmoth===0.19.0
+. .gitlab-ci/container/build-llvm-spirv.sh
+
+. .gitlab-ci/container/build-libclc.sh

 . .gitlab-ci/container/container_pre_build.sh

-EXTRA_MESON_ARGS='--prefix=/usr' \
-. .gitlab-ci/container/build-wayland.sh

 ############### Uninstall the build software

-# too many vendor binarise, just keep the ones we need
-find /usr/share/clc \
-  \( -type f -o -type l \) \
-  ! -name 'spirv-mesa3d-.spv' \
-  ! -name 'spirv64-mesa3d-.spv' \
-  -delete
-
 apk del "${EPHEMERAL[@]}"

 . .gitlab-ci/container/container_post_build.sh
--- 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 -L -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,121 +0,0 @@
-#!/usr/bin/env bash
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml and .gitlab-ci/container/gitlab-ci.yml tags:
-# DEBIAN_BUILD_TAG
-# ANDROID_LLVM_ARTIFACT_NAME
-
-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
-
-# Ephemeral packages (installed for this script and removed again at the end)
-EPHEMERAL=(
-  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
-
-apt-get purge -y "${EPHEMERAL[@]}"
--- a/.gitlab-ci/container/build-angle.sh
+++ b/.gitlab-ci/container/build-angle.sh
@@ -1,164 +1,58 @@
 #!/usr/bin/env bash

-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_ANDROID_TAG
-# KERNEL_ROOTFS_TAG
+set -ex

-set -uex
-
-uncollapsed_section_start angle "Building ANGLE"
-
-# Do a very early check to make sure the tag is correct without the need of
-# setting up the environment variables locally
-ci_tag_build_time_check "ANGLE_TAG"
-
-ANGLE_REV="a3f2545f6bb3e8d27827dceb2b4e901673995ad1"
-
-# Set ANGLE_ARCH based on DEBIAN_ARCH if it hasn't been explicitly defined
-if [[ -z "${ANGLE_ARCH:-}" ]]; then
-  case "$DEBIAN_ARCH" in
-    amd64) ANGLE_ARCH=x64;;
-    arm64) ANGLE_ARCH=arm64;;
-  esac
-fi
+ANGLE_REV="0518a3ff4d4e7e5b2ce8203358f719613a31c118"

 # DEPOT tools
-git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git /depot-tools
-export PATH=/depot-tools:$PATH
+git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
+PWD=$(pwd)
+export PATH=$PWD/depot_tools:$PATH
 export DEPOT_TOOLS_UPDATE=0

 mkdir /angle-build
-mkdir /angle
 pushd /angle-build
 git init
 git remote add origin https://chromium.googlesource.com/angle/angle.git
 git fetch --depth 1 origin "$ANGLE_REV"
 git checkout FETCH_HEAD

-echo "$ANGLE_REV" > /angle/version
-
-GCLIENT_CUSTOM_VARS=()
-GCLIENT_CUSTOM_VARS+=('--custom-var=angle_enable_cl=False')
-GCLIENT_CUSTOM_VARS+=('--custom-var=angle_enable_cl_testing=False')
-GCLIENT_CUSTOM_VARS+=('--custom-var=angle_enable_vulkan_validation_layers=False')
-GCLIENT_CUSTOM_VARS+=('--custom-var=angle_enable_wgpu=False')
-GCLIENT_CUSTOM_VARS+=('--custom-var=build_angle_deqp_tests=False')
-GCLIENT_CUSTOM_VARS+=('--custom-var=build_angle_perftests=False')
-if [[ "$ANGLE_TARGET" == "android" ]]; then
-  GCLIENT_CUSTOM_VARS+=('--custom-var=checkout_android=True')
-fi
-
 # source preparation
-gclient config --name REPLACE-WITH-A-DOT --unmanaged \
-  "${GCLIENT_CUSTOM_VARS[@]}" \
-  https://chromium.googlesource.com/angle/angle.git
-sed -e 's/REPLACE-WITH-A-DOT/./;' -i .gclient
-sed -e 's|"custom_deps" : {|"custom_deps" : {\
-      "third_party/clspv/src": None,\
-      "third_party/dawn": None,\
-      "third_party/glmark2/src": None,\
-      "third_party/libjpeg_turbo": None,\
-      "third_party/llvm/src": None,\
-      "third_party/OpenCL-CTS/src": None,\
-      "third_party/SwiftShader": None,\
-      "third_party/VK-GL-CTS/src": None,\
-      "third_party/vulkan-validation-layers/src": None,|' -i .gclient
-gclient sync --no-history -j"${FDO_CI_CONCURRENT:-4}"
+python3 scripts/bootstrap.py
+mkdir -p build/config
+gclient sync
+
+sed -i "/catapult/d" testing/BUILD.gn

 mkdir -p out/Release
-cat > out/Release/args.gn <<EOF
-angle_assert_always_on=false
-angle_build_all=false
-angle_build_tests=false
-angle_enable_cl=false
-angle_enable_cl_testing=false
-angle_enable_gl=false
-angle_enable_gl_desktop_backend=false
-angle_enable_null=false
-angle_enable_swiftshader=false
-angle_enable_trace=false
-angle_enable_wgpu=false
-angle_enable_vulkan=true
-angle_enable_vulkan_api_dump_layer=false
-angle_enable_vulkan_validation_layers=false
-angle_has_frame_capture=false
-angle_has_histograms=false
-angle_has_rapidjson=false
-angle_use_custom_libvulkan=false
-build_angle_deqp_tests=false
+echo '
+is_debug = false
+angle_enable_swiftshader = false
+angle_enable_null = false
+angle_enable_gl = false
+angle_enable_vulkan = true
+angle_has_histograms = false
+build_angle_trace_perf_tests = false
+build_angle_deqp_tests = false
+angle_use_custom_libvulkan = false
 dcheck_always_on=true
-enable_expensive_dchecks=false
-is_component_build=false
-is_debug=false
-target_cpu="${ANGLE_ARCH}"
-target_os="${ANGLE_TARGET}"
-treat_warnings_as_errors=false
-EOF
-
-case "$ANGLE_TARGET" in
-  linux) cat >> out/Release/args.gn <<EOF
-angle_egl_extension="so.1"
-angle_glesv2_extension="so.2"
-use_custom_libcxx=false
-custom_toolchain="//build/toolchain/linux/unbundle:default"
-host_toolchain="//build/toolchain/linux/unbundle:default"
-EOF
-    ;;
-  android) cat >> out/Release/args.gn <<EOF
-android_ndk_version="${ANDROID_NDK_VERSION}"
-android64_ndk_api_level=${ANDROID_SDK_VERSION}
-android32_ndk_api_level=${ANDROID_SDK_VERSION}
-use_custom_libcxx=true
-EOF
-    ;;
-    *) echo "Unexpected ANGLE_TARGET value: $ANGLE_TARGET"; exit 1;;
-esac
+' > out/Release/args.gn

 if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
-  # We need to get an AArch64 sysroot - because ANGLE isn't great friends with
-  # system dependencies - but use the default system toolchain, because the
-  # 'arm64' toolchain you get from Google infrastructure is a cross-compiler
-  # from x86-64
  build/linux/sysroot_scripts/install-sysroot.py --arch=arm64
 fi

-(
-  # The 'unbundled' toolchain configuration requires clang, and it also needs to
-  # be configured via environment variables.
-  export CC="clang-${LLVM_VERSION}"
-  export HOST_CC="$CC"
-  export CFLAGS="-Wno-unknown-warning-option"
-  export HOST_CFLAGS="$CFLAGS"
-  export CXX="clang++-${LLVM_VERSION}"
-  export HOST_CXX="$CXX"
-  export CXXFLAGS="-Wno-unknown-warning-option"
-  export HOST_CXXFLAGS="$CXXFLAGS"
-  export AR="ar"
-  export HOST_AR="$AR"
-  export NM="nm"
-  export HOST_NM="$NM"
-  export LDFLAGS="-fuse-ld=lld-${LLVM_VERSION} -lpthread -ldl"
-  export HOST_LDFLAGS="$LDFLAGS"
+gn gen out/Release
+# depot_tools overrides ninja with a version that doesn't work.  We want
+# ninja with FDO_CI_CONCURRENT anyway.
+/usr/local/bin/ninja -C out/Release/

-  gn gen out/Release
-  # depot_tools overrides ninja with a version that doesn't work.  We want
-  # ninja with FDO_CI_CONCURRENT anyway.
-  /usr/local/bin/ninja -C out/Release/ libEGL libGLESv1_CM libGLESv2
-)
-
-rm -f out/Release/libvulkan.so* out/Release/*.so*.TOC
-cp out/Release/lib*.so* /angle/
-
-if [[ "$ANGLE_TARGET" == "linux" ]]; then
-  ln -s libEGL.so.1 /angle/libEGL.so
-  ln -s libGLESv2.so.2 /angle/libGLESv2.so
-fi
+mkdir /angle
+cp out/Release/lib*GL*.so /angle/
+ln -s libEGL.so /angle/libEGL.so.1
+ln -s libGLESv2.so /angle/libGLESv2.so.2

 rm -rf out

 popd
-rm -rf /depot-tools
-rm -rf /angle-build
-
-section_end angle
+rm -rf ./depot_tools
--- a/.gitlab-ci/container/build-apitrace.sh
+++ b/.gitlab-ci/container/build-apitrace.sh
@@ -3,21 +3,19 @@

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_GL_TAG
-# DEBIAN_TEST_VK_TAG
+# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_X86_64_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG

-set -uex
+set -ex

-uncollapsed_section_start apitrace "Building apitrace"
-
-APITRACE_VERSION="952bad1469ea747012bdc48c48993bd5f13eec04"
+APITRACE_VERSION="0a6506433e1f9f7b69757b4e5730326970c4321a"

 git clone https://github.com/apitrace/apitrace.git --single-branch --no-checkout /apitrace
 pushd /apitrace
 git checkout "$APITRACE_VERSION"
 git submodule update --init --depth 1 --recursive
-cmake -S . -B _build -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_GUI=False -DENABLE_WAFFLE=on ${EXTRA_CMAKE_ARGS:-}
+cmake -S . -B _build -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_GUI=False -DENABLE_WAFFLE=on $EXTRA_CMAKE_ARGS
 cmake --build _build --parallel --target apitrace eglretrace
 mkdir build
 cp _build/apitrace build
@@ -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,23 +0,0 @@
-#!/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
-
-# bindgen
-RUSTFLAGS='-L native=/usr/local/lib' cargo install \
-  bindgen-cli --version ${BINDGEN_VER} \
-  --locked \
-  -j ${FDO_CI_CONCURRENT:-4} \
-  --root /usr/local
-
-# cbindgen
-RUSTFLAGS='-L native=/usr/local/lib' cargo install \
-  cbindgen --version ${CBINDGEN_VER} \
-  --locked \
-  -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,44 +1,35 @@
 #!/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"
+set -ex

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

-CROSVM_VERSION=e27efaf8f4bdc4a47d1e99cc44d2b6908b6f36bd
+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=7570167549358ce77b8d4774041b4a77c72a021c
+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
 git checkout "$VIRGLRENDERER_VERSION"
-meson setup build/ -D libdir=lib -D render-server-worker=process -D venus=true ${EXTRA_MESON_ARGS:-}
+meson setup build/ -D libdir=lib -D render-server-worker=process -D venus=true $EXTRA_MESON_ARGS
 meson install -C build
 popd

-rm rust-toolchain
+cargo update -p pkg-config@0.3.26 --precise 0.3.27

 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
  bindgen-cli \
  --locked \
  -j ${FDO_CI_CONCURRENT:-4} \
  --root /usr/local \
-  --version 0.71.1 \
-  ${EXTRA_CARGO_ARGS:-}
+  --version 0.65.1 \
+  $EXTRA_CARGO_ARGS

 CROSVM_USE_SYSTEM_MINIGBM=1 CROSVM_USE_SYSTEM_VIRGLRENDERER=1 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
  -j ${FDO_CI_CONCURRENT:-4} \
@@ -46,10 +37,8 @@ CROSVM_USE_SYSTEM_MINIGBM=1 CROSVM_USE_SYSTEM_VIRGLRENDERER=1 RUSTFLAGS='-L nati
  --features 'default-no-sandbox gpu x virgl_renderer' \
  --path . \
  --root /usr/local \
-  ${EXTRA_CARGO_ARGS:-}
+  $EXTRA_CARGO_ARGS

 popd

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

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_ANDROID_TAG
-# DEBIAN_BASE_TAG
+# DEBIAN_X86_64_TEST_ANDROID_TAG
+# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_X86_64_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG

-set -uex
+set -ex

-uncollapsed_section_start deqp-runner "Building deqp-runner"
-
-DEQP_RUNNER_VERSION=0.20.3
-
-commits_to_backport=(
-)
-
-patch_files=(
-)
+DEQP_RUNNER_VERSION=0.18.0

 DEQP_RUNNER_GIT_URL="${DEQP_RUNNER_GIT_URL:-https://gitlab.freedesktop.org/mesa/deqp-runner.git}"

-if [ -n "${DEQP_RUNNER_GIT_TAG:-}" ]; then
-    DEQP_RUNNER_GIT_CHECKOUT="$DEQP_RUNNER_GIT_TAG"
-elif [ -n "${DEQP_RUNNER_GIT_REV:-}" ]; then
-    DEQP_RUNNER_GIT_CHECKOUT="$DEQP_RUNNER_GIT_REV"
+if [ -n "${DEQP_RUNNER_GIT_TAG}${DEQP_RUNNER_GIT_REV}" ]; then
+    # Build and install from source
+    DEQP_RUNNER_CARGO_ARGS="--git $DEQP_RUNNER_GIT_URL"
+
+    if [ -n "${DEQP_RUNNER_GIT_TAG}" ]; then
+        DEQP_RUNNER_CARGO_ARGS="--tag ${DEQP_RUNNER_GIT_TAG} ${DEQP_RUNNER_CARGO_ARGS}"
+        DEQP_RUNNER_GIT_CHECKOUT="$DEQP_RUNNER_GIT_TAG"
+    else
+        DEQP_RUNNER_CARGO_ARGS="--rev ${DEQP_RUNNER_GIT_REV} ${DEQP_RUNNER_CARGO_ARGS}"
+        DEQP_RUNNER_GIT_CHECKOUT="$DEQP_RUNNER_GIT_REV"
+    fi
+
+    DEQP_RUNNER_CARGO_ARGS="${DEQP_RUNNER_CARGO_ARGS} ${EXTRA_CARGO_ARGS}"
 else
+    # Install from package registry
+    DEQP_RUNNER_CARGO_ARGS="--version ${DEQP_RUNNER_VERSION} ${EXTRA_CARGO_ARGS} -- deqp-runner"
    DEQP_RUNNER_GIT_CHECKOUT="v$DEQP_RUNNER_VERSION"
 fi

-BASE_PWD=$PWD
-
-mkdir -p /deqp-runner
-pushd /deqp-runner
-mkdir deqp-runner-git
-pushd deqp-runner-git
-git init
-git remote add origin "$DEQP_RUNNER_GIT_URL"
-git fetch --depth 1 origin "$DEQP_RUNNER_GIT_CHECKOUT"
-git checkout FETCH_HEAD
-
-for commit in "${commits_to_backport[@]}"
-do
-  PATCH_URL="https://gitlab.freedesktop.org/mesa/deqp-runner/-/commit/$commit.patch"
-  echo "Backport deqp-runner commit $commit from $PATCH_URL"
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 $PATCH_URL | git am
-done
-
-for patch in "${patch_files[@]}"
-do
-  echo "Apply patch to deqp-runner from $patch"
-  git am "$BASE_PWD/.gitlab-ci/container/patches/$patch"
-done
-
-if [ -z "${RUST_TARGET:-}" ]; then
-    RUST_TARGET=""
-fi
-
 if [[ "$RUST_TARGET" != *-android ]]; then
-    # When CC (/usr/lib/ccache/gcc) variable is set, the rust compiler uses
-    # this variable when cross-compiling arm32 and build fails for zsys-sys.
-    # So unset the CC variable when cross-compiling for arm32.
-    SAVEDCC=${CC:-}
-    if [ "$RUST_TARGET" = "armv7-unknown-linux-gnueabihf" ]; then
-        unset CC
-    fi
    cargo install --locked  \
        -j ${FDO_CI_CONCURRENT:-4} \
        --root /usr/local \
-        ${EXTRA_CARGO_ARGS:-} \
-        --path .
-    CC=$SAVEDCC
+        ${DEQP_RUNNER_CARGO_ARGS}
 else
+    mkdir -p /deqp-runner
+    pushd /deqp-runner
+    git clone --branch "$DEQP_RUNNER_GIT_CHECKOUT" --depth 1 "$DEQP_RUNNER_GIT_URL" deqp-runner-git
+    pushd deqp-runner-git
+
    cargo install --locked  \
        -j ${FDO_CI_CONCURRENT:-4} \
        --root /usr/local --version 2.10.0 \
@@ -85,16 +57,14 @@ else
    cargo uninstall --locked  \
        --root /usr/local \
        cargo-ndk
-fi

-popd
-rm -rf deqp-runner-git
-popd
+    popd
+    rm -rf deqp-runner-git
+    popd
+fi

 # remove unused test runners to shrink images for the Mesa CI build (not kernel,
 # which chooses its own deqp branch)
-if [ -z "${DEQP_RUNNER_GIT_TAG:-}${DEQP_RUNNER_GIT_REV:-}" ]; then
+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
@@ -3,31 +3,22 @@

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_ANDROID_TAG
-# DEBIAN_TEST_GL_TAG
-# DEBIAN_TEST_VK_TAG
+# DEBIAN_X86_64_TEST_ANDROID_TAG
+# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_X86_64_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 -ex -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=76c1572eaba42d7ddd9bb8eb5788e52dd932068e
-DEQP_VK_VERSION=1.4.1.1
-DEQP_GL_VERSION=4.6.5.0
-DEQP_GLES_VERSION=3.2.11.0
+DEQP_VK_VERSION=1.3.7.0
+DEQP_GL_VERSION=4.6.4.0
+DEQP_GLES_VERSION=3.2.10.0

 # Patches to VulkanCTS may come from commits in their repo (listed in
 # cts_commits_to_backport) or patch files stored in our repo (in the patch
@@ -35,53 +26,63 @@ 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=(
-  # Stop querying device address from unbound buffers
-  046343f46f7d39d53b47842d7fd8ed3279528046
+    # Take multiview into account for task shader inv. stats
+    22aa3f4c59f6e1d4daebd5a8c9c05bce6cd3b63b
+
+    # Remove illegal mesh shader query tests
+    2a87f7b25dc27188be0f0a003b2d7aef69d9002e
+
+    # Relax fragment shader invocations result verifications
+    0d8bf6a2715f95907e9cf86a86876ff1f26c66fe
+
+    # Fix several issues in dynamic rendering basic tests
+    c5453824b498c981c6ba42017d119f5de02a3e34
+
+    # Add setVisible for VulkanWindowDirectDrm
+    a8466bf6ea98f6cd6733849ad8081775318a3e3e
 )

 # shellcheck disable=SC2034
 vk_cts_patch_files=(
+  # Derivate subgroup fix
+  # https://github.com/KhronosGroup/VK-GL-CTS/pull/442
+  build-deqp-vk_Use-subgroups-helper-in-derivate-tests.patch
+  build-deqp-vk_Add-missing-subgroup-support-checks-for-linear-derivate-tests.patch
 )

+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
+  gl_cts_patch_files+=(
+    build-deqp-gl_Allow-running-on-Android-from-the-command-line.patch
+    build-deqp-gl_Android-prints-to-stdout-instead-of-logcat.patch
+  )
+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
+  # Implement support for the EGL_EXT_config_select_group extension
+  88ba9ac270db5be600b1ecacbc6d9db0c55d5be4
 )

 # 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
@@ -100,151 +101,87 @@ 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
-  merge_base="$(curl --fail -s https://api.github.com/repos/KhronosGroup/VK-GL-CTS/compare/main...$DEQP_MAIN_COMMIT | jq -r .merge_base_commit.sha)"
-  if [[ "$merge_base" != "$DEQP_MAIN_COMMIT" ]]; 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 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 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 | sed '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

-case "${DEQP_API}" in
-  VK-main)
-    # Video tests rely on external files
-    python3 external/fetch_video_decode_samples.py
-    python3 external/fetch_video_encode_samples.py
-    ;;
-esac
-
-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}
+        $EXTRA_CMAKE_ARGS
+    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}
+        $EXTRA_CMAKE_ARGS
+    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}
+        $EXTRA_CMAKE_ARGS
+    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:-}
+      $EXTRA_CMAKE_ARGS

 # Make sure `default` doesn't silently stop detecting one of the platforms we care about
 if [ "${DEQP_TARGET}" = 'default' ]; then
@@ -253,73 +190,86 @@ 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-master.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/
+            /VK-GL-CTS/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/*-main.txt \
+            /deqp/mustpass/
        cp \
-            /VK-GL-CTS/external/openglcts/data/gl_cts/data/mustpass/gl/khronos_mustpass_single/main/*-single.txt \
-            mustpass/
+            /VK-GL-CTS/external/openglcts/data/mustpass/gl/khronos_mustpass_single/4.6.1.x/*-single.txt \
+            /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/
+            /VK-GL-CTS/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/*.txt \
+            /deqp/mustpass/
        cp \
-            /VK-GL-CTS/external/openglcts/data/gl_cts/data/mustpass/egl/aosp_mustpass/main/egl-main.txt \
-            mustpass/
+            /VK-GL-CTS/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-main.txt \
+            /deqp/mustpass/
        cp \
-            /VK-GL-CTS/external/openglcts/data/gl_cts/data/mustpass/gles/khronos_mustpass/main/*-main.txt \
-            mustpass/
+            /VK-GL-CTS/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.6.x/*-main.txt \
+            /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

 # Remove other mustpass files, since we saved off the ones we wanted to conventient locations above.
-rm -rf assets/**/mustpass/
-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-master*
+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
@@ -5,15 +5,11 @@
 # .gitlab-ci/image-tags.yml tags:
 # DEBIAN_BUILD_TAG

-set -uex
+set -ex

-uncollapsed_section_start directx-headers "Building directx-headers"
-
-git clone https://github.com/microsoft/DirectX-Headers -b v1.614.1 --depth 1
+git clone https://github.com/microsoft/DirectX-Headers -b v1.611.0 --depth 1
 pushd DirectX-Headers
-meson setup build --backend=ninja --buildtype=release -Dbuild-test=false ${EXTRA_MESON_ARGS:-}
+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
@@ -2,13 +2,11 @@

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_VK_TAG
+# DEBIAN_X86_64_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG

 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-hang-detection.sh
+++ b/.gitlab-ci/container/build-hang-detection.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -ex
+
+PARALLEL_DEQP_RUNNER_VERSION=fe557794b5dadd8dbf0eae403296625e03bda18a
+
+git clone https://gitlab.freedesktop.org/mesa/parallel-deqp-runner --single-branch -b master --no-checkout /parallel-deqp-runner
+pushd /parallel-deqp-runner
+git checkout "$PARALLEL_DEQP_RUNNER_VERSION"
+meson . _build
+ninja -C _build hang-detection
+mkdir -p build/bin
+install _build/hang-detection build/bin
+strip build/bin/*
+find . -not -path './build' -not -path './build/*' -delete
+popd
--- a/.gitlab-ci/container/build-kdl.sh
+++ b/.gitlab-ci/container/build-kdl.sh
@@ -3,30 +3,21 @@

 set -ex

-uncollapsed_section_start kdl "Building kdl"
+KDL_REVISION="5056f71b100a68b72b285c6fc845a66a2ed25985"

-KDL_REVISION="cbbe5fd54505fd03ee34f35bfd16794f0c30074f"
-KDL_CHECKOUT_DIR="/tmp/ci-kdl.git"
-
-mkdir -p ${KDL_CHECKOUT_DIR}
-pushd ${KDL_CHECKOUT_DIR}
+mkdir ci-kdl.git
+pushd ci-kdl.git
 git init
 git remote add origin https://gitlab.freedesktop.org/gfx-ci/ci-kdl.git
 git fetch --depth 1 origin ${KDL_REVISION}
 git checkout FETCH_HEAD
 popd

-# Run venv in a subshell, so we don't accidentally leak the venv state into
-# calling scripts
-(
-	python3 -m venv /ci-kdl
-	source /ci-kdl/bin/activate &&
-	pushd ${KDL_CHECKOUT_DIR} &&
-	pip install -r requirements.txt &&
-	pip install . &&
-	popd
-)
+python3 -m venv ci-kdl.venv
+source ci-kdl.venv/bin/activate
+pushd ci-kdl.git
+pip install -r requirements.txt
+pip install .
+popd

-rm -rf ${KDL_CHECKOUT_DIR}
-
-section_end kdl
+rm -rf ci-kdl.git
--- a/.gitlab-ci/container/build-kernel.sh
+++ b/.gitlab-ci/container/build-kernel.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2086 # we want word splitting
+# shellcheck disable=SC2153
+
+set -ex
+
+mkdir -p kernel
+pushd kernel
+
+if [[ ${DEBIAN_ARCH} = "arm64" ]]; then
+    KERNEL_IMAGE_NAME+=" cheza-kernel"
+fi
+
+for image in ${KERNEL_IMAGE_NAME}; do
+    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+      -o "/lava-files/${image}" "${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${image}"
+done
+
+for dtb in ${DEVICE_TREES}; do
+    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+      -o "/lava-files/${dtb}" "${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${dtb}"
+  done
+
+mkdir -p "/lava-files/rootfs-${DEBIAN_ARCH}"
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+  -O "${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/modules.tar.zst"
+tar --keep-directory-symlink --zstd -xf modules.tar.zst -C "/lava-files/rootfs-${DEBIAN_ARCH}/"
+
+popd
+rm -rf kernel
+
--- a/.gitlab-ci/container/build-libclc.sh
+++ b/.gitlab-ci/container/build-libclc.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash

-set -uex
-
-uncollapsed_section_start libclc "Building libclc"
+set -ex

 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
@@ -1,21 +1,16 @@
 #!/usr/bin/env bash
-# Script used for Android and Fedora builds (Debian builds get their libdrm version
-# from https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo - see PKG_REPO_REV)
+# Script used for Android and Fedora builds
 # shellcheck disable=SC2086 # we want word splitting

-set -uex
+set -ex

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

 curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \
    https://dri.freedesktop.org/libdrm/"$LIBDRM_VERSION".tar.xz
 tar -xvf "$LIBDRM_VERSION".tar.xz && rm "$LIBDRM_VERSION".tar.xz
 cd "$LIBDRM_VERSION"
-meson setup build -D vc4=disabled -D freedreno=disabled -D etnaviv=disabled ${EXTRA_MESON_ARGS:-}
+meson setup build -D vc4=disabled -D freedreno=disabled -D etnaviv=disabled $EXTRA_MESON_ARGS
 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
@@ -4,29 +4,19 @@ set -ex

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# ALPINE_X86_64_BUILD_TAG
 # DEBIAN_BASE_TAG
 # DEBIAN_BUILD_TAG
 # FEDORA_X86_64_BUILD_TAG
 # KERNEL_ROOTFS_TAG

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

 git clone -b v"$MOLD_VERSION" --single-branch --depth 1 https://github.com/rui314/mold.git
 pushd mold

 cmake -DCMAKE_BUILD_TYPE=Release -D BUILD_TESTING=OFF -D MOLD_LTO=ON
-cmake --build . --parallel "${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 {} +
+cmake --build . --parallel
+cmake --install .

 popd
 rm -rf mold
-
-section_end mold
--- a/.gitlab-ci/container/build-ninetests.sh
+++ b/.gitlab-ci/container/build-ninetests.sh
@@ -2,12 +2,10 @@

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_GL_TAG
+# DEBIAN_X86_64_TEST_GL_TAG

 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
@@ -1,27 +1,24 @@
 #!/bin/bash
 # shellcheck disable=SC2086 # we want word splitting
-set -uex
-
-uncollapsed_section_start piglit "Building piglit"
+set -ex

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_GL_TAG
-# DEBIAN_TEST_VK_TAG
+# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_X86_64_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG

-REV="0ecdebb0f5927728ddeeb851639a559b0f7d6590"
+REV="1e631479c0b477006dd7561c55e06269d2878d8d"

 git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
 pushd /piglit
 git checkout "$REV"
 patch -p1 <$OLDPWD/.gitlab-ci/piglit/disable-vs_in.diff
-cmake -S . -B . -G Ninja -DCMAKE_BUILD_TYPE=Release $PIGLIT_OPTS ${EXTRA_CMAKE_ARGS:-}
-ninja ${PIGLIT_BUILD_TARGETS:-}
-find . -depth \( -name .git -o -name '*ninja*' -o -iname '*cmake*' -o -name '*.[chao]' \) \
-       ! -name 'include_test.h' -exec rm -rf {} \;
+cmake -S . -B . -G Ninja -DCMAKE_BUILD_TYPE=Release $PIGLIT_OPTS $EXTRA_CMAKE_ARGS
+ninja $PIGLIT_BUILD_TARGETS
+find . -depth \( -name .git -o -name '*ninja*' -o -iname '*cmake*' -o -name '*.[chao]' \) -exec rm -rf {} \;
 rm -rf target_api
-if [ "${PIGLIT_BUILD_TARGETS:-}" = "piglit_replayer" ]; then
+if [ "$PIGLIT_BUILD_TARGETS" = "piglit_replayer" ]; then
    find . -depth \
         ! -regex "^\.$" \
         ! -regex "^\.\/piglit.*" \
@@ -34,5 +31,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,10 +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.73.0-2023-10-05

 # 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
@@ -19,20 +26,14 @@ curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
      --profile minimal \
      -y

-# Make rustup tools available in the PATH environment variable
-# shellcheck disable=SC1091
-. "$HOME/.cargo/env"
-
 rustup component add clippy rustfmt

 # Set up a config script for cross compiling -- cargo needs your system cc for
 # linking in cross builds, but doesn't know what you want to use for system cc.
-cat > "$HOME/.cargo/config" <<EOF
+cat > /root/.cargo/config <<EOF
 [target.armv7-unknown-linux-gnueabihf]
 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
@@ -8,33 +8,13 @@
 # .gitlab-ci/image-tags.yml tags:
 # KERNEL_ROOTFS_TAG

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

-SCRIPT_DIR="$(pwd)/.gitlab-ci/container"
-SKQP_PATCH_DIR="${SCRIPT_DIR}/patches"
-BASE_ARGS_GN_FILE="${SCRIPT_DIR}/build-skqp_base.gn"
-
-case "$DEBIAN_ARCH" in
-  amd64)
-    SKQP_ARCH=x64
-    ;;
-  armhf)
-    SKQP_ARCH=arm
-    ;;
-  arm64)
-    SKQP_ARCH=arm64
-    ;;
-esac
-
-SKIA_DIR=${SKIA_DIR:-$(mktemp -d)}
-SKQP_OUT_DIR=${SKIA_DIR}/out/${SKQP_ARCH}
-SKQP_INSTALL_DIR=${SKQP_INSTALL_DIR:-/skqp}
-SKQP_ASSETS_DIR="${SKQP_INSTALL_DIR}/assets"
-SKQP_BINARIES=(skqp list_gpu_unit_tests list_gms)
+# hack for skqp see the clang
+pushd /usr/bin/
+ln -s ../lib/llvm-15/bin/clang clang
+ln -s ../lib/llvm-15/bin/clang++ clang++
+popd

 create_gn_args() {
    # gn can be configured to cross-compile skia and its tools
@@ -58,6 +38,19 @@ download_skia_source() {
    git clone --branch "${SKQP_BRANCH}" --depth 1 "${SKQP_REPO}" "${SKIA_DIR}"
 }

+set -ex
+
+SCRIPT_DIR=$(realpath "$(dirname "$0")")
+SKQP_PATCH_DIR="${SCRIPT_DIR}/patches"
+BASE_ARGS_GN_FILE="${SCRIPT_DIR}/build-skqp_base.gn"
+
+SKQP_ARCH=${SKQP_ARCH:-x64}
+SKIA_DIR=${SKIA_DIR:-$(mktemp -d)}
+SKQP_OUT_DIR=${SKIA_DIR}/out/${SKQP_ARCH}
+SKQP_INSTALL_DIR=${SKQP_INSTALL_DIR:-/skqp}
+SKQP_ASSETS_DIR="${SKQP_INSTALL_DIR}/assets"
+SKQP_BINARIES=(skqp list_gpu_unit_tests list_gms)
+
 download_skia_source

 pushd "${SKIA_DIR}"
@@ -66,12 +59,6 @@ pushd "${SKIA_DIR}"
 cat "${SKQP_PATCH_DIR}"/build-skqp_*.patch |
    patch -p1

-# 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++
-popd
-
 # Fetch some needed build tools needed to build skia/skqp.
 # Basically, it clones repositories with commits SHAs from ${SKIA_DIR}/DEPS
 # directory.
@@ -100,5 +87,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
@@ -4,9 +4,7 @@
 # .gitlab-ci/image-tags.yml tags:
 # KERNEL_ROOTFS_TAG

-set -uex
-
-uncollapsed_section_start va-tools "Building va-tools"
+set -ex

 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 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
@@ -2,21 +2,21 @@

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_VK_TAG
+# DEBIAN_X86_64_TEST_VK_TAG
+# KERNEL_ROOTFS_TAG
 set -ex

-uncollapsed_section_start vkd3d-proton "Building vkd3d-proton"
-
-VKD3D_PROTON_COMMIT="078f07f588c849c52fa21c8cfdd1c201465b1932"
+VKD3D_PROTON_COMMIT="a0ccc383937903f4ca0997ce53e41ccce7f2f2ec"

 VKD3D_PROTON_DST_DIR="/vkd3d-proton-tests"
 VKD3D_PROTON_SRC_DIR="/vkd3d-proton-src"
-VKD3D_PROTON_BUILD_DIR="/vkd3d-proton-build"
+VKD3D_PROTON_BUILD_DIR="/vkd3d-proton-$VKD3D_PROTON_VERSION"

 function build_arch {
  local arch="$1"
+  shift

-  meson setup                              \
+  meson "$@"                               \
        -Denable_tests=true                \
        --buildtype release                \
        --prefix "$VKD3D_PROTON_DST_DIR"   \
@@ -37,14 +37,7 @@ git submodule update --init --recursive
 git submodule update --recursive
 build_arch 64
 build_arch 86
-mkdir "$VKD3D_PROTON_DST_DIR/tests"
-cp \
-  "tests/test-runner.sh" \
-  "tests/d3d12_tests.h" \
-  "$VKD3D_PROTON_DST_DIR/tests/"
 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
@@ -2,24 +2,17 @@

 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_GL_TAG
-# KERNEL_ROOTFS_TAG
+# DEBIAN_X86_64_TEST_GL_TAG
+# KERNEL_ROOTFS_TAG:

-set -uex
+set -ex

-uncollapsed_section_start vulkan-validation "Building Vulkan validation layers"
-
-VALIDATION_TAG="snapshot-2025wk15"
+VALIDATION_TAG="snapshot-2024wk06"

 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 debug
 cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTS=OFF -DBUILD_WERROR=OFF -C external/helper.cmake -S . -B build
-ninja -C build -j"${FDO_CI_CONCURRENT:-4}"
-cmake --install build --strip
+ninja -C build install
 popd
 rm -rf Vulkan-ValidationLayers
-
-section_end vulkan-validation
--- a/.gitlab-ci/container/build-wayland.sh
+++ b/.gitlab-ci/container/build-wayland.sh
@@ -1,28 +1,15 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting

-set -uex
-
-uncollapsed_section_start wayland "Building Wayland"
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# ALPINE_X86_64_BUILD_TAG
-# DEBIAN_BASE_TAG
-# DEBIAN_BUILD_TAG
-# DEBIAN_TEST_ANDROID_TAG
-# DEBIAN_TEST_GL_TAG
-# DEBIAN_TEST_VK_TAG
-# FEDORA_X86_64_BUILD_TAG
-# KERNEL_ROOTFS_TAG
+set -ex

 export LIBWAYLAND_VERSION="1.21.0"
-export WAYLAND_PROTOCOLS_VERSION="1.41"
+export WAYLAND_PROTOCOLS_VERSION="1.31"

 git clone https://gitlab.freedesktop.org/wayland/wayland
 cd wayland
 git checkout "$LIBWAYLAND_VERSION"
-meson setup -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true _build ${EXTRA_MESON_ARGS:-}
+meson setup -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true _build $EXTRA_MESON_ARGS
 meson install -C _build
 cd ..
 rm -rf wayland
@@ -30,9 +17,7 @@ rm -rf wayland
 git clone https://gitlab.freedesktop.org/wayland/wayland-protocols
 cd wayland-protocols
 git checkout "$WAYLAND_PROTOCOLS_VERSION"
-meson setup -Dtests=false _build ${EXTRA_MESON_ARGS:-}
+meson setup _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, all the linux 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_post_build.sh
+++ b/.gitlab-ci/container/container_post_build.sh
@@ -6,6 +6,8 @@ fi

 # Clean up any build cache
 rm -rf /root/.cache
+rm -rf /root/.cargo
+rm -rf /.cargo

 if test -x /usr/bin/ccache; then
    ccache --show-stats
--- a/.gitlab-ci/container/container_pre_build.sh
+++ b/.gitlab-ci/container/container_pre_build.sh
@@ -1,7 +1,4 @@
 #!/bin/sh
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BUILD_TAG

 if test -x /usr/bin/ccache; then
    if test -f /etc/debian_version; then
@@ -16,8 +13,8 @@ if test -x /usr/bin/ccache; then

    export CCACHE_COMPILERCHECK=content
    export CCACHE_COMPRESS=true
-    export CCACHE_DIR="/cache/$CI_PROJECT_NAME/ccache"
-    export PATH="$CCACHE_PATH:$PATH"
+    export CCACHE_DIR=/cache/$CI_PROJECT_NAME/ccache
+    export PATH=$CCACHE_PATH:$PATH

    # CMake ignores $PATH, so we have to force CC/GCC to the ccache versions.
    export CC="${CCACHE_PATH}/gcc"
@@ -26,6 +23,14 @@ 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"
+find /usr/bin -name \*-ld -o -name ld | \
+    grep -v mingw | \
+    xargs -n 1 -I '{}' ln -sf '{}.gold' '{}'
+
 # Make a wrapper script for ninja to always include the -j flags
 {
    echo '#!/bin/sh -x'
@@ -45,30 +50,3 @@ echo -e "retry_connrefused = on\n" \
 	"retry_on_host_error = on\n" \
 	"retry_on_http_error = 429,500,502,503,504\n" \
        "wait_retry = 32" >> /etc/wgetrc
-
-# Ensure that rust tools are in PATH if they exist
-CARGO_ENV_FILE="$HOME/.cargo/env"
-if [ -f "$CARGO_ENV_FILE" ]; then
-    # shellcheck disable=SC1090
-    source "$CARGO_ENV_FILE"
-fi
-
-ci_tag_early_checks() {
-    # Runs the first part of the build script to perform the tag check only
-    uncollapsed_section_switch "ci_tag_early_checks" "Ensuring component versions match declared tags in CI builds"
-    echo "[Structured Tagging] Checking components: ${CI_BUILD_COMPONENTS}"
-    # shellcheck disable=SC2086
-    for component in ${CI_BUILD_COMPONENTS}; do
-        bin/ci/update_tag.py --check ${component} || exit 1
-    done
-    echo "[Structured Tagging] Components check done"
-    section_end "ci_tag_early_checks"
-}
-
-# Check if each declared tag component is up to date before building
-if [ -n "${CI_BUILD_COMPONENTS:-}" ]; then
-    # Remove any duplicates by splitting on whitespace, sorting, then joining back
-    CI_BUILD_COMPONENTS="$(echo "${CI_BUILD_COMPONENTS}" | xargs -n1 | sort -u | xargs)"
-
-    ci_tag_early_checks
-fi
--- a/.gitlab-ci/container/create-android-cross-file.sh
+++ b/.gitlab-ci/container/create-android-cross-file.sh
@@ -18,11 +18,11 @@ 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'
-pkg-config = ['/usr/bin/pkgconf']
+pkgconfig = ['/usr/bin/pkgconf']

 [host_machine]
 system = 'android'
--- 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
@@ -19,13 +15,11 @@ EPHEMERAL=(

 apt-get install -y --no-remove "${EPHEMERAL[@]}"

-. .gitlab-ci/container/container_pre_build.sh
-
 # 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.
@@ -40,12 +34,6 @@ sh .gitlab-ci/container/create-android-cross-file.sh /$ndk i686-linux-android x8
 sh .gitlab-ci/container/create-android-cross-file.sh /$ndk aarch64-linux-android aarch64 armv8 $ANDROID_SDK_VERSION
 sh .gitlab-ci/container/create-android-cross-file.sh /$ndk arm-linux-androideabi arm armv7hl $ANDROID_SDK_VERSION armv7a-linux-androideabi

-# Build libdrm for the host (Debian) environment, so it's available for
-# binaries we'll run as part of the build process
-. .gitlab-ci/container/build-libdrm.sh
-
-# Build libdrm for the NDK environment, so it's available when building for
-# the Android target
 for arch in \
        x86_64-linux-android \
        i686-linux-android \
@@ -97,22 +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[@]}"
-
-. .gitlab-ci/container/container_post_build.sh
--- a/.gitlab-ci/container/debian/arm32_test-base.sh
+++ b/.gitlab-ci/container/debian/arm32_test-base.sh
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-DEBIAN_ARCH=armhf \
-. .gitlab-ci/container/debian/test-base.sh
--- a/.gitlab-ci/container/debian/arm32_test-gl.sh
+++ b/.gitlab-ci/container/debian/arm32_test-gl.sh
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-DEBIAN_ARCH="armhf" \
-. .gitlab-ci/container/debian/test-gl.sh
--- a/.gitlab-ci/container/debian/arm32_test-vk.sh
+++ b/.gitlab-ci/container/debian/arm32_test-vk.sh
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-DEBIAN_ARCH="armhf" \
-. .gitlab-ci/container/debian/test-vk.sh
--- a/.gitlab-ci/container/debian/arm32_test.sh
+++ b/.gitlab-ci/container/debian/arm32_test.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -e
+
+arch=armhf . .gitlab-ci/container/debian/arm_test.sh
--- 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=(
@@ -30,7 +26,6 @@ DEPS=(
    ccache
    cmake
    curl
-    "clang-${LLVM_VERSION}"
    fastboot
    flatbuffers-compiler
    flex
@@ -38,15 +33,11 @@ DEPS=(
    git
    glslang-tools
    kmod
-    "libclang-${LLVM_VERSION}-dev"
-    "libclang-cpp${LLVM_VERSION}-dev"
-    "libclang-common-${LLVM_VERSION}-dev"
    libasan8
    libdrm-dev
    libelf-dev
    libexpat1-dev
    libflatbuffers-dev
-    "libllvm${LLVM_VERSION}"
    libvulkan-dev
    libx11-dev
    libx11-xcb-dev
@@ -73,7 +64,6 @@ DEPS=(
    python3-mako
    python3-pil
    python3-pip
-    python3-pycparser
    python3-requests
    python3-setuptools
    u-boot-tools
@@ -82,8 +72,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
@@ -97,16 +85,6 @@ arch=armhf

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

-. .gitlab-ci/container/build-llvm-spirv.sh
-
-. .gitlab-ci/container/build-libclc.sh
-
-. .gitlab-ci/container/install-meson.sh
-
-. .gitlab-ci/container/build-rust.sh
-
-. .gitlab-ci/container/build-bindgen.sh
-
 apt-get purge -y "${EPHEMERAL[@]}"

 . .gitlab-ci/container/container_post_build.sh
--- a/.gitlab-ci/container/debian/arm64_test-base.sh
+++ b/.gitlab-ci/container/debian/arm64_test-base.sh
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-DEBIAN_ARCH=arm64 \
-. .gitlab-ci/container/debian/test-base.sh
--- a/.gitlab-ci/container/debian/arm64_test-gl.sh
+++ b/.gitlab-ci/container/debian/arm64_test-gl.sh
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-DEBIAN_ARCH="arm64" \
-. .gitlab-ci/container/debian/test-gl.sh
--- a/.gitlab-ci/container/debian/arm64_test-vk.sh
+++ b/.gitlab-ci/container/debian/arm64_test-vk.sh
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-DEBIAN_ARCH="arm64" \
-. .gitlab-ci/container/debian/test-vk.sh
--- a/.gitlab-ci/container/debian/arm64_test.sh
+++ b/.gitlab-ci/container/debian/arm64_test.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -e
+
+arch=arm64 . .gitlab-ci/container/debian/arm_test.sh
--- 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/baremetal_arm32_test.sh
+++ b/.gitlab-ci/container/debian/baremetal_arm32_test.sh
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-arch=armhf . .gitlab-ci/container/debian/baremetal_arm_test.sh
--- a/.gitlab-ci/container/debian/baremetal_arm64_test.sh
+++ b/.gitlab-ci/container/debian/baremetal_arm64_test.sh
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-arch=arm64 . .gitlab-ci/container/debian/baremetal_arm_test.sh
--- 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
@@ -1,227 +0,0 @@
-#!/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
-
-set -e
-
-. .gitlab-ci/setup-test-env.sh
-
-set -o xtrace
-
-uncollapsed_section_start debian_setup "Base Debian system setup"
-
-export DEBIAN_FRONTEND=noninteractive
-
-apt-get install -y curl 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
-
-# Ephemeral packages (installed for this script and removed again at the end)
-EPHEMERAL=(
-    autoconf
-    automake
-    bc
-    bison
-    bzip2
-    ccache
-    cmake
-    "clang-${LLVM_VERSION}"
-    dpkg-dev
-    flex
-    glslang-tools
-    g++
-    libasound2-dev
-    libcap-dev
-    "libclang-cpp${LLVM_VERSION}-dev"
-    "libclang-rt-${LLVM_VERSION}-dev"
-    libdrm-dev
-    libegl-dev
-    libelf-dev
-    libepoxy-dev
-    libexpat1-dev
-    libgbm-dev
-    libgles2-mesa-dev
-    liblz4-dev
-    libpciaccess-dev
-    libssl-dev
-    libvulkan-dev
-    libudev-dev
-    libwaffle-dev
-    libwayland-dev
-    libx11-xcb-dev
-    libxcb-dri2-0-dev
-    libxcb-dri3-dev
-    libxcb-present-dev
-    libxfixes-dev
-    libxcb-ewmh-dev
-    libxext-dev
-    libxkbcommon-dev
-    libxrandr-dev
-    libxrender-dev
-    libzstd-dev
-    "llvm-${LLVM_VERSION}-dev"
-    make
-    meson
-    openssh-server
-    patch
-    pkgconf
-    protobuf-compiler
-    python3-dev
-    python3-pip
-    python3-setuptools
-    python3-wheel
-    wayland-protocols
-    xz-utils
-)
-
-DEPS=(
-    apt-utils
-    clinfo
-    curl
-    git
-    git-lfs
-    inetutils-syslogd
-    iptables
-    jq
-    kmod
-    libasan8
-    libcap2
-    libdrm2
-    libegl1
-    libepoxy0
-    libexpat1
-    libfdt1
-    "libclang-common-${LLVM_VERSION}-dev"
-    "libclang-cpp${LLVM_VERSION}"
-    "libllvm${LLVM_VERSION}"
-    liblz4-1
-    libpng16-16
-    libpython3.11
-    libubsan1
-    libvulkan1
-    libwayland-client0
-    libwayland-server0
-    libxcb-ewmh2
-    libxcb-randr0
-    libxcb-shm0
-    libxcb-xfixes0
-    libxkbcommon0
-    libxrandr2
-    libxrender1
-    ocl-icd-libopencl1
-    pciutils
-    python3-lxml
-    python3-mako
-    python3-numpy
-    python3-packaging
-    python3-pil
-    python3-renderdoc
-    python3-requests
-    python3-simplejson
-    python3-six
-    python3-yaml
-    socat
-    spirv-tools
-    sysvinit-core
-    vulkan-tools
-    waffle-utils
-    weston
-    xwayland
-    xinit
-    xserver-xorg-video-amdgpu
-    xserver-xorg-video-ati
-    xauth
-    xvfb
-    zlib1g
-    zstd
-)
-
-apt-get update
-apt-get dist-upgrade -y
-
-apt-get install --purge -y \
-      sysvinit-core libelogind0
-
-apt-get install -y --no-remove "${DEPS[@]}"
-
-apt-get install -y --no-install-recommends "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/container_pre_build.sh
-
-# Needed for ci-fairy, this revision is able to upload files to MinIO
-# and doesn't depend on git
-pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
-
-# Needed for manipulation with traces yaml files.
-pip3 install --break-system-packages yq
-
-section_end debian_setup
-
-############### Download prebuilt kernel
-
-if [ "$DEBIAN_ARCH" = amd64 ]; then
-  uncollapsed_section_start kernel "Downloading kernel for crosvm"
-  export KERNEL_IMAGE_NAME=bzImage
-  mkdir -p /kernel
-  # shellcheck disable=SC2153 # KERNEL_IMAGE_BASE is set in the root .gitlab-ci.yml file
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-      -o "/kernel/${KERNEL_IMAGE_NAME}" "${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${KERNEL_IMAGE_NAME}"
-  section_end kernel
-fi
-
-############### Build mold
-
-. .gitlab-ci/container/build-mold.sh
-
-############### Build LLVM-SPIRV translator
-
-. .gitlab-ci/container/build-llvm-spirv.sh
-
-############### Build libclc
-
-. .gitlab-ci/container/build-libclc.sh
-
-############### Build Wayland
-
-. .gitlab-ci/container/build-wayland.sh
-
-############### Install Rust toolchain
-
-. .gitlab-ci/container/build-rust.sh
-
-############### Build Crosvm
-
-# crosvm build fails on ARMv7 due to Xlib type-size issues
-if [ "$DEBIAN_ARCH" != "armhf" ]; then
-  . .gitlab-ci/container/build-crosvm.sh
-fi
-
-############### Build dEQP runner
-
-. .gitlab-ci/container/build-deqp-runner.sh
-
-############### Build apitrace
-
-. .gitlab-ci/container/build-apitrace.sh
-
-############### Uninstall the build software
-
-uncollapsed_section_switch debian_cleanup "Cleaning up base Debian system"
-
-apt-get purge -y "${EPHEMERAL[@]}"
-
-# Properly uninstall rustup including cargo and init scripts on shells
-rustup self uninstall -y
-
-. .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
@@ -1,131 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-
-set -e
-
-. .gitlab-ci/setup-test-env.sh
-
-set -o xtrace
-
-uncollapsed_section_start debian_setup "Base Debian system setup"
-
-export DEBIAN_FRONTEND=noninteractive
-: "${LLVM_VERSION:?llvm version not set!}"
-
-apt-get install -y libelogind0  # this interfere with systemd deps, install separately
-
-# Ephemeral packages (installed for this script and removed again at the end)
-EPHEMERAL=(
-    bzip2
-    ccache
-    "clang-${LLVM_VERSION}"
-    cmake
-    dpkg-dev
-    g++
-    glslang-tools
-    libasound2-dev
-    libcap-dev
-    "libclang-cpp${LLVM_VERSION}-dev"
-    libdrm-dev
-    libgles2-mesa-dev
-    libgtest-dev
-    libpciaccess-dev
-    libpng-dev
-    libudev-dev
-    libvulkan-dev
-    libwaffle-dev
-    libwayland-dev
-    libx11-xcb-dev
-    libxcb-dri2-0-dev
-    libxcb-dri3-dev
-    libxcb-present-dev
-    libxfixes-dev
-    libxkbcommon-dev
-    libxrandr-dev
-    libxrender-dev
-    "llvm-${LLVM_VERSION}-dev"
-    "lld-${LLVM_VERSION}"
-    make
-    meson
-    ocl-icd-opencl-dev
-    patch
-    pkgconf
-    python3-distutils
-    xz-utils
-)
-
-DEPS=(
-)
-
-apt-get update
-
-apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
-      $EXTRA_LOCAL_PACKAGES
-
-
-. .gitlab-ci/container/container_pre_build.sh
-
-section_end debian_setup
-
-############### Build ANGLE
-
-if [ "$DEBIAN_ARCH" == "arm64" ]; then
-  ANGLE_TARGET=linux \
-  . .gitlab-ci/container/build-angle.sh
-fi
-
-############### Build piglit
-
-PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
-	     -DPIGLIT_USE_GBM=ON
-	     -DPIGLIT_USE_WAYLAND=ON
-	     -DPIGLIT_USE_X11=ON
-	     -DPIGLIT_BUILD_GLX_TESTS=ON
-	     -DPIGLIT_BUILD_EGL_TESTS=ON
-	     -DPIGLIT_BUILD_WGL_TESTS=OFF
-	     -DPIGLIT_BUILD_GL_TESTS=ON
-	     -DPIGLIT_BUILD_GLES1_TESTS=ON
-	     -DPIGLIT_BUILD_GLES2_TESTS=ON
-	     -DPIGLIT_BUILD_GLES3_TESTS=ON
-	     -DPIGLIT_BUILD_CL_TESTS=ON
-	     -DPIGLIT_BUILD_VK_TESTS=ON
-	     -DPIGLIT_BUILD_DMA_BUF_TESTS=ON" \
-  . .gitlab-ci/container/build-piglit.sh
-
-############### Build dEQP GL
-
-DEQP_API=tools \
-DEQP_TARGET=surfaceless \
-. .gitlab-ci/container/build-deqp.sh
-
-DEQP_API=GL \
-DEQP_TARGET=surfaceless \
-. .gitlab-ci/container/build-deqp.sh
-
-DEQP_API=GLES \
-DEQP_TARGET=surfaceless \
-. .gitlab-ci/container/build-deqp.sh
-
-rm -rf /VK-GL-CTS
-
-############### Build validation layer for zink
-
-. .gitlab-ci/container/build-vulkan-validation.sh
-
-############### Build nine tests
-
-. .gitlab-ci/container/build-ninetests.sh
-
-############### Uninstall the build software
-
-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
-
-############### Remove unused packages
-
-. .gitlab-ci/container/strip-rootfs.sh
--- a/.gitlab-ci/container/debian/test-vk.sh
+++ b/.gitlab-ci/container/debian/test-vk.sh
@@ -1,154 +0,0 @@
-#!/usr/bin/env bash
-# The relative paths in this file only become valid at runtime.
-# shellcheck disable=SC1091
-# shellcheck disable=SC2086 # we want word splitting
-
-set -e
-
-. .gitlab-ci/setup-test-env.sh
-
-set -o xtrace
-
-uncollapsed_section_start debian_setup "Base Debian system setup"
-
-export DEBIAN_FRONTEND=noninteractive
-
-# Ephemeral packages (installed for this script and removed again at the end)
-EPHEMERAL=(
-    ccache
-    cmake
-    dpkg-dev
-    g++
-    glslang-tools
-    libexpat1-dev
-    gnupg2
-    libdrm-dev
-    libgbm-dev
-    libgles2-mesa-dev
-    liblz4-dev
-    libpciaccess-dev
-    libudev-dev
-    libvulkan-dev
-    libwaffle-dev
-    libx11-xcb-dev
-    libxcb-dri2-0-dev
-    libxcb-ewmh-dev
-    libxcb-keysyms1-dev
-    libxkbcommon-dev
-    libxrandr-dev
-    libxrender-dev
-    libzstd-dev
-    meson
-    p7zip
-    patch
-    pkgconf
-    python3-dev
-    python3-distutils
-    python3-pip
-    python3-setuptools
-    python3-wheel
-    xz-utils
-)
-
-DEPS=(
-    libfontconfig1
-    libglu1-mesa
-)
-
-if [ "$DEBIAN_ARCH" != "armhf" ]; then
-  # Wine isn't available on 32-bit ARM
-  EPHEMERAL+=(
-    wine64-tools
-  )
-  DEPS+=(
-    wine
-    wine64
-  )
-fi
-
-apt-get update
-
-apt-get install -y --no-remove --no-install-recommends \
-      "${DEPS[@]}" "${EPHEMERAL[@]}" "${EXTRA_LOCAL_PACKAGES:-}"
-
-############### Building ...
-
-. .gitlab-ci/container/container_pre_build.sh
-
-section_end debian_setup
-
-############### Build piglit replayer
-
-if [ "$DEBIAN_ARCH" != "armhf" ]; then
-  # We don't run any _piglit_ Vulkan tests in the containers.
-  PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
-              -DPIGLIT_USE_GBM=OFF
-              -DPIGLIT_USE_WAYLAND=OFF
-              -DPIGLIT_USE_X11=OFF
-              -DPIGLIT_BUILD_GLX_TESTS=OFF
-              -DPIGLIT_BUILD_EGL_TESTS=OFF
-              -DPIGLIT_BUILD_WGL_TESTS=OFF
-              -DPIGLIT_BUILD_GL_TESTS=OFF
-              -DPIGLIT_BUILD_GLES1_TESTS=OFF
-              -DPIGLIT_BUILD_GLES2_TESTS=OFF
-              -DPIGLIT_BUILD_GLES3_TESTS=OFF
-              -DPIGLIT_BUILD_CL_TESTS=OFF
-              -DPIGLIT_BUILD_VK_TESTS=OFF
-              -DPIGLIT_BUILD_DMA_BUF_TESTS=OFF" \
-  PIGLIT_BUILD_TARGETS="piglit_replayer" \
-  . .gitlab-ci/container/build-piglit.sh
-fi
-
-############### Build dEQP VK
-
-DEQP_API=tools \
-DEQP_TARGET=default \
-. .gitlab-ci/container/build-deqp.sh
-
-if [ "$DEBIAN_ARCH" == "amd64" ]; then
-  DEQP_API=VK-main \
-  DEQP_TARGET=default \
-  . .gitlab-ci/container/build-deqp.sh
-fi
-
-DEQP_API=VK \
-DEQP_TARGET=default \
-. .gitlab-ci/container/build-deqp.sh
-
-rm -rf /VK-GL-CTS
-
-############### Build Fossilize
-
-if [ "$DEBIAN_ARCH" != "armhf" ]; then
-  . .gitlab-ci/container/build-fossilize.sh
-fi
-
-############### Build gfxreconstruct
-
-# gfxreconstruct thinks that ARMv7-on-AArch64 is cross-compilation
-if [ "$DEBIAN_ARCH" != "armhf" ]; then
-  . .gitlab-ci/container/build-gfxreconstruct.sh
-fi
-
-############### Build VKD3D-Proton
-
-# Wine isn't available on 32-bit ARM
-if [ "$DEBIAN_ARCH" != "armhf" ]; then
-  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
-fi
-
-############### Uninstall the build software
-
-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
-
-############### Remove unused packages
-
-. .gitlab-ci/container/strip-rootfs.sh
--- 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=(
@@ -33,7 +28,6 @@ DEPS=(
    "clang-${LLVM_VERSION}"
    "clang-format-${LLVM_VERSION}"
    dpkg-cross
-    dpkg-dev
    findutils
    flex
    flatbuffers-compiler
@@ -52,6 +46,7 @@ DEPS=(
    libflatbuffers-dev
    libgtk-3-dev
    "libllvm${LLVM_VERSION}"
+    libomxil-bellagio-dev
    libpciaccess-dev
    libunwind-dev
    libva-dev
@@ -67,7 +62,6 @@ DEPS=(
    libxtensor-dev
    libxxf86vm-dev
    libwayland-egl-backend-dev
-    "llvm-${LLVM_VERSION}-dev"
    make
    ninja-build
    openssh-server
@@ -76,10 +70,8 @@ DEPS=(
    python3-pil
    python3-pip
    python3-ply
-    python3-pycparser
    python3-requests
    python3-setuptools
-    python3-yaml
    qemu-user
    valgrind
    x11proto-dri2-dev
@@ -102,7 +94,8 @@ apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
 # Needed for ci-fairy, this revision is able to upload files to S3
 pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2

-. .gitlab-ci/container/install-meson.sh
+# We need at least 1.3.1 for rusticl
+pip3 install --break-system-packages 'meson==1.3.1'

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

--- 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
@@ -85,9 +81,14 @@ rm -rf $XORGMACROS_VERSION

 . .gitlab-ci/container/build-directx-headers.sh

-. .gitlab-ci/container/build-bindgen.sh
+python3 -m pip install --break-system-packages -r .gitlab-ci/lava/requirements.txt

-python3 -m pip install --break-system-packages -r bin/ci/requirements.txt
+# install bindgen
+RUSTFLAGS='-L native=/usr/local/lib' cargo install \
+  bindgen-cli --version 0.62.0 \
+  --locked \
+  -j ${FDO_CI_CONCURRENT:-4} \
+  --root /usr/local

 ############### Uninstall the build software

--- a/.gitlab-ci/container/debian/x86_64_pyutils.sh
+++ b/.gitlab-ci/container/debian/x86_64_pyutils.sh
@@ -1,67 +0,0 @@
-#!/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_PYUTILS_TAG
-
-set -e
-
-. .gitlab-ci/setup-test-env.sh
-
-set -o xtrace
-
-export DEBIAN_FRONTEND=noninteractive
-
-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
-
-# Ephemeral packages (installed for this script and removed again at
-# the end)
-EPHEMERAL=(
-    binutils
-    build-essential
-    cpp
-    dpkg-dev
-    g++
-    gcc
-    libc6-dev
-    perl
-    python3-dev
-)
-
-DEPS=(
-    apt-utils
-    curl
-    file
-    findutils
-    git
-    python3-pil
-    python3-pip
-    python3-ply
-    python3-setuptools
-    python3-venv
-    python3-yaml
-    shellcheck
-    xz-utils
-    yamllint
-    zstd
-)
-
-apt-get update
-
-apt-get install -y --no-remove --no-install-recommends "${DEPS[@]}" "${EPHEMERAL[@]}" \
-        "${EXTRA_LOCAL_PACKAGES:-}"
-
-# Needed for ci-fairy, this revision is able to upload files to S3
-pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
-
-pip3 install --break-system-packages -r bin/ci/test/requirements.txt
-
-############### Uninstall ephemeral packages
-
-apt-get purge -y "${EPHEMERAL[@]}"
-apt-get autoremove --purge -y
-
-. .gitlab-ci/container/container_post_build.sh
--- 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,18 +32,12 @@ 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"
 rm "$ndk.zip"

-############### Build ANGLE
-
-ANGLE_TARGET=android \
-DEBIAN_ARCH=amd64 \
-. .gitlab-ci/container/build-angle.sh
-
 ############### Build dEQP runner

 export ANDROID_NDK_HOME=/$ndk
@@ -59,65 +45,42 @@ export RUST_TARGET=x86_64-linux-android
 . .gitlab-ci/container/build-rust.sh
 . .gitlab-ci/container/build-deqp-runner.sh

-# Properly uninstall rustup including cargo and init scripts on shells
-rustup self uninstall -y
+rm -rf /root/.cargo
+rm -rf /root/.rustup

-############### Build dEQP
+############### Build dEQP GL

-DEQP_API=tools \
+DEQP_API=GL \
 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" \
+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 ...

-uncollapsed_section_start cuttlefish "Downloading, building and installing Cuttlefish"
-
-CUTTLEFISH_PROJECT_PATH=ao2/aosp-manifest
-CUTTLEFISH_BUILD_VERSION_TAGS=mesa-venus
-CUTTLEFISH_BUILD_NUMBER=20250215.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_only_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_only_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip"
-
-unzip aosp_cf_x86_64_only_phone-img-$CUTTLEFISH_BUILD_NUMBER.zip
-rm aosp_cf_x86_64_only_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
@@ -126,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
@@ -136,52 +101,10 @@ rm -rf android-cuttlefish
 addgroup --system kvm
 usermod -a -G kvm,cvdnetwork root

-section_end cuttlefish
-
-############### Downloading Android CTS tools
-
-uncollapsed_section_start android-cts "Downloading Android CTS tools"
-
-ANDROID_CTS_VERSION="${ANDROID_VERSION}_r1"
-ANDROID_CTS_DEVICE_ARCH="x86"
-
-mkdir /android-tools
-pushd /android-tools
-
-curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-  -o "android-cts-${ANDROID_CTS_VERSION}-linux_x86-${ANDROID_CTS_DEVICE_ARCH}.zip" \
-  "https://dl.google.com/dl/android/cts/android-cts-${ANDROID_CTS_VERSION}-linux_x86-${ANDROID_CTS_DEVICE_ARCH}.zip"
-unzip "android-cts-${ANDROID_CTS_VERSION}-linux_x86-${ANDROID_CTS_DEVICE_ARCH}.zip"
-rm "android-cts-${ANDROID_CTS_VERSION}-linux_x86-${ANDROID_CTS_DEVICE_ARCH}.zip"
-
-# Keep only the interesting tests to save space
-# shellcheck disable=SC2086 # we want word splitting
-ANDROID_CTS_MODULES_KEEP_EXPRESSION=$(printf "%s|" $ANDROID_CTS_MODULES | sed -e 's/|$//g')
-find android-cts/testcases/ -mindepth 1 -type d | grep -v -E "$ANDROID_CTS_MODULES_KEEP_EXPRESSION" | xargs rm -rf
-
-curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-  -o "build-tools_r${ANDROID_SDK_VERSION}-linux.zip" "https://dl.google.com/android/repository/build-tools_r${ANDROID_SDK_VERSION}-linux.zip"
-unzip "build-tools_r${ANDROID_SDK_VERSION}-linux.zip"
-rm "build-tools_r${ANDROID_SDK_VERSION}-linux.zip"
-mv "android-$ANDROID_VERSION" build-tools
-
-popd
-
-section_end android-cts
-
 ############### Uninstall the build software

-uncollapsed_section_switch debian_cleanup "Cleaning up base Debian system"
-
 rm -rf "/${ndk:?}"

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

 . .gitlab-ci/container/container_post_build.sh
-
-section_end debian_cleanup
-
-############### Remove unused packages
-
-. .gitlab-ci/container/strip-rootfs.sh
--- a/.gitlab-ci/container/debian/x86_64_test-base.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-base.sh
@@ -1,4 +1,160 @@
 #!/usr/bin/env bash
+# shellcheck disable=SC2086 # we want word splitting

-DEBIAN_ARCH=amd64 \
-. .gitlab-ci/container/debian/test-base.sh
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_BASE_TAG
+
+set -e
+set -o xtrace
+
+export DEBIAN_FRONTEND=noninteractive
+
+apt-get install -y ca-certificates gnupg2 software-properties-common
+
+sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list.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
+
+export LLVM_VERSION="${LLVM_VERSION:=15}"
+
+# Ephemeral packages (installed for this script and removed again at the end)
+EPHEMERAL=(
+    autoconf
+    automake
+    bc
+    bison
+    bzip2
+    ccache
+    cmake
+    "clang-${LLVM_VERSION}"
+    flex
+    glslang-tools
+    g++
+    libasound2-dev
+    libcap-dev
+    "libclang-cpp${LLVM_VERSION}-dev"
+    libdrm-dev
+    libegl-dev
+    libelf-dev
+    libepoxy-dev
+    libgbm-dev
+    libpciaccess-dev
+    libssl-dev
+    libvulkan-dev
+    libwayland-dev
+    libx11-xcb-dev
+    libxext-dev
+    "llvm-${LLVM_VERSION}-dev"
+    make
+    meson
+    openssh-server
+    patch
+    pkgconf
+    protobuf-compiler
+    python3-dev
+    python3-pip
+    python3-setuptools
+    python3-wheel
+    spirv-tools
+    wayland-protocols
+    xz-utils
+)
+
+DEPS=(
+    apt-utils
+    curl
+    git
+    git-lfs
+    inetutils-syslogd
+    iptables
+    jq
+    libasan8
+    libdrm2
+    libexpat1
+    "libllvm${LLVM_VERSION}"
+    liblz4-1
+    libpng16-16
+    libpython3.11
+    libvulkan1
+    libwayland-client0
+    libwayland-server0
+    libxcb-ewmh2
+    libxcb-randr0
+    libxcb-xfixes0
+    libxkbcommon0
+    libxrandr2
+    libxrender1
+    python3-mako
+    python3-numpy
+    python3-packaging
+    python3-pil
+    python3-requests
+    python3-six
+    python3-yaml
+    socat
+    vulkan-tools
+    waffle-utils
+    xauth
+    xvfb
+    zlib1g
+    zstd
+)
+
+apt-get update
+apt-get dist-upgrade -y
+
+apt-get install --purge -y \
+      sysvinit-core libelogind0
+
+apt-get install -y --no-remove "${DEPS[@]}"
+
+apt-get install -y --no-install-recommends "${EPHEMERAL[@]}"
+
+. .gitlab-ci/container/container_pre_build.sh
+
+############### Build kernel
+
+export DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+export KERNEL_IMAGE_NAME=bzImage
+export KERNEL_ARCH=x86_64
+export DEBIAN_ARCH=amd64
+
+mkdir -p /lava-files/
+. .gitlab-ci/container/build-kernel.sh
+
+# Needed for ci-fairy, this revision is able to upload files to MinIO
+# and doesn't depend on git
+pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
+
+# Needed for manipulation with traces yaml files.
+pip3 install --break-system-packages yq
+
+. .gitlab-ci/container/build-mold.sh
+
+############### Build LLVM-SPIRV translator
+
+. .gitlab-ci/container/build-llvm-spirv.sh
+
+############### Build libclc
+
+. .gitlab-ci/container/build-libclc.sh
+
+############### Build Wayland
+
+. .gitlab-ci/container/build-wayland.sh
+
+############### Build Crosvm
+
+. .gitlab-ci/container/build-rust.sh
+. .gitlab-ci/container/build-crosvm.sh
+
+############### Build dEQP runner
+. .gitlab-ci/container/build-deqp-runner.sh
+
+
+apt-get purge -y "${EPHEMERAL[@]}"
+
+rm -rf /root/.rustup
+
+. .gitlab-ci/container/container_post_build.sh
--- a/.gitlab-ci/container/debian/x86_64_test-gl.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-gl.sh
@@ -1,4 +1,109 @@
 #!/usr/bin/env bash
+# shellcheck disable=SC2086 # we want word splitting

-DEBIAN_ARCH="amd64" \
-. .gitlab-ci/container/debian/test-gl.sh
+set -e
+set -o xtrace
+
+export DEBIAN_FRONTEND=noninteractive
+export LLVM_VERSION="${LLVM_VERSION:=15}"
+
+apt-get install -y libelogind0  # this interfere with systemd deps, install separately
+
+# Ephemeral packages (installed for this script and removed again at the end)
+EPHEMERAL=(
+    bzip2
+    ccache
+    "clang-${LLVM_VERSION}"
+    cmake
+    g++
+    glslang-tools
+    libasound2-dev
+    libcap-dev
+    "libclang-cpp${LLVM_VERSION}-dev"
+    libdrm-dev
+    libgles2-mesa-dev
+    libgtest-dev
+    libpciaccess-dev
+    libpng-dev
+    libudev-dev
+    libvulkan-dev
+    libwaffle-dev
+    libwayland-dev
+    libx11-xcb-dev
+    libxcb-dri2-0-dev
+    libxcb-dri3-dev
+    libxcb-present-dev
+    libxfixes-dev
+    libxkbcommon-dev
+    libxrandr-dev
+    libxrender-dev
+    "llvm-${LLVM_VERSION}-dev"
+    make
+    meson
+    ocl-icd-opencl-dev
+    patch
+    pkgconf
+    python3-distutils
+    xz-utils
+)
+
+DEPS=(
+    clinfo
+    iptables
+    kmod
+    "libclang-common-${LLVM_VERSION}-dev"
+    "libclang-cpp${LLVM_VERSION}"
+    libcap2
+    libegl1
+    libepoxy0
+    libfdt1
+    libxcb-shm0
+    ocl-icd-libopencl1
+    python3-lxml
+    python3-renderdoc
+    python3-simplejson
+    spirv-tools
+    sysvinit-core
+    weston
+    xwayland
+)
+
+apt-get update
+
+apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
+      $EXTRA_LOCAL_PACKAGES
+
+
+. .gitlab-ci/container/container_pre_build.sh
+
+############### Build piglit
+
+PIGLIT_OPTS="-DPIGLIT_BUILD_GLX_TESTS=ON -DPIGLIT_BUILD_CL_TESTS=ON -DPIGLIT_BUILD_DMA_BUF_TESTS=ON" . .gitlab-ci/container/build-piglit.sh
+
+############### Build dEQP GL
+
+DEQP_API=GL \
+DEQP_TARGET=surfaceless \
+. .gitlab-ci/container/build-deqp.sh
+
+DEQP_API=GLES \
+DEQP_TARGET=surfaceless \
+. .gitlab-ci/container/build-deqp.sh
+
+############### Build apitrace
+
+. .gitlab-ci/container/build-apitrace.sh
+
+############### Build validation layer for zink
+
+. .gitlab-ci/container/build-vulkan-validation.sh
+
+############### Build nine tests
+
+. .gitlab-ci/container/build-ninetests.sh
+
+############### Uninstall the build software
+
+apt-get purge -y "${EPHEMERAL[@]}"
+
+. .gitlab-ci/container/container_post_build.sh
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Joshua Ashton	aa5bc3e41f	wsi: Implement linux-drm-syncobj-v1 This implements explicit sync with linux-drm-syncobj-v1 for the Wayland WSI. Signed-off-by: Joshua Ashton <joshua@froggi.es>	2024-03-27 17:49:03 +00:00
Joshua Ashton	e4e3436d45	wsi: Add common infrastructure for explicit sync Signed-off-by: Joshua Ashton <joshua@froggi.es>	2024-03-27 17:49:03 +00:00
Joshua Ashton	becb5d5161	wsi: Get timeline semaphore exportable handle types We need to know this for explicit sync Signed-off-by: Joshua Ashton <joshua@froggi.es>	2024-03-27 17:44:16 +00:00
Joshua Ashton	06c2af994b	wsi: Track CPU side present ordering via a serial We will use this in our hueristics to pick the most optimal buffer in AcquireNextImageKHR Signed-off-by: Joshua Ashton <joshua@froggi.es>	2024-03-25 21:00:54 +00:00
Joshua Ashton	d9cbc79941	wsi: Add acquired member to wsi_image Tracks whether this wsi_image has been acquired by the app Signed-off-by: Joshua Ashton <joshua@froggi.es>	2024-03-25 21:00:54 +00:00
Joshua Ashton	e209b02b97	wsi: Track if timeline semaphores are supported This will be needed before we expose and use explicit sync. Even if the host Wayland compositor supports timeline semaphores, in the case of Venus, etc the underlying driver may not. Signed-off-by: Joshua Ashton <joshua@froggi.es>	2024-03-22 00:24:26 +00:00
Joshua Ashton	8a098f591b	build: Add linux-drm-syncobj-v1 wayland protocol Signed-off-by: Joshua Ashton <joshua@froggi.es>	2024-03-22 00:24:26 +00:00
Joshua Ashton	754f52e1e1	wsi: Add explicit_sync to wsi_drm_image_params Allow the WSI frontend to request explicit sync buffers. Signed-off-by: Joshua Ashton <joshua@froggi.es>	2024-03-22 00:24:26 +00:00
Joshua Ashton	00dba3992c	wsi: Add explicit_sync to wsi_image_info Will be used in future for specifying explicit sync for Vulkan WSI when supported. Additionally cleans up wsi_create_buffer_blit_context, etc.. Signed-off-by: Joshua Ashton <joshua@froggi.es>	2024-03-22 00:24:26 +00:00
Joshua Ashton	9c8f205131	wsi: Pass wsi_drm_image_params to wsi_configure_prime_image Signed-off-by: Joshua Ashton <joshua@froggi.es>	2024-03-20 17:21:27 +00:00
Joshua Ashton	f17f43b149	wsi: Pass wsi_drm_image_params to wsi_configure_native_image No need to split this out into function parameters, it's just less clean. Signed-off-by: Joshua Ashton <joshua@froggi.es>	2024-03-20 17:21:26 +00:00