upstream-forks/mesa 1c53ba7 · Times of ferdiOS

Remove CI

Sander committed on 2026-09-04 · 1c53ba7

200 files changed +0 −15306

− .ci-farms-disabled/.placeholder
− .ci-farms-disabled/anholt
− .ci-farms/.placeholder
− .ci-farms/austriancoder
− .ci-farms/collabora
− .ci-farms/igalia
− .ci-farms/lima
− .ci-farms/microsoft
− .ci-farms/ondracka
− .ci-farms/pengutronix
− .ci-farms/valve-kws
− .ci-farms/valve-mupuf
− .ci-farms/vmware
− .github/workflows/macos.yml
− .gitlab-ci.yml
− .gitlab-ci/.flake8
− .gitlab-ci/all-flakes.txt
− .gitlab-ci/all-single-thread.txt
− .gitlab-ci/all-skips.txt
− .gitlab-ci/all-slow-skips.txt
− .gitlab-ci/android-cts-runner.sh
− .gitlab-ci/android-deqp-runner.sh
− .gitlab-ci/android-runner.sh
− .gitlab-ci/android-skips.txt
− .gitlab-ci/angle-skips.txt
− .gitlab-ci/bare-metal/.editorconfig
− .gitlab-ci/bare-metal/bm-init.sh
− .gitlab-ci/bare-metal/gitlab-ci.yml
− .gitlab-ci/bare-metal/poe-off
− .gitlab-ci/bare-metal/poe-on
− .gitlab-ci/bare-metal/poe-powered.sh
− .gitlab-ci/bare-metal/poe_run.py
− .gitlab-ci/bare-metal/rootfs-setup.sh
− .gitlab-ci/bare-metal/serial_buffer.py
− .gitlab-ci/bin
− .gitlab-ci/build/gitlab-ci-inc.yml
− .gitlab-ci/build/gitlab-ci.yml
− .gitlab-ci/ci-tron/gitlab-ci.yml
− .gitlab-ci/common/capture-devcoredump.sh
− .gitlab-ci/common/init-stage1.sh
− .gitlab-ci/common/init-stage2.sh
− .gitlab-ci/common/intel-gpu-freq.sh
− .gitlab-ci/common/kdl.sh
− .gitlab-ci/common/weston.ini
− .gitlab-ci/common/weston.sh
− .gitlab-ci/conditional-build-image-tags.yml
− .gitlab-ci/container/alpine/gitlab-ci.yml
− .gitlab-ci/container/alpine/x86_64_build.sh
− .gitlab-ci/container/baremetal_build.sh
− .gitlab-ci/container/build-android-cts.sh
− .gitlab-ci/container/build-android-x86_64-llvm.sh
− .gitlab-ci/container/build-angle.sh
− .gitlab-ci/container/build-apitrace.sh
− .gitlab-ci/container/build-bindgen.sh
− .gitlab-ci/container/build-crosvm.sh
− .gitlab-ci/container/build-deqp-runner.sh
− .gitlab-ci/container/build-deqp.sh
− .gitlab-ci/container/build-directx-headers.sh
− .gitlab-ci/container/build-fluster.sh
− .gitlab-ci/container/build-fossilize.sh
− .gitlab-ci/container/build-gfxreconstruct.sh
− .gitlab-ci/container/build-kdl.sh
− .gitlab-ci/container/build-libclc.sh
− .gitlab-ci/container/build-libdrm.sh
− .gitlab-ci/container/build-llvm-spirv.sh
− .gitlab-ci/container/build-mold.sh
− .gitlab-ci/container/build-perfetto.sh
− .gitlab-ci/container/build-piglit.sh
− .gitlab-ci/container/build-rust.sh
− .gitlab-ci/container/build-shader-db.sh
− .gitlab-ci/container/build-skqp.sh
− .gitlab-ci/container/build-skqp_base.gn
− .gitlab-ci/container/build-va-tools.sh
− .gitlab-ci/container/build-vkd3d-proton.sh
− .gitlab-ci/container/build-vulkan-validation.sh
− .gitlab-ci/container/build-wayland.sh
− .gitlab-ci/container/build-weston.sh
− .gitlab-ci/container/build-xwayland.sh
− .gitlab-ci/container/container_job_trampoline.sh
− .gitlab-ci/container/container_post_build.sh
− .gitlab-ci/container/container_pre_build.sh
− .gitlab-ci/container/create-android-cross-file.sh
− .gitlab-ci/container/create-android-ndk-pc.sh
− .gitlab-ci/container/create-cross-file.sh
− .gitlab-ci/container/cross_build.sh
− .gitlab-ci/container/debian/android_build.sh
− .gitlab-ci/container/debian/arm32_test-base.sh
− .gitlab-ci/container/debian/arm32_test-gl.sh
− .gitlab-ci/container/debian/arm32_test-vk.sh
− .gitlab-ci/container/debian/arm64_build.sh
− .gitlab-ci/container/debian/arm64_test-android-tools.sh
− .gitlab-ci/container/debian/arm64_test-android.sh
− .gitlab-ci/container/debian/arm64_test-base.sh
− .gitlab-ci/container/debian/arm64_test-gl.sh
− .gitlab-ci/container/debian/arm64_test-vk.sh
− .gitlab-ci/container/debian/baremetal_arm32_test-gl.sh
− .gitlab-ci/container/debian/baremetal_arm64_test-gl.sh
− .gitlab-ci/container/debian/baremetal_arm64_test-vk.sh
− .gitlab-ci/container/debian/baremetal_arm_test.sh
− .gitlab-ci/container/debian/gitlab-ci.yml
− .gitlab-ci/container/debian/llvm-snapshot.gpg.key
− .gitlab-ci/container/debian/maybe-add-llvm-repo.sh
− .gitlab-ci/container/debian/ppc64el_build.sh
− .gitlab-ci/container/debian/riscv64_build.sh
− .gitlab-ci/container/debian/s390x_build.sh
− .gitlab-ci/container/debian/test-android.sh
− .gitlab-ci/container/debian/test-base.sh
− .gitlab-ci/container/debian/test-gl.sh
− .gitlab-ci/container/debian/test-vk.sh
− .gitlab-ci/container/debian/winehq.gpg.key
− .gitlab-ci/container/debian/x86_32_build.sh
− .gitlab-ci/container/debian/x86_64_build-base.sh
− .gitlab-ci/container/debian/x86_64_build.sh
− .gitlab-ci/container/debian/x86_64_test-android.sh
− .gitlab-ci/container/debian/x86_64_test-base.sh
− .gitlab-ci/container/debian/x86_64_test-gl.sh
− .gitlab-ci/container/debian/x86_64_test-video.sh
− .gitlab-ci/container/debian/x86_64_test-vk.sh
− .gitlab-ci/container/fdo_cntr_export.sh
− .gitlab-ci/container/fedora/gitlab-ci.yml
− .gitlab-ci/container/fedora/x86_64_build.sh
− .gitlab-ci/container/gitlab-ci-inc.yml
− .gitlab-ci/container/gitlab-ci.yml
− .gitlab-ci/container/install-meson.sh
− .gitlab-ci/container/install-wine-apitrace.sh
− .gitlab-ci/container/install-wine-dxvk.sh
− .gitlab-ci/container/patches/build-deqp-gl_Build-Don-t-build-Vulkan-utilities-for-GL-builds.patch
− .gitlab-ci/container/patches/build-perfetto-Fix-C-standard-library-build-errors-with-Debian-13.patch
− .gitlab-ci/container/patches/build-skqp_BUILD.gn.patch
− .gitlab-ci/container/patches/build-skqp_fetch_gn.patch
− .gitlab-ci/container/patches/build-skqp_git-sync-deps.patch
− .gitlab-ci/container/patches/build-skqp_gl.patch
− .gitlab-ci/container/patches/build-skqp_include_cstdint.patch
− .gitlab-ci/container/patches/build-skqp_is_clang.py.patch
− .gitlab-ci/container/patches/build-skqp_nima.patch
− .gitlab-ci/container/patches/weston-no-xwm.patch
− .gitlab-ci/container/setup-rootfs.sh
− .gitlab-ci/container/setup-wine.sh
− .gitlab-ci/container/strip-rootfs.sh
− .gitlab-ci/container/windows/gitlab-ci.yml
− .gitlab-ci/create-llvm-meson-wrap-file.sh
− .gitlab-ci/cross-xfail-ppc64el
− .gitlab-ci/cross-xfail-s390x
− .gitlab-ci/crosvm-init.sh
− .gitlab-ci/crosvm-runner.sh
− .gitlab-ci/cuttlefish-runner.sh
− .gitlab-ci/deqp-runner.sh
− .gitlab-ci/docs
− .gitlab-ci/download-git-cache.sh
− .gitlab-ci/farm-rules.yml
− .gitlab-ci/fossilize-runner.sh
− .gitlab-ci/fossils.yml
− .gitlab-ci/fossils/fossils.sh
− .gitlab-ci/fossils/query_fossils_yaml.py
− .gitlab-ci/image-tags.yml
− .gitlab-ci/lava/gitlab-ci.yml
− .gitlab-ci/lava/lava-submit.sh
− .gitlab-ci/meson/build.sh
− .gitlab-ci/meson/time-strace.sh
− .gitlab-ci/meson/time.sh
− .gitlab-ci/piglit/disable-vs_in.diff
− .gitlab-ci/piglit/piglit-traces.sh
− .gitlab-ci/prepare-artifacts.sh
− .gitlab-ci/report-flakes.py
− .gitlab-ci/run-pytest.sh
− .gitlab-ci/run-shader-db.sh
− .gitlab-ci/run-shellcheck.sh
− .gitlab-ci/run-yamllint.sh
− .gitlab-ci/setup-test-env.sh
− .gitlab-ci/test-source-dep.yml
− .gitlab-ci/test/gitlab-ci-inc.yml
− .gitlab-ci/test/gitlab-ci.yml
− .gitlab-ci/vkd3d-runner.sh
− .gitlab-ci/windows/Dockerfile_build
− .gitlab-ci/windows/Dockerfile_msvc
− .gitlab-ci/windows/Dockerfile_test
− .gitlab-ci/windows/README.md
− .gitlab-ci/windows/deqp_runner_run.ps1
− .gitlab-ci/windows/mesa_build.ps1
− .gitlab-ci/windows/mesa_container.ps1
− .gitlab-ci/windows/mesa_deps_build.ps1
− .gitlab-ci/windows/mesa_deps_d3d.ps1
− .gitlab-ci/windows/mesa_deps_libva.ps1
− .gitlab-ci/windows/mesa_deps_msvc.ps1
− .gitlab-ci/windows/mesa_deps_packages.ps1
− .gitlab-ci/windows/mesa_deps_rust.ps1
− .gitlab-ci/windows/mesa_deps_test.ps1
− .gitlab-ci/windows/mesa_deps_test_deqp.ps1
− .gitlab-ci/windows/mesa_deps_test_piglit.ps1
− .gitlab-ci/windows/mesa_deps_vulkan_sdk.ps1
− .gitlab-ci/windows/mesa_deps_winget.ps1
− .gitlab-ci/windows/mesa_deps_winget_settings.json
− .gitlab-ci/windows/mesa_init_msvc.ps1
− .gitlab-ci/windows/piglit_run.ps1
− .gitlab-ci/windows/spirv2dxil_check.ps1
− .gitlab-ci/windows/spirv2dxil_run.ps1
− .gitlab-ci/windows/vainfo_run.ps1
− .gitlab/issue_templates/Bug Report - AMD Radeon Vulkan.md
− .gitlab/issue_templates/Bug Report.md
− .gitlab/merge_request_templates/Default.md

diff --git a/.ci-farms-disabled/.placeholder b/.ci-farms-disabled/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/.ci-farms-disabled/anholt b/.ci-farms-disabled/anholt
deleted file mode 100644
index e69de29..0000000
diff --git a/.ci-farms/.placeholder b/.ci-farms/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/.ci-farms/austriancoder b/.ci-farms/austriancoder
deleted file mode 100644
index e69de29..0000000
diff --git a/.ci-farms/collabora b/.ci-farms/collabora
deleted file mode 100644
index e69de29..0000000
diff --git a/.ci-farms/igalia b/.ci-farms/igalia
deleted file mode 100644
index e69de29..0000000
diff --git a/.ci-farms/lima b/.ci-farms/lima
deleted file mode 100644
index e69de29..0000000
diff --git a/.ci-farms/microsoft b/.ci-farms/microsoft
deleted file mode 100644
index e69de29..0000000
diff --git a/.ci-farms/ondracka b/.ci-farms/ondracka
deleted file mode 100644
index e69de29..0000000
diff --git a/.ci-farms/pengutronix b/.ci-farms/pengutronix
deleted file mode 100644
index e69de29..0000000
diff --git a/.ci-farms/valve-kws b/.ci-farms/valve-kws
deleted file mode 100644
index e69de29..0000000
diff --git a/.ci-farms/valve-mupuf b/.ci-farms/valve-mupuf
deleted file mode 100644
index e69de29..0000000
diff --git a/.ci-farms/vmware b/.ci-farms/vmware
deleted file mode 100644
index e69de29..0000000
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
deleted file mode 100644
index 7a24ce1..0000000
--- a/.github/workflows/macos.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-name: macOS-CI
-on: push
-
-permissions:
-  contents: read
-
-jobs:
-  macOS-CI:
-    strategy:
-      matrix:
-        glx_option: ['dri', 'xlib']
-    runs-on: macos-11
-    env:
-      GALLIUM_DUMP_CPU: true
-      MESON_EXEC: /Users/runner/Library/Python/3.11/bin/meson
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-    - name: Install Dependencies
-      run: |
-        cat > Brewfile <<EOL
-        brew "bison"
-        brew "expat"
-        brew "gettext"
-        brew "libx11"
-        brew "libxcb"
-        brew "libxdamage"
-        brew "libxext"
-        brew "molten-vk"
-        brew "ninja"
-        brew "pkg-config"
-        brew "python@3.10"
-        EOL
-
-        brew update
-        brew bundle --verbose
-    - name: Install Mako and meson
-      run: pip3 install --user mako meson
-    - name: Configure
-      run: |
-        cat > native_config <<EOL
-        [binaries]
-        llvm-config = '/usr/local/opt/llvm/bin/llvm-config'
-        EOL
-        $MESON_EXEC . build --native-file=native_config -Dmoltenvk-dir=$(brew --prefix molten-vk) -Dbuild-tests=true -Dgallium-drivers=swrast,zink -Dglx=${{ matrix.glx_option }}
-    - name: Build
-      run: $MESON_EXEC compile -C build
-    - name: Test
-      run: $MESON_EXEC test -C build --print-errorlogs
-    - name: Install
-      run: $MESON_EXEC install -C build --destdir $PWD/install
-    - name: 'Upload Artifact'
-      if: always()
-      uses: actions/upload-artifact@v3
-      with:
-        name: macos-${{ matrix.glx_option }}-result
-        path: |
-          build/meson-logs/
-          install/
-        retention-days: 5
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 04fe129..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,427 +0,0 @@
-# Types of CI pipelines:
-# | pipeline name        | context   | description                                                 |
-# |----------------------|-----------|-------------------------------------------------------------|
-# | merge pipeline       | mesa/mesa | pipeline running for an MR; if it passes the MR gets merged |
-# | pre-merge pipeline   | mesa/mesa | same as above, except its status doesn't affect the MR      |
-# | post-merge pipeline  | mesa/mesa | pipeline immediately after merging                          |
-# | fork pipeline        | fork      | pipeline running in a user fork                             |
-# | scheduled pipeline   | mesa/mesa | nightly pipelines, running every morning at 4am UTC         |
-# | direct-push pipeline | mesa/mesa | when commits are pushed directly to mesa/mesa, bypassing Marge and its gating pipeline |
-#
-# Note that the release branches maintained by the release manager fall under
-# the "direct push" category.
-#
-# "context" indicates the permissions that the jobs get; notably, any
-# container created in mesa/mesa gets pushed immediately for everyone to use
-# as soon as the image tag change is merged.
-#
-# Merge pipelines contain all jobs that must pass before the MR can be merged.
-# Pre-merge pipelines contain the exact same jobs as merge pipelines.
-# Post-merge pipelines contain *only* the `pages` job that deploys the new
-# version of the website.
-# Fork pipelines contain everything.
-# Scheduled pipelines only contain the container+build jobs, and some extra
-# test jobs (typically "full" variants of pre-merge jobs that only run 1/X
-# test cases), but not a repeat of the merge pipeline jobs.
-# Direct-push pipelines contain the same jobs as merge pipelines.
-
-workflow:
-  rules:
-    # do not duplicate pipelines on merge pipelines
-    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"
-      when: never
-    # Tag pipelines are disabled as it's too late to run all the tests by
-    # then, the release has been made based on the staging pipelines results
-    - if: $CI_COMMIT_TAG
-      when: never
-    # Merge pipeline
-    - if: &is-merge-attempt $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"
-      variables:
-        MESA_CI_PERFORMANCE_ENABLED: 1
-        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: high
-        JOB_PRIORITY: 75
-        # fast-fail in merge pipelines: stop early if we get this many unexpected fails/crashes
-        DEQP_RUNNER_MAX_FAILS: 40
-    # Post-merge pipeline
-    - if: &is-post-merge $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "push"
-      variables:
-        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
-    # Pre-merge pipeline (because merge pipelines are already caught above)
-    - if: &is-merge-request $CI_PIPELINE_SOURCE == "merge_request_event"
-    # Push to a branch on a fork
-    - if: &is-push-to-fork $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
-        CI_TRON_JOB_PRIORITY: low
-        JOB_PRIORITY: 45
-        # (some) nightly builds perform LTO, so they take much longer than the
-        # short timeout allowed in other pipelines.
-        # Note: 0 = infinity = gitlab's job `timeout:` applies, which is 1h
-        BUILD_JOB_TIMEOUT_OVERRIDE: 0
-    # Pipeline for direct pushes to the default branch that bypassed the CI
-    - if: &is-push-to-upstream-default-branch $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
-      variables:
-        JOB_PRIORITY: 70
-    # Pipeline for direct pushes from release maintainer
-    - if: &is-push-to-upstream-staging-branch $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME =~ /^staging\//
-      variables:
-        JOB_PRIORITY: 70
-
-
-variables:
-  FDO_UPSTREAM_REPO: mesa/mesa
-  MESA_TEMPLATES_COMMIT: &ci-templates-commit aec7a6ce7bb38902c70641526f6611e27141784a
-  CI_PRE_CLONE_SCRIPT: |-
-          set -o xtrace
-          curl --silent --location --fail --retry-connrefused --retry 3 --retry-delay 10 \
-            ${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/download-git-cache.sh | bash
-          set +o xtrace
-  S3_JWT_FILE: /s3_jwt
-  S3_JWT_FILE_SCRIPT: |-
-      echo -n '${S3_JWT}' > '${S3_JWT_FILE}' &&
-      S3_JWT_FILE_SCRIPT= &&
-      unset CI_JOB_JWT S3_JWT  # Unsetting vulnerable env variables
-  S3_HOST: s3.freedesktop.org
-  # This bucket is used to fetch ANDROID prebuilts and images
-  S3_ANDROID_BUCKET: mesa-rootfs
-  # This bucket is used to fetch the kernel image
-  S3_KERNEL_BUCKET: mesa-rootfs
-  # Bucket for git cache
-  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
-  # Base path used for various artifacts
-  S3_BASE_PATH: "${S3_HOST}/${S3_KERNEL_BUCKET}"
-  # per-pipeline artifact storage on MinIO
-  PIPELINE_ARTIFACTS_BASE: ${S3_HOST}/${S3_ARTIFACTS_BUCKET}/${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"
-  # For individual CI farm status see .ci-farms folder
-  # Disable farm with   `git mv .ci-farms{,-disabled}/$farm_name`
-  # Re-enable farm with `git mv .ci-farms{-disabled,}/$farm_name`
-  # NEVER MIX FARM MAINTENANCE WITH ANY OTHER CHANGE IN THE SAME MERGE REQUEST!
-  ARTIFACTS_BASE_URL: https://${CI_PROJECT_ROOT_NAMESPACE}.${CI_PAGES_DOMAIN}/-/${CI_PROJECT_NAME}/-/jobs/${CI_JOB_ID}/artifacts
-  # 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: default
-  JOB_PRIORITY: 50
-  DATA_STORAGE_PATH: data_storage
-  KERNEL_IMAGE_BASE: "https://$S3_HOST/$S3_KERNEL_BUCKET/$KERNEL_REPO/$KERNEL_TAG"
-  # Mesa-specific variables that shouldn't be forwarded to DUTs and crosvm
-  CI_EXCLUDE_ENV_VAR_REGEX: 'SCRIPTS_DIR|RESULTS_DIR'
-
-  CI_TRON_JOB_TEMPLATE_PROJECT: &ci-tron-template-project gfx-ci/ci-tron
-  CI_TRON_JOB_TEMPLATE_COMMIT: &ci-tron-template-commit d649a2829517b078a3cb8f3c2e6c8775a5992abb
-  CI_TRON_JOB_TEMPLATE_PROJECT_URL: "https://gitlab.freedesktop.org/$CI_TRON_JOB_TEMPLATE_PROJECT"
-
-
-default:
-  timeout: 1m  # catch any jobs which don't specify a timeout
-  id_tokens:
-    S3_JWT:
-      aud: https://s3.freedesktop.org
-  before_script:
-    - >
-      export SCRIPTS_DIR=$(mktemp -d) &&
-      curl -L -s --retry 4 -f --retry-all-errors --retry-delay 60 -O --output-dir "${SCRIPTS_DIR}" "${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/setup-test-env.sh" &&
-      . ${SCRIPTS_DIR}/setup-test-env.sh
-    - eval "$S3_JWT_FILE_SCRIPT"
-
-  # 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:
-    max: 1
-    # Ignore runner_unsupported, stale_schedule, archived_failure, or
-    # unmet_prerequisites
-    when:
-      - api_failure
-      - runner_system_failure
-      - script_failure
-      - job_execution_timeout
-      - scheduler_failure
-      - data_integrity_failure
-      - unknown_failure
-
-stages:
-  - sanity
-  - container
-  - git-archive
-  - build-for-tests
-  - build-only
-  - code-validation
-  - amd
-  - amd-nightly
-  - intel
-  - intel-nightly
-  - nouveau
-  - nouveau-nightly
-  - arm
-  - arm-nightly
-  - broadcom
-  - broadcom-nightly
-  - freedreno
-  - freedreno-nightly
-  - etnaviv
-  - etnaviv-nightly
-  - imagination-nightly
-  - software-renderer
-  - software-renderer-nightly
-  - layered-backends
-  - layered-backends-nightly
-  - performance
-  - deploy
-
-include:
-  - project: 'freedesktop/ci-templates'
-    ref: *ci-templates-commit
-    file:
-      - '/templates/alpine.yml'
-      - '/templates/debian.yml'
-      - '/templates/fedora.yml'
-      - '/templates/ci-fairy.yml'
-  - project: *ci-tron-template-project
-    ref: *ci-tron-template-commit
-    file: '/.gitlab-ci/dut.yml'
-  - local: '.gitlab-ci/image-tags.yml'
-  - local: '.gitlab-ci/bare-metal/gitlab-ci.yml'
-  - local: '.gitlab-ci/ci-tron/gitlab-ci.yml'
-  - local: '.gitlab-ci/lava/gitlab-ci.yml'
-  - local: '.gitlab-ci/container/gitlab-ci.yml'
-  - local: '.gitlab-ci/build/gitlab-ci.yml'
-  - local: '.gitlab-ci/test/gitlab-ci.yml'
-  - local: '.gitlab-ci/farm-rules.yml'
-  - local: '.gitlab-ci/test-source-dep.yml'
-  - local: 'docs/gitlab-ci.yml'
-  - local: 'src/**/ci/gitlab-ci.yml'
-
-
-# Rules applied to every job in the pipeline
-.common-rules:
-  rules:
-    - if: *is-push-to-fork
-      when: manual
-
-.never-post-merge-rules:
-  rules:
-    - if: *is-post-merge
-      when: never
-
-
-# Note: make sure the branches in this list are the same as in
-# `.build-only-delayed-rules` below.
-.container-rules:
-  rules:
-    - !reference [.common-rules, rules]
-    # Run when re-enabling a disabled farm, but not when disabling it
-    - !reference [.disable-farm-rules, rules]
-    # Never run immediately after merging, as we just ran everything
-    - !reference [.never-post-merge-rules, rules]
-    # Only rebuild containers in merge pipelines if any tags have been
-    # changed, else we'll just use the already-built containers
-    - if: *is-merge-attempt
-      changes: &image_tags_path
-        - .gitlab-ci.yml
-        - .gitlab-ci/image-tags.yml
-      when: on_success
-    # Skip everything for pre-merge and merge pipelines which don't change
-    # anything in the build; we only do this for marge-bot and not user
-    # pipelines in a MR, because we might still need to run it to copy the
-    # container into the user's namespace.
-    - if: *is-merge-attempt
-      when: never
-    # Any MR pipeline which changes image-tags.yml needs to be able to
-    # rebuild the containers
-    - if: *is-merge-request
-      changes: *image_tags_path
-      when: manual
-    # ... if the MR pipeline runs as mesa/mesa and does not need a container
-    # rebuild, we can skip it
-    - if: &is-upstream-mr-pipeline $CI_PROJECT_PATH == $FDO_UPSTREAM_REPO && $CI_PIPELINE_SOURCE == "merge_request_event"
-      when: never
-    # ... however for MRs running inside the user namespace, we may need to
-    # run these jobs to copy the container images from upstream
-    - if: *is-merge-request
-      when: manual
-    # Build everything after someone bypassed the CI
-    - if: *is-push-to-upstream-default-branch
-      when: on_success
-    # Build everything when pushing to staging branches
-    - if: *is-push-to-upstream-staging-branch
-      when: on_success
-    # Scheduled pipelines reuse already-built containers
-    - if: *is-scheduled-pipeline
-      when: never
-    # Any other pipeline in the upstream should reuse already-built containers
-    - if: &is-upstream-pipeline $CI_PROJECT_PATH == $FDO_UPSTREAM_REPO
-      when: never
-    # Allow building everything in fork pipelines, but build nothing unless
-    # manually triggered
-    - when: manual
-
-# Note: make sure the branches in this list are the same as in
-# `.build-only-delayed-rules` below.
-.build-rules:
-  rules:
-    - !reference [.common-rules, rules]
-    # Run when re-enabling a disabled farm, but not when disabling it
-    - !reference [.disable-farm-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
-        - VERSION
-        - bin/git_sha1_gen.py
-        - bin/install_megadrivers.py
-        - bin/symbols-check.py
-        - bin/ci/**/*
-        # GitLab CI
-        - .gitlab-ci.yml
-        - .gitlab-ci/**/*
-        - .ci-farms/*
-        # Meson
-        - meson*
-        - build-support/**/*
-        - subprojects/**/*
-        # clang format
-        - .clang-format
-        - .clang-format-include
-        - .clang-format-ignore
-        # Source code
-        - include/**/*
-        - src/**/*
-      when: on_success
-    # Same as above, but for pre-merge pipelines
-    - if: *is-merge-request
-      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-merge-request
-      when: never
-    # Build everything after someone bypassed the CI
-    - if: *is-push-to-upstream-default-branch
-      when: on_success
-    # Build everything when pushing to staging branches
-    - if: *is-push-to-upstream-staging-branch
-      when: on_success
-    # Build everything in scheduled pipelines
-    - if: *is-scheduled-pipeline
-      when: on_success
-    # Allow building everything in fork pipelines, but build nothing unless
-    # 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-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-merge-request
-      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-merge-request
-      when: never
-    # Build everything after someone bypassed the CI
-    - if: *is-push-to-upstream-default-branch
-      when: delayed
-      start_in: *build-delay
-    # Build everything when pushing to staging branches
-    - if: *is-push-to-upstream-staging-branch
-      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
-
-# Sanity checks of MR settings and commit logs
-sanity:
-  extends:
-    - .fdo.ci-fairy
-  stage: sanity
-  tags:
-    - placeholder-job
-  rules:
-    - if: *is-merge-request
-      when: on_success
-    - when: never
-  variables:
-    GIT_STRATEGY: none
-  script:
-    # ci-fairy check-commits --junit-xml=check-commits.xml
-    # ci-fairy check-merge-request --require-allow-collaboration --junit-xml=check-merge-request.xml
-    - |
-      set -eu
-      image_tags=(
-        ALPINE_X86_64_BUILD_TAG
-        DEBIAN_BUILD_BASE_TAG
-        DEBIAN_BUILD_TAG
-        DEBIAN_TEST_BASE_TAG
-        DEBIAN_TEST_ANDROID_TAG
-        DEBIAN_TEST_GL_TAG
-        DEBIAN_TEST_VK_TAG
-        FEDORA_X86_64_BUILD_TAG
-        FIRMWARE_TAG
-        KERNEL_TAG
-        PKG_REPO_REV
-        WINDOWS_X64_BUILD_TAG
-        WINDOWS_X64_MSVC_TAG
-        WINDOWS_X64_TEST_TAG
-      )
-      for var in "${image_tags[@]}"
-      do
-        if [ "$(echo -n "${!var}" | wc -c)" -gt 20 ]
-        then
-          echo "$var is too long; please make sure it is at most 20 chars."
-          exit 1
-        fi
-      done
-  artifacts:
-    when: on_failure
-    reports:
-      junit: check-*.xml
diff --git a/.gitlab-ci/.flake8 b/.gitlab-ci/.flake8
deleted file mode 100644
index 1be72fc..0000000
--- a/.gitlab-ci/.flake8
+++ /dev/null
@@ -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,
diff --git a/.gitlab-ci/all-flakes.txt b/.gitlab-ci/all-flakes.txt
deleted file mode 100644
index 1d8cb66..0000000
--- a/.gitlab-ci/all-flakes.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# wsi_common_display.c doesn't properly hand off the oldSwapchain to the new one,
-# and you can end up trying to atomic commit before the last present has flipped,
-# and the kernel throws an error.
-dEQP-VK.wsi.direct.present_timing.basic.retired_swapchain
-dEQP-VK.wsi.direct_drm.present_timing.basic.retired_swapchain
diff --git a/.gitlab-ci/all-single-thread.txt b/.gitlab-ci/all-single-thread.txt
deleted file mode 100644
index 3ba0995..0000000
--- a/.gitlab-ci/all-single-thread.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-# These tests require DRM master priveleges (sole access to the device),
-# otherwise they return Skip.
-dEQP-VK.wsi.direct.*
-dEQP-VK.wsi.acquire_drm.*
-
-# These tests try to allocate up to half of the device memory, which doesn't go
-# well when other tests are running in parallel.
-dEQP-VK.memory.mapping.*.full.variable.implicit_unmap
-dEQP-VK.memory.mapping.*.full.variable.implicit_unmap_map2
-
-# These allocate 600+MB of just the string for the spirv assembly in addition to
-# normal deqp-vk memory overhead, which loves to thrash swap with other tests.
-dEQP-VK.spirv_assembly.instruction.*.spirv_ids_abuse.lots_ids.*
-
-# 2GB GPU memory for zink-tu
-spec@!opengl 1.2@tex3d-maxsize
-# 1GB GPU memory for a 16kx16k-sized driver.
-spec@ext_framebuffer_object@fbo-maxsize
-# 6GB GPU memory for zink-tu
-spec@!opengl 1.1@max-texture-size
-
-# 2GB GPU memory on tu
-vkd3d-test_committed_non_zeroed_behavior_stress
-# 600MB GPU memory on tu
-vkd3d-test_fence_ping_pong_deadlock_stress_plain
-# 2GB GPU memory on tu
-vkd3d-test_heap_non_zeroed_behavior_stress
-# 500MB GPU memory on tu
-vkd3d-test_fence_wait_robustness
-# Allocates a 2GB texel buffer
-vkd3d-test_large_texel_buffer_view
-# 550MB GPU memory on tu
-vkd3d-test_placed_image_alignment
-# Allocates until heap OOM.
-vkd3d-test_stress_fallback_render_target_allocation_device
-# 3GB GPU memory on tu
-vkd3d-test_stress_suballocation_multithread
-# 2GB GPU memory on tu
-vkd3d-test_stress_suballocation_rebar
diff --git a/.gitlab-ci/all-skips.txt b/.gitlab-ci/all-skips.txt
deleted file mode 100644
index fc2440f..0000000
--- a/.gitlab-ci/all-skips.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-# Note: skips lists for CI are just a list of lines that, when
-# non-zero-length and not starting with '#', will regex match to
-# delete lines from the test list.  Be careful.
-
-# This test checks the driver's reported conformance version against the
-# version of the CTS we're running. This check fails every few months
-# and everyone has to go and bump the number in every driver.
-# Running this check only makes sense while preparing a conformance
-# submission, so skip it in the regular CI.
-dEQP-VK.api.driver_properties.conformance_version
-
-# Exclude this test which might fail when a new extension is implemented.
-dEQP-VK.info.device_extensions
-
-# These are tremendously slow (pushing toward a minute), and aren't
-# reliable to be run in parallel with other tests due to CPU-side timing.
-dEQP-GLES[0-9]*.functional.flush_finish.*
-
-# piglit: WGL is Windows-only
-wgl@.*
-
-# These are sensitive to CPU timing, and would need to be run in isolation
-# on the system rather than in parallel with other tests.
-glx@glx_arb_sync_control@timing.*
-
-# This test is not built with waffle, while we do build tests with waffle
-spec@!opengl 1.1@windowoverlap
-
-# 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
-
-# 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.
-#
-# piglit should probably be fixed to throw skip on this platform
-spec@!opengl 1.0@gl-1.0-swapbuffers-behavior
-spec@!opengl 1.1@read-front
-
-# Skip test everywhere
-# Because even with a 256x256 map, it is over 1 GiB of texture memory
-# allocated
-# Also, individually, it was disabled in most of the tests as it is
-# either too slow or results in an OOM
-spec@!opengl 1.1@streaming-texture-leak
-
-# Fails everywhere, invalid test: https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/6317
-dEQP-VK.spirv_assembly.instruction.*.float_controls2.*.input_args.mat_det_testedWithout_NotNaN_arg1_nan_arg2_one_res_nan*
-dEQP-VK.spirv_assembly.instruction.*.float_controls2.*.input_args.cross_testedWithout_NotNaN_arg1_nan_arg2_one_res_nan*
diff --git a/.gitlab-ci/all-slow-skips.txt b/.gitlab-ci/all-slow-skips.txt
deleted file mode 100644
index 4d0a0ec..0000000
--- a/.gitlab-ci/all-slow-skips.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# These are variants of
-# dEQP-VK.memory.mapping.suballocation.full.variable.implicit_unmap* that
-# are very slow (often 30s on DUTs) due to allocating, mapping, filling,
-# and reading back 32GB of memory, while not providing interesting pre-merge
-# coverage for us.
-dEQP-VK.memory.mapping.dedicated_alloc.*.implicit_unmap.*
diff --git a/.gitlab-ci/android-cts-runner.sh b/.gitlab-ci/android-cts-runner.sh
deleted file mode 100755
index 2ae31b6..0000000
--- a/.gitlab-ci/android-cts-runner.sh
+++ /dev/null
@@ -1,76 +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"
-
-ci_tag_test_time_check "ANDROID_CTS_TAG"
-
-export PATH=/android-cts/jdk/bin/:$PATH
-export JAVA_HOME=/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 -e 's/\s*$//g' -e 's/.*/--exclude-filter "\0" /g')"
-fi
-
-INCLUDE_FILE="$INSTALL/${GPU_VERSION}-android-cts-include.txt"
-
-if [ ! -e "$INCLUDE_FILE" ]; then
-  set +x
-  echo "ERROR: No include file (${GPU_VERSION}-android-cts-include.txt) found."
-  echo "This means that we are running the all available CTS modules."
-  echo "But the time to run it might be too long, please provide an include file instead."
-  exit 1
-fi
-
-INCLUDE_FILTERS="$(grep -v -E "(^#|^[[:space:]]*$)" "$INCLUDE_FILE" | sed -e 's/\s*$//g' -e 's/.*/--include-filter "\0" /g')"
-
-if [ -n "${ANDROID_CTS_PREPARE_COMMAND:-}" ]; then
-  eval "$ANDROID_CTS_PREPARE_COMMAND"
-fi
-
-uncollapsed_section_switch android_cts_test "Android CTS: testing"
-
-set +e
-eval "/android-cts/tools/cts-tradefed" run commandAndExit cts-dev \
-  $INCLUDE_FILTERS \
-  $EXCLUDE_FILTERS
-
-SUMMARY_FILE=/android-cts/results/latest/invocation_summary.txt
-
-# Parse a line like `x/y modules completed` to check that all modules completed
-COMPLETED_MODULES=$(sed -n -e '/modules completed/s/^\([0-9]\+\)\/\([0-9]\+\) .*$/\1/p' "$SUMMARY_FILE")
-AVAILABLE_MODULES=$(sed -n -e '/modules completed/s/^\([0-9]\+\)\/\([0-9]\+\) .*$/\2/p' "$SUMMARY_FILE")
-[ "$COMPLETED_MODULES" = "$AVAILABLE_MODULES" ]
-# shellcheck disable=SC2319  # False-positive see https://github.com/koalaman/shellcheck/issues/2937#issuecomment-2660891195
-MODULES_FAILED=$?
-
-# Parse a line like `FAILED            : x` to check that no tests failed
-[ "$(grep "^FAILED" "$SUMMARY_FILE" | tr -d ' ' | cut -d ':' -f 2)" = "0" ]
-# shellcheck disable=SC2319  # False-positive see https://github.com/koalaman/shellcheck/issues/2937#issuecomment-2660891195
-TESTS_FAILED=$?
-
-[ "$MODULES_FAILED" = "0" ] && [ "$TESTS_FAILED" = "0" ]
-
-# shellcheck disable=SC2034 # EXIT_CODE is used by the script that sources this one
-EXIT_CODE=$?
-set -e
-
-mkdir "${RESULTS_DIR}/android-cts"
-cp -r "/android-cts/results/latest/" "${RESULTS_DIR}/android-cts/results"
-cp -r "/android-cts/logs/latest/" "${RESULTS_DIR}/android-cts/logs"
-
-if [ -n "${ARTIFACTS_BASE_URL:-}" ]; then
-  echo "============================================"
-  echo "Review the Android CTS test results at: ${ARTIFACTS_BASE_URL}/results/android-cts/results/test_result.html"
-fi
-
-section_end android_cts_test
-
-exit $EXIT_CODE
diff --git a/.gitlab-ci/android-deqp-runner.sh b/.gitlab-ci/android-deqp-runner.sh
deleted file mode 100755
index 5714a6a..0000000
--- a/.gitlab-ci/android-deqp-runner.sh
+++ /dev/null
@@ -1,112 +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-gles/modules/gles2/deqp-gles2 /data/deqp
-$ADB push /deqp-gles/mustpass/gles2-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/android-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"
-
-DEQP_SKIPS=""
-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"
-
-# Print the detailed version with the list of backports and local patches
-{ set +x; } 2>/dev/null
-for api in vk-main vk gl gles; do
-  deqp_version_log=/deqp-$api/deqp-$api-version
-  if [ -r "$deqp_version_log" ]; then
-    cat "$deqp_version_log"
-  fi
-done
-set -x
-
-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
-
-exit $EXIT_CODE
diff --git a/.gitlab-ci/android-runner.sh b/.gitlab-ci/android-runner.sh
deleted file mode 100755
index 1a15e1b..0000000
--- a/.gitlab-ci/android-runner.sh
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-# shellcheck disable=SC1091 # paths only become valid at runtime
-
-set -uex
-
-# 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
-
-$ADB push /android-tools/eglinfo /data
-$ADB push /android-tools/vulkaninfo /data
-
-get_gles_runtime_renderer() {
-  while [ "$($ADB shell XDG_CACHE_HOME=/data/local/tmp /data/eglinfo | grep 'OpenGL ES profile renderer':)" = "" ] ; do sleep 1; done
-  $ADB shell XDG_CACHE_HOME=/data/local/tmp /data/eglinfo | grep 'OpenGL ES profile renderer' | head -1
-}
-
-get_gles_runtime_version() {
-  while [ "$($ADB shell XDG_CACHE_HOME=/data/local/tmp /data/eglinfo | grep 'OpenGL ES profile version:')" = "" ] ; do sleep 1; done
-  $ADB shell XDG_CACHE_HOME=/data/local/tmp /data/eglinfo | grep 'OpenGL ES profile version:' | head -1
-}
-
-get_vk_runtime_device_name() {
-  $ADB shell XDG_CACHE_HOME=/data/local/tmp /data/vulkaninfo | grep deviceName | head -1
-}
-
-get_vk_runtime_version() {
-  $ADB shell XDG_CACHE_HOME=/data/local/tmp /data/vulkaninfo | grep driverInfo | head -1
-}
-
-# Check what GLES & VK implementation is used before uploading the new libraries
-get_gles_runtime_renderer
-get_gles_runtime_version
-get_vk_runtime_device_name
-get_vk_runtime_version
-
-# 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
-
-# Remove and replace Vulkan drivers
-if [ "${CUTTLEFISH_GPU_MODE:-}" = "venus" ] || [ "${CUTTLEFISH_GPU_MODE:-}" = "venus_guest_angle" ]; then
-  $ADB shell rm -f /vendor/lib64/hw/vulkan.virtio.so*
-  $ADB push "$INSTALL/lib/libvulkan_virtio.so" /vendor/lib64/hw/vulkan.virtio.so
-else
-  $ADB shell rm -f /vendor/lib64/hw/vulkan.${VK_DRIVER}.so*
-  $ADB push "$INSTALL/lib/libvulkan_${VK_DRIVER}.so" /vendor/lib64/hw/vulkan.${VK_DRIVER}.so
-fi
-
-$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*
-
-if [ -n "${ANGLE_TAG:-}" ]; then
-  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"
-fi
-
-# Check what GLES & VK implementation is used after uploading the new libraries
-MESA_BUILD_VERSION=$(cat "$INSTALL/VERSION")
-get_gles_runtime_renderer
-GLES_RUNTIME_VERSION="$(get_gles_runtime_version)"
-get_vk_runtime_device_name
-VK_RUNTIME_VERSION="$(get_vk_runtime_version)"
-
-if [ -n "${ANGLE_TAG:-}" ]; then
-  # Note: we are injecting the ANGLE libs too, so we need to check if the
-  #       new ANGLE libs are being used.
-  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
-fi
-
-if ! printf "%s" "$VK_RUNTIME_VERSION" | grep -Fq -- "${MESA_BUILD_VERSION}"; then
-     echo "Fatal: Android is loading a wrong version of the Mesa3D Vulkan libs: ${VK_RUNTIME_VERSION}" 1>&2
-     exit 1
-fi
-
-get_surfaceflinger_pid() {
-  while [ "$($ADB shell dumpsys -l | grep 'SurfaceFlinger$')" = "" ] ; do sleep 1; done
-  $ADB shell ps -A | grep -i surfaceflinger | tr -s ' ' | cut -d ' ' -f 2
-}
-
-OLD_SF_PID=$(get_surfaceflinger_pid)
-
-# restart Android shell, so that services use the new libraries
-$ADB shell stop
-$ADB shell start
-
-# Check that SurfaceFlinger restarted, to ensure that new libraries have been picked up
-NEW_SF_PID=$(get_surfaceflinger_pid)
-
-if [ "$OLD_SF_PID" == "$NEW_SF_PID" ]; then
-     echo "Fatal: check that SurfaceFlinger restarted" 1>&2
-     exit 1
-fi
-
-# These should be the last commands of the script in order to correctly
-# propagate the exit code.
-if [ -n "${ANDROID_CTS_TAG:-}" ]; then
-  . "$(dirname "$0")/android-cts-runner.sh"
-else
-  . "$(dirname "$0")/android-deqp-runner.sh"
-fi
diff --git a/.gitlab-ci/android-skips.txt b/.gitlab-ci/android-skips.txt
deleted file mode 100644
index 21e9e2f..0000000
--- a/.gitlab-ci/android-skips.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Skip these tests when running fractional dEQP batches, as the AHB tests are expected
-# to be handled separately  in a non-fractional run within the deqp-runner suite.
-dEQP-VK.api.external.memory.android_hardware_buffer.*
-
-# Skip all WSI tests: the DEQP_ANDROID_EXE build used can't create native windows, as
-# only APKs support window creation on Android.
-dEQP-VK.image.swapchain_mutable.*
-dEQP-VK.wsi.*
diff --git a/.gitlab-ci/angle-skips.txt b/.gitlab-ci/angle-skips.txt
deleted file mode 100644
index 4ccedad..0000000
--- a/.gitlab-ci/angle-skips.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Unlike zink which does support it, ANGLE relies on a waiver to not implement
-# capturing individual array elements (see waivers.xml and gles3-waivers.txt in the CTS)
-dEQP-GLES3.functional.transform_feedback.array_element.*
-dEQP-GLES3.functional.transform_feedback.random.*
-dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.*_array_element
-dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.type.*.array.*
-KHR-GLES31.core.program_interface_query.transform-feedback-types
diff --git a/.gitlab-ci/bare-metal/.editorconfig b/.gitlab-ci/bare-metal/.editorconfig
deleted file mode 100644
index 71174ec..0000000
--- a/.gitlab-ci/bare-metal/.editorconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-[*.sh]
-indent_size = 2
diff --git a/.gitlab-ci/bare-metal/bm-init.sh b/.gitlab-ci/bare-metal/bm-init.sh
deleted file mode 100755
index 75a3ead..0000000
--- a/.gitlab-ci/bare-metal/bm-init.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Init entrypoint for bare-metal devices; calls common init code.
-
-# First stage: very basic setup to bring up network and /dev etc
-/init-stage1.sh
-INIT_STAGE1_EXIT_CODE=$?
-
-export CURRENT_SECTION=dut_boot
-
-# Second stage: run jobs
-test $INIT_STAGE1_EXIT_CODE -eq 0 && /init-stage2.sh
-
-# Wait until the job would have timed out anyway, so we don't spew a "init
-# exited" panic.
-sleep 6000
diff --git a/.gitlab-ci/bare-metal/gitlab-ci.yml b/.gitlab-ci/bare-metal/gitlab-ci.yml
deleted file mode 100644
index f7900cd..0000000
--- a/.gitlab-ci/bare-metal/gitlab-ci.yml
+++ /dev/null
@@ -1,121 +0,0 @@
-.baremetal-test:
-  extends:
-    - .test
-  # Cancel job if a newer commit is pushed to the same branch
-  interruptible: true
-  before_script:
-    - !reference [.download_s3, before_script]
-  variables:
-    BM_ROOTFS: /rootfs-${DEBIAN_ARCH}
-  artifacts:
-    when: always
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
-    paths:
-      - results/
-      - serial*.txt
-    exclude:
-      - results/*.shader_cache
-    reports:
-      junit: results/junit.xml
-
-# ARM testing of bare-metal boards attached to an x86 gitlab-runner system
-.baremetal-test-arm32-gl:
-  extends:
-    - .baremetal-test
-    - .use-debian/baremetal_arm32_test-gl
-  variables:
-    DEBIAN_ARCH: armhf
-    S3_ARTIFACT_NAME: mesa-arm32-default-debugoptimized
-  needs:
-    - job: debian/baremetal_arm32_test-gl
-      optional: true
-    - job: debian-arm32
-      artifacts: false
-
-# ARM64 testing of bare-metal boards attached to an x86 gitlab-runner system
-.baremetal-test-arm64-gl:
-  extends:
-    - .baremetal-test
-    - .use-debian/baremetal_arm64_test-gl
-  variables:
-    DEBIAN_ARCH: arm64
-    S3_ARTIFACT_NAME: mesa-arm64-default-debugoptimized
-  needs:
-    - job: debian/baremetal_arm64_test-gl
-      optional: true
-    - job: debian-arm64
-      artifacts: false
-
-# ARM64 testing of bare-metal boards attached to an x86 gitlab-runner system
-.baremetal-test-arm64-vk:
-  extends:
-    - .baremetal-test
-    - .use-debian/baremetal_arm64_test-vk
-  variables:
-    DEBIAN_ARCH: arm64
-    S3_ARTIFACT_NAME: mesa-arm64-default-debugoptimized
-  needs:
-    - job: debian/baremetal_arm64_test-vk
-      optional: true
-    - job: debian-arm64
-      artifacts: false
-
-# ARM32/64 testing of bare-metal boards attached to an x86 gitlab-runner system, using an asan mesa build
-.baremetal-arm32-asan-test-gl:
-  variables:
-    S3_ARTIFACT_NAME: mesa-arm32-asan-debugoptimized
-    DEQP_FORCE_ASAN: 1
-  needs:
-    - job: debian/baremetal_arm32_test-gl
-      optional: true
-    - job: debian-arm32-asan
-      artifacts: false
-
-.baremetal-arm64-asan-test-gl:
-  variables:
-    S3_ARTIFACT_NAME: mesa-arm64-asan-debugoptimized
-    DEQP_FORCE_ASAN: 1
-  needs:
-    - job: debian/baremetal_arm64_test-gl
-      optional: true
-    - job: debian-arm64-asan
-      artifacts: false
-
-.baremetal-arm64-asan-test-vk:
-  variables:
-    S3_ARTIFACT_NAME: mesa-arm64-asan-debugoptimized
-    DEQP_FORCE_ASAN: 1
-  needs:
-    - job: debian/baremetal_arm64_test-vk
-      optional: true
-    - job: debian-arm64-asan
-      artifacts: false
-
-.baremetal-arm64-ubsan-test-gl:
-  extends:
-    - .baremetal-test
-    - .use-debian/baremetal_arm64_test-gl
-  variables:
-    S3_ARTIFACT_NAME: mesa-arm64-ubsan-debugoptimized
-  needs:
-    - job: debian/baremetal_arm64_test-gl
-      optional: true
-    - job: debian-arm64-ubsan
-      artifacts: false
-
-.baremetal-arm64-ubsan-test-vk:
-  extends:
-    - .baremetal-test
-    - .use-debian/baremetal_arm64_test-vk
-  variables:
-    S3_ARTIFACT_NAME: mesa-arm64-ubsan-debugoptimized
-  needs:
-    - job: debian/baremetal_arm64_test-vk
-      optional: true
-    - job: debian-arm64-ubsan
-      artifacts: false
-
-.baremetal-deqp-test:
-  variables:
-    HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
-    FDO_CI_CONCURRENT: 0  # Default to number of CPUs
diff --git a/.gitlab-ci/bare-metal/poe-off b/.gitlab-ci/bare-metal/poe-off
deleted file mode 100755
index 6451720..0000000
--- a/.gitlab-ci/bare-metal/poe-off
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-if [ -z "$BM_POE_INTERFACE" ]; then
-    echo "Must supply the PoE Interface to power up"
-    exit 1
-fi
-
-if [ -z "$BM_POE_ADDRESS" ]; then
-    echo "Must supply the PoE Switch host"
-    exit 1
-fi
-
-SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.$((${BM_POE_BASE:-0} + 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"
diff --git a/.gitlab-ci/bare-metal/poe-on b/.gitlab-ci/bare-metal/poe-on
deleted file mode 100755
index c5fde69..0000000
--- a/.gitlab-ci/bare-metal/poe-on
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-if [ -z "$BM_POE_INTERFACE" ]; then
-    echo "Must supply the PoE Interface to power up"
-    exit 1
-fi
-
-if [ -z "$BM_POE_ADDRESS" ]; then
-    echo "Must supply the PoE Switch host"
-    exit 1
-fi
-
-SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.$((${BM_POE_BASE:-0} + BM_POE_INTERFACE))"
-SNMP_ON="i 1"
-SNMP_OFF="i 2"
-
-flock /var/run/poe.lock -c "snmpset -v2c -r 3 -t 30 -cmesaci $BM_POE_ADDRESS $SNMP_KEY $SNMP_OFF"
-sleep 3s
-flock /var/run/poe.lock -c "snmpset -v2c -r 3 -t 30 -cmesaci $BM_POE_ADDRESS $SNMP_KEY $SNMP_ON"
diff --git a/.gitlab-ci/bare-metal/poe-powered.sh b/.gitlab-ci/bare-metal/poe-powered.sh
deleted file mode 100755
index 116e6a9..0000000
--- a/.gitlab-ci/bare-metal/poe-powered.sh
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC1091
-# shellcheck disable=SC2034
-# shellcheck disable=SC2059
-# shellcheck disable=SC2086 # we want word splitting
-
-. "$SCRIPTS_DIR"/setup-test-env.sh
-
-# Boot script for devices attached to a PoE switch, using NFS for the root
-# filesystem.
-
-# We're run from the root of the repo, make a helper var for our paths
-BM=$CI_PROJECT_DIR/install/bare-metal
-CI_COMMON=$CI_PROJECT_DIR/install/common
-CI_INSTALL=$CI_PROJECT_DIR/install
-
-# Runner config checks
-if [ -z "$BM_SERIAL" ]; then
-  echo "Must set BM_SERIAL in your gitlab-runner config.toml [[runners]] environment"
-  echo "This is the serial port to listen the device."
-  exit 1
-fi
-
-if [ -z "$BM_POE_ADDRESS" ]; then
-  echo "Must set BM_POE_ADDRESS in your gitlab-runner config.toml [[runners]] environment"
-  echo "This is the PoE switch address to connect for powering up/down devices."
-  exit 1
-fi
-
-if [ -z "$BM_POE_INTERFACE" ]; then
-  echo "Must set BM_POE_INTERFACE in your gitlab-runner config.toml [[runners]] environment"
-  echo "This is the PoE switch interface where the device is connected."
-  exit 1
-fi
-
-if [ -z "$BM_POWERUP" ]; then
-  echo "Must set BM_POWERUP in your gitlab-runner config.toml [[runners]] environment"
-  echo "This is a shell script that should power up the device and begin its boot sequence."
-  exit 1
-fi
-
-if [ -z "$BM_POWERDOWN" ]; then
-  echo "Must set BM_POWERDOWN in your gitlab-runner config.toml [[runners]] environment"
-  echo "This is a shell script that should power off the device."
-  exit 1
-fi
-
-if [ ! -d /nfs ]; then
-  echo "NFS rootfs directory needs to be mounted at /nfs by the gitlab runner"
-  exit 1
-fi
-
-if [ ! -d /tftp ]; then
-  echo "TFTP directory for this board needs to be mounted at /tftp by the gitlab runner"
-  exit 1
-fi
-
-# job config checks
-if [ -z "$BM_ROOTFS" ]; then
-  echo "Must set BM_ROOTFS to your board's rootfs directory in the job's variables"
-  exit 1
-fi
-
-if [ -z "$BM_BOOTFS" ] && { [ -z "$BM_KERNEL" ] || [ -z "$BM_DTB" ]; } ; then
-  echo "Must set /boot files for the TFTP boot in the job's variables or set kernel and dtb"
-  exit 1
-fi
-
-if [ -z "$BM_CMDLINE" ]; then
-  echo "Must set BM_CMDLINE to your board's kernel command line arguments"
-  exit 1
-fi
-
-section_start prepare_rootfs "Preparing rootfs components"
-
-set -ex
-
-date +'%F %T'
-
-# Clear out any previous run's artifacts.
-rm -rf results/
-mkdir -p results
-
-# Create the rootfs in the NFS directory.  rm to make sure it's in a pristine
-# state, since it's volume-mounted on the host.
-rsync -a --delete $BM_ROOTFS/ /nfs/
-
-date +'%F %T'
-
-# If BM_BOOTFS is an URL, download it
-if echo $BM_BOOTFS | grep -q http; then
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    "${FDO_HTTP_CACHE_URI:-}$BM_BOOTFS" -o /tmp/bootfs.tar
-  BM_BOOTFS=/tmp/bootfs.tar
-fi
-
-date +'%F %T'
-
-# If BM_BOOTFS is a file, assume it is a tarball and uncompress it
-if [ -f "${BM_BOOTFS}" ]; then
-  mkdir -p /tmp/bootfs
-  tar xf $BM_BOOTFS -C /tmp/bootfs
-  BM_BOOTFS=/tmp/bootfs
-fi
-
-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 "${BM_BOOTFS}" ]; then
-  [ -d $BM_BOOTFS/usr/lib/modules ] && rsync -a $BM_BOOTFS/usr/lib/modules/ /nfs/usr/lib/modules/
-  [ -d $BM_BOOTFS/lib/modules ] && rsync -a $BM_BOOTFS/lib/modules/ /nfs/lib/modules/
-else
-  echo "No modules!"
-fi
-
-
-date +'%F %T'
-
-# Install kernel image + bootloader files
-if [ -z "$BM_BOOTFS" ]; then
-  mv "${BM_KERNEL}" "${BM_DTB}.dtb" /tftp/
-else  # BM_BOOTFS
-  rsync -aL --delete $BM_BOOTFS/boot/ /tftp/
-fi
-
-date +'%F %T'
-
-# Create the rootfs in the NFS directory
-. $BM/rootfs-setup.sh /nfs
-
-date +'%F %T'
-
-echo "$BM_CMDLINE" > /tftp/cmdline.txt
-
-# Add some options in config.txt, if defined
-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
-export PYTHONPATH=$CI_INSTALL
-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
-    python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update-dut-time submit "${CI_JOB_STARTED_AT}"
-  else
-    python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update-dut-time submit
-  fi
-  python3 $BM/poe_run.py \
-          --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}))}
-  ret=$?
-
-  if [ $ret -eq 2 ]; then
-    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
-
-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/
-
-date +'%F %T'
-section_end dut_cleanup
-
-exit $ret
diff --git a/.gitlab-ci/bare-metal/poe_run.py b/.gitlab-ci/bare-metal/poe_run.py
deleted file mode 100755
index d9c8841..0000000
--- a/.gitlab-ci/bare-metal/poe_run.py
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright © 2020 Igalia, S.L.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-import argparse
-import os
-import re
-import sys
-import threading
-
-from custom_logger import CustomLogger
-from serial_buffer import SerialBuffer
-
-class PoERun:
-    def __init__(self, args, boot_timeout, 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
-        self.test_timeout = test_timeout
-        self.logger = logger
-
-    def print_error(self, message):
-        RED = '\033[0;31m'
-        NO_COLOR = '\033[0m'
-        print(RED + message + NO_COLOR)
-        self.logger.update_status_fail(message)
-
-    def logged_system(self, cmd):
-        print("Running '{}'".format(cmd))
-        return os.system(cmd)
-
-    def run(self):
-        if self.logged_system(self.powerup) != 0:
-            self.logger.update_status_fail("powerup failed")
-            return 1
-
-        boot_detected = False
-        self.logger.create_job_phase("boot")
-        for line in self.ser.lines(timeout=self.boot_timeout, phase="bootloader"):
-            if re.search("Booting Linux", line):
-                boot_detected = True
-                break
-
-        if not boot_detected:
-            self.print_error(
-                "Something wrong; couldn't detect the boot start up sequence")
-            return 2
-
-        self.logger.create_job_phase("test")
-        for line in self.ser.lines(timeout=self.test_timeout, phase="test"):
-            if re.search("---. end Kernel panic", line):
-                self.logger.update_status_fail("kernel panic")
-                return 1
-
-            # Binning memory problems
-            if re.search("binner overflow mem", line):
-                self.print_error("Memory overflow in the binner; GPU hang")
-                return 1
-
-            if re.search("nouveau 57000000.gpu: bus: MMIO read of 00000000 FAULT at 137000", line):
-                self.print_error("nouveau jetson boot bug, abandoning run.")
-                return 1
-
-            # network fail on tk1
-            if re.search("NETDEV WATCHDOG:.* transmit queue 0 timed out", line):
-                self.print_error("nouveau jetson tk1 network fail, abandoning run.")
-                return 1
-
-            result = re.search(r"hwci: mesa: exit_code: (\d+)", line)
-            if result:
-                exit_code = int(result.group(1))
-
-                if exit_code == 0:
-                    self.logger.update_dut_job("status", "pass")
-                else:
-                    self.logger.update_status_fail("test fail")
-
-                self.logger.update_dut_job("exit_code", exit_code)
-                return exit_code
-
-        self.print_error(
-            "Reached the end of the CPU serial log without finding a result")
-        return 1
-
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--dev', type=str,
-                        help='Serial device to monitor', required=True)
-    parser.add_argument('--powerup', type=str,
-                        help='shell command for rebooting', required=True)
-    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)
-    args = parser.parse_args()
-
-    logger = CustomLogger("results/job_detail.json")
-    logger.update_dut_time("start", None)
-    poe = PoERun(args, args.boot_timeout_seconds, args.test_timeout_minutes * 60, logger)
-    retval = poe.run()
-
-    poe.logged_system(args.powerdown)
-    logger.update_dut_time("end", None)
-
-    sys.exit(retval)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/.gitlab-ci/bare-metal/rootfs-setup.sh b/.gitlab-ci/bare-metal/rootfs-setup.sh
deleted file mode 100644
index 90e45a6..0000000
--- a/.gitlab-ci/bare-metal/rootfs-setup.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-
-rootfs_dst=$1
-
-mkdir -p $rootfs_dst/results
-
-# Set up the init script that brings up the system.
-cp $BM/bm-init.sh $rootfs_dst/init
-cp $CI_COMMON/init*.sh $rootfs_dst/
-
-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}"
-
-date +'%F %T'
-
-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:"
-filter_env_vars | tee $rootfs_dst/set-job-env-vars.sh
-
-set -x
-
-# Add the Mesa drivers we built, and make a consistent symlink to them.
-mkdir -p $rootfs_dst/$CI_PROJECT_DIR
-rsync -aH --delete $CI_PROJECT_DIR/install/ $rootfs_dst/$CI_PROJECT_DIR/install/
-
-date +'%F %T'
diff --git a/.gitlab-ci/bare-metal/serial_buffer.py b/.gitlab-ci/bare-metal/serial_buffer.py
deleted file mode 100755
index f57060e..0000000
--- a/.gitlab-ci/bare-metal/serial_buffer.py
+++ /dev/null
@@ -1,186 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright © 2020 Google LLC
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-import argparse
-from datetime import datetime, UTC
-import queue
-import serial
-import threading
-import time
-
-
-class SerialBuffer:
-    def __init__(self, dev, filename, prefix, timeout=None, line_queue=None):
-        self.filename = filename
-        self.dev = dev
-
-        if dev:
-            self.f = open(filename, "wb+")
-            self.serial = serial.Serial(dev, 115200, timeout=timeout)
-        else:
-            self.f = open(filename, "rb")
-            self.serial = None
-
-        self.byte_queue = queue.Queue()
-        # allow multiple SerialBuffers to share a line queue so you can merge
-        # servo's CPU and EC streams into one thing to watch the boot/test
-        # progress on.
-        if line_queue:
-            self.line_queue = line_queue
-        else:
-            self.line_queue = queue.Queue()
-        self.prefix = prefix
-        self.timeout = timeout
-        self.sentinel = object()
-        self.closing = False
-
-        if self.dev:
-            self.read_thread = threading.Thread(
-                target=self.serial_read_thread_loop, daemon=True)
-        else:
-            self.read_thread = threading.Thread(
-                target=self.serial_file_read_thread_loop, daemon=True)
-        self.read_thread.start()
-
-        self.lines_thread = threading.Thread(
-            target=self.serial_lines_thread_loop, daemon=True)
-        self.lines_thread.start()
-
-    def close(self):
-        self.closing = True
-        if self.serial:
-            self.serial.cancel_read()
-        self.read_thread.join()
-        self.lines_thread.join()
-        if self.serial:
-            self.serial.close()
-
-    # Thread that just reads the bytes from the serial device to try to keep from
-    # buffer overflowing it. If nothing is received in 1 minute, it finalizes.
-    def serial_read_thread_loop(self):
-        greet = "Serial thread reading from %s\n" % self.dev
-        self.byte_queue.put(greet.encode())
-
-        while not self.closing:
-            try:
-                b = self.serial.read()
-                if len(b) == 0:
-                    break
-                self.byte_queue.put(b)
-            except Exception as err:
-                print(self.prefix + str(err))
-                break
-        self.byte_queue.put(self.sentinel)
-
-    # Thread that just reads the bytes from the file of serial output that some
-    # other process is appending to.
-    def serial_file_read_thread_loop(self):
-        greet = "Serial thread reading from %s\n" % self.filename
-        self.byte_queue.put(greet.encode())
-
-        while not self.closing:
-            line = self.f.readline()
-            if line:
-                self.byte_queue.put(line)
-            else:
-                time.sleep(0.1)
-        self.byte_queue.put(self.sentinel)
-
-    # Thread that processes the stream of bytes to 1) log to stdout, 2) log to
-    # file, 3) add to the queue of lines to be read by program logic
-
-    def serial_lines_thread_loop(self):
-        line = bytearray()
-        while True:
-            bytes = self.byte_queue.get(block=True)
-
-            if bytes == self.sentinel:
-                self.read_thread.join()
-                self.line_queue.put(self.sentinel)
-                break
-
-            # Write our data to the output file if we're the ones reading from
-            # the serial device
-            if self.dev:
-                self.f.write(bytes)
-                self.f.flush()
-
-            for b in bytes:
-                line.append(b)
-                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='')
-
-                    self.line_queue.put(line)
-                    line = bytearray()
-
-    def lines(self, timeout=None, phase=None):
-        start_time = time.monotonic()
-        while True:
-            read_timeout = None
-            if timeout:
-                read_timeout = timeout - (time.monotonic() - start_time)
-                if read_timeout <= 0:
-                    print("read timeout waiting for serial during {}".format(phase))
-                    self.close()
-                    break
-
-            try:
-                line = self.line_queue.get(timeout=read_timeout)
-            except queue.Empty:
-                print("read timeout waiting for serial during {}".format(phase))
-                self.close()
-                break
-
-            if line == self.sentinel:
-                print("End of serial output")
-                self.lines_thread.join()
-                break
-
-            yield line
-
-
-def main():
-    parser = argparse.ArgumentParser()
-
-    parser.add_argument('--dev', type=str, help='Serial device')
-    parser.add_argument('--file', type=str,
-                        help='Filename for serial output', required=True)
-    parser.add_argument('--prefix', type=str,
-                        help='Prefix for logging serial to stdout', nargs='?')
-
-    args = parser.parse_args()
-
-    ser = SerialBuffer(args.dev, args.file, args.prefix or "")
-    for line in ser.lines():
-        # We're just using this as a logger, so eat the produced lines and drop
-        # them
-        pass
-
-
-if __name__ == '__main__':
-    main()
diff --git a/.gitlab-ci/bin b/.gitlab-ci/bin
deleted file mode 120000
index 32fb7dc..0000000
--- a/.gitlab-ci/bin
+++ /dev/null
@@ -1 +0,0 @@
-../bin/ci
\ No newline at end of file
diff --git a/.gitlab-ci/build/gitlab-ci-inc.yml b/.gitlab-ci/build/gitlab-ci-inc.yml
deleted file mode 100644
index 2dae5ac..0000000
--- a/.gitlab-ci/build/gitlab-ci-inc.yml
+++ /dev/null
@@ -1,94 +0,0 @@
-.meson-build-for-tests:
-  extends:
-    - .build-linux
-  stage: build-for-tests
-  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
-
-# Shared between windows and Linux
-.build-common:
-  extends: .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: []
-  artifacts:
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
-    when: always
-    paths:
-      - _build/meson-logs/*.txt
-      - _build/meson-logs/strace
-      - _build/.ninja_log
-      - artifacts
-
-.build-run-long:
-  variables:
-    BUILD_JOB_TIMEOUT: 18m
-  timeout: 25m
-
-
-# Just Linux
-.build-linux:
-  extends: .build-common
-  variables:
-    C_ARGS: >
-      -Wno-error=deprecated-declarations
-    CCACHE_COMPILERCHECK: "content"
-    CCACHE_COMPRESS: "true"
-    CCACHE_DIR: /cache/mesa/ccache
-  # Use ccache transparently, and print stats before/after
-  before_script:
-    - !reference [default, before_script]
-    - |
-      export PATH="/usr/lib/ccache:$PATH"
-      export CCACHE_BASEDIR="$PWD"
-      if test -x /usr/bin/ccache; then
-        section_start ccache_before "ccache stats before build"
-        ccache --show-stats
-        section_end ccache_before
-      fi
-  after_script:
-    - if test -x /usr/bin/ccache; then ccache --show-stats | grep "Hits:"; fi
-
-.build-windows:
-  extends:
-    - .build-common
-    - .windows-docker-tags
-  cache:
-    key: ${CI_JOB_NAME}
-    paths:
-      - subprojects/packagecache
-
-.ci-deqp-artifacts:
-  artifacts:
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
-    when: always
-    untracked: false
-    paths:
-      # Watch out!  Artifacts are relative to the build dir.
-      # https://gitlab.com/gitlab-org/gitlab-ce/commit/8788fb925706cad594adf6917a6c5f6587dd1521
-      - artifacts
-      - _build/meson-logs/*.txt
-      - _build/meson-logs/strace
-      - _build/.ninja_log
diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
deleted file mode 100644
index 50c8b0e..0000000
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ /dev/null
@@ -1,765 +0,0 @@
-include:
-  - local: '.gitlab-ci/build/gitlab-ci-inc.yml'
-
-# Git archive
-
-make-git-archive:
-  extends:
-    - .fdo.ci-fairy
-  stage: git-archive
-  rules:
-    - !reference [.scheduled_pipeline-rules, rules]
-  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 --location https://github.com/google/perfetto/archive/$(grep 'revision =' subprojects/perfetto.wrap | cut -d ' ' -f3).tar.gz | tar zxf - --strip-components=1 -C subprojects/perfetto
-    # compress the current folder
-    - tar -cvzf ../$CI_PROJECT_NAME.tar.gz .
-
-    - ci-fairy s3cp --token-file "${S3_JWT_FILE}" ../$CI_PROJECT_NAME.tar.gz https://$S3_HOST/git-cache/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_PROJECT_NAME.tar.gz
-
-debian-x86_64:
-  extends:
-    - .meson-build-for-tests
-    - .use-debian/x86_64_build
-    - .build-run-long  # but it really shouldn't! tracked in mesa#12544
-    - .ci-deqp-artifacts
-  variables:
-    UNWIND: "enabled"
-    DRI_LOADERS: >
-      -D egl=enabled
-      -D gbm=enabled
-      -D glvnd=disabled
-      -D glx=dri
-      -D platforms=x11,wayland
-    GALLIUM_ST: >
-      -D gallium-rusticl=true
-      -D gallium-va=enabled
-    GALLIUM_DRIVERS: "llvmpipe,softpipe,virgl,radeonsi,zink,iris,svga"
-    VULKAN_DRIVERS: "swrast,amd,intel,virtio"
-    BUILDTYPE: "debugoptimized"
-    EXTRA_OPTION: >
-      -D intel-elk=false
-      -D spirv-to-dxil=true
-      -D tools=drm-shim
-      -D valgrind=disabled
-      -D perfetto=true
-    S3_ARTIFACT_NAME: mesa-x86_64-default-${BUILDTYPE}
-    RUN_MESON_TESTS: "false"  # debian-build-x86_64 already runs these
-  artifacts:
-    reports:
-      junit: artifacts/ci_scripts_report.xml
-
-debian-x86_64-asan:
-  extends:
-    - debian-x86_64
-    - .meson-build-for-tests
-    - .build-run-long
-  variables:
-    VULKAN_DRIVERS: "swrast,amd,intel"
-    GALLIUM_DRIVERS: "llvmpipe,softpipe,zink,r300"
-    EXTRA_OPTION: >
-      -D intel-elk=false
-      -D intel-rt=false
-      -D b_sanitize=address
-      -D gallium-va=false
-      -D gallium-rusticl=false
-      -D mesa-clc=system
-      -D tools=dlclose-skip
-      -D valgrind=disabled
-    S3_ARTIFACT_NAME: mesa-x86_64-asan-${BUILDTYPE}
-    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)
-    HOST_BUILD_OPTIONS: >
-      -D build-tests=false
-      -D enable-glcpp-tests=false
-      -D gallium-rusticl=false
-      -D gallium-drivers=
-      -D glx=disabled
-      -D install-mesa-clc=true
-      -D mesa-clc=enabled
-      -D platforms=
-      -D video-codecs=
-      -D vulkan-drivers=
-
-debian-x86_64-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
-    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"
-    VULKAN_DRIVERS: intel,amd,broadcom,virtio
-    C_ARGS: >
-      -Wno-error=constant-conversion
-      -Wno-error=enum-conversion
-      -Wno-error=initializer-overrides
-      -Wno-error=sometimes-uninitialized
-      -Werror=misleading-indentation
-      -Wno-error=deprecated-declarations
-    CPP_ARGS: >
-      -Wno-error=c99-designator
-      -Wno-error=overloaded-virtual
-      -Wno-error=tautological-constant-out-of-range-compare
-      -Wno-error=unused-private-field
-      -Wno-error=deprecated-declarations
-    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)
-    HOST_BUILD_OPTIONS: >
-      -D build-tests=false
-      -D enable-glcpp-tests=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 precomp-compiler=enabled
-      -D install-precomp-compiler=true
-      -D tools=panfrost
-
-debian-x86_64-ubsan:
-  extends:
-    - debian-x86_64
-    - .meson-build-for-tests
-    - .build-run-long
-  variables:
-    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
-    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-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
-
-debian-build-x86_64:
-  extends:
-    - .meson-build-for-tests
-    - .use-debian/x86_64_build
-  variables:
-    UNWIND: "enabled"
-    C_ARGS: >
-      -Wno-error=deprecated-declarations
-    CPP_ARGS: >
-      -Wno-error=deprecated-declarations
-    DRI_LOADERS: >
-      -D glx=dri
-      -D gbm=enabled
-      -D egl=enabled
-      -D glvnd=disabled
-      -D platforms=x11,wayland
-    GALLIUM_ST: >
-      -D gallium-extra-hud=true
-      -D gallium-va=enabled
-      -D gallium-rusticl=true
-      -D legacy-wayland=bind-wayland-display
-    GALLIUM_DRIVERS: "i915,iris,nouveau,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus,radeonsi"
-    VULKAN_DRIVERS: "intel_hasvk,imagination,microsoft-experimental,nouveau,swrast"
-    BUILDTYPE: "debugoptimized"
-    EXTRA_OPTION: >
-      -D spirv-to-dxil=true
-      -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,lima,panfrost,asahi
-      -D perfetto=true
-    S3_ARTIFACT_NAME: debian-build-x86_64
-
-# Test a release build with -Werror so new warnings don't sneak in.
-debian-release:
-  extends:
-    - .meson-build-only
-    - .use-debian/x86_64_build
-  variables:
-    UNWIND: "enabled"
-    C_ARGS: >
-      -Wno-error=deprecated-declarations
-    CPP_ARGS: >
-      -Wno-error=deprecated-declarations
-    DRI_LOADERS: >
-      -D glx=dri
-      -D gbm=enabled
-      -D egl=enabled
-      -D glvnd=disabled
-      -D platforms=x11,wayland
-    GALLIUM_ST: >
-      -D gallium-extra-hud=true
-      -D gallium-va=enabled
-      -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,microsoft-experimental"
-    EXTRA_OPTION: >
-      -D spirv-to-dxil=true
-      -D tools=all
-      -D mesa-clc=enabled
-      -D precomp-compiler=enabled
-      -D intel-rt=enabled
-      -D imagination-srv=true
-    BUILDTYPE: "release"
-    S3_ARTIFACT_NAME: "mesa-x86_64-default-${BUILDTYPE}"
-  script:
-    - !reference [.meson-build-only, script]
-    - 'if [ -n "$MESA_CI_PERFORMANCE_ENABLED" ]; then .gitlab-ci/prepare-artifacts.sh; fi'
-
-alpine-build-testing:
-  extends:
-    - .meson-build-only
-    - .use-alpine/x86_64_build
-  variables:
-    BUILDTYPE: "release"
-    C_ARGS: >
-      -Wno-error=cpp
-      -Wno-error=array-bounds
-      -Wno-error=deprecated-declarations
-    DRI_LOADERS: >
-      -D glx=disabled
-      -D gbm=enabled
-      -D egl=enabled
-      -D glvnd=disabled
-      -D platforms=wayland
-    GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,iris,lima,nouveau,panfrost,r300,r600,radeonsi,svga,llvmpipe,softpipe,tegra,v3d,vc4,virgl,zink"
-    GALLIUM_ST: >
-      -D gallium-extra-hud=true
-      -D gallium-va=enabled
-      -D gallium-rusticl=false
-      -D gles1=disabled
-      -D gles2=enabled
-      -D llvm=enabled
-      -D llvm-orcjit=true
-      -D microsoft-clc=disabled
-      -D shared-llvm=enabled
-    UNWIND: "disabled"
-    VULKAN_DRIVERS: "amd,broadcom,freedreno,intel,imagination"
-
-fedora-release:
-  extends:
-    - .meson-build-only
-    - .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: >
-      -Wno-error=array-bounds
-      -Wno-error=maybe-uninitialized
-      -Wno-error=deprecated-declarations
-    CPP_ARGS: >
-      -Wno-error=deprecated-declarations
-    DRI_LOADERS: >
-      -D glx=dri
-      -D gbm=enabled
-      -D egl=enabled
-      -D glvnd=enabled
-      -D platforms=x11,wayland
-    EXTRA_OPTION: >
-      -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_ST: >
-      -D gallium-extra-hud=true
-      -D gallium-va=enabled
-      -D gallium-rusticl=true
-      -D gles1=disabled
-      -D gles2=enabled
-      -D llvm=enabled
-      -D microsoft-clc=disabled
-      -D shared-llvm=enabled
-    UNWIND: "disabled"
-    VULKAN_DRIVERS: "amd,asahi,broadcom,freedreno,imagination,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"
-    C_ARGS: >
-      -Wno-error=asm-operand-widths
-      -Wno-error=constant-conversion
-      -Wno-error=enum-conversion
-      -Wno-error=initializer-overrides
-      -Wno-error=sometimes-uninitialized
-    CPP_ARGS: >
-      -Wno-error=c99-designator
-    DRI_LOADERS: >
-      -D glx=disabled
-      -D gbm=disabled
-      -D egl=enabled
-      -D glvnd=disabled
-      -D platforms=android
-    FORCE_FALLBACK_FOR: llvm
-    EXTRA_OPTION: >
-      -D amd-use-llvm=false
-      -D android-stub=true
-      -D platform-sdk-version=${ANDROID_SDK_VERSION}
-      -D cpp_rtti=false
-      -D valgrind=disabled
-      -D android-libbacktrace=disabled
-      -D mesa-clc=system
-      -D precomp-compiler=system
-      -D perfetto=true
-      -D freedreno-kmds=msm,virtio
-    GALLIUM_ST: >
-      -D gallium-va=disabled
-      -D gallium-rusticl=false
-    PKG_CONFIG_LIBDIR: "/disable/non/android/system/pc/files"
-    HOST_BUILD_OPTIONS: >
-      -D build-tests=false
-      -D enable-glcpp-tests=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 precomp-compiler=enabled
-      -D install-precomp-compiler=true
-      -D tools=panfrost
-  script:
-    # x86_64 build:
-    - export CROSS=x86_64-linux-android
-    - export GALLIUM_DRIVERS=iris,radeonsi,softpipe,virgl,zink
-    - export VULKAN_DRIVERS=amd,intel,nouveau,swrast,virtio
-    - .gitlab-ci/create-llvm-meson-wrap-file.sh
-    - export S3_ARTIFACT_NAME=mesa-x86_64-android-${BUILDTYPE}
-    - !reference [.meson-build-for-tests, script]
-    # remove all the files created by the previous build before the next build
-    - git clean -dxf .
-    # aarch64 build:
-    - export CROSS=aarch64-linux-android
-    - export GALLIUM_DRIVERS=etnaviv,freedreno,lima,panfrost,vc4,v3d,zink
-    - export VULKAN_DRIVERS=freedreno,broadcom,panfrost,virtio
-    - export S3_ARTIFACT_NAME=mesa-arm64-android-${BUILDTYPE}
-    - !reference [.meson-build-for-tests, script]
-
-.meson-cross:
-  extends:
-    - .meson-build-only
-    - .use-debian/x86_64_build
-  variables:
-    UNWIND: "disabled"
-    DRI_LOADERS: >
-      -D glx=dri
-      -D gbm=enabled
-      -D egl=enabled
-      -D platforms=x11,wayland
-    GALLIUM_ST: >
-      -D gallium-va=disabled
-
-.meson-arm:
-  extends:
-    - .meson-cross
-    - .use-debian/arm64_build
-  variables:
-    VULKAN_DRIVERS: "asahi,broadcom,freedreno"
-    GALLIUM_DRIVERS: "etnaviv,freedreno,lima,nouveau,panfrost,llvmpipe,softpipe,tegra,v3d,vc4,zink"
-    BUILDTYPE: "debugoptimized"
-
-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-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
-
-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}
-
-debian-arm64:
-  extends:
-    - .meson-arm
-    - .ci-deqp-artifacts
-    - .meson-build-for-tests
-  variables:
-    GALLIUM_DRIVERS: "etnaviv,freedreno,lima,panfrost,v3d,vc4,zink"
-    VULKAN_DRIVERS: "broadcom,freedreno,imagination,panfrost"
-    DRI_LOADERS:
-      -D glvnd=disabled
-    EXTRA_OPTION: >
-      -D valgrind=disabled
-      -D imagination-srv=true
-      -D freedreno-kmds=msm,virtio
-      -D teflon=true
-      -D perfetto=true
-    GALLIUM_ST:
-      -D gallium-rusticl=true
-      -D legacy-wayland=bind-wayland-display
-    RUN_MESON_TESTS: "false"  # run by debian-arm64-build-testing
-    S3_ARTIFACT_NAME: mesa-arm64-default-${BUILDTYPE}
-
-debian-arm64-asan:
-  extends:
-    - debian-arm64
-    - .meson-build-for-tests
-    - .build-run-long
-  variables:
-    VULKAN_DRIVERS: "broadcom,freedreno,panfrost"
-    GALLIUM_DRIVERS: "freedreno,vc4,v3d,panfrost"
-    DRI_LOADERS:
-      -D glvnd=disabled
-    EXTRA_OPTION: >
-      -D b_sanitize=address
-      -D valgrind=disabled
-      -D tools=dlclose-skip
-      -D gallium-rusticl=false
-    ARTIFACTS_DEBUG_SYMBOLS: 1
-    RUN_MESON_TESTS: "false"  # just too slow
-    S3_ARTIFACT_NAME: mesa-arm64-asan-${BUILDTYPE}
-
-debian-arm64-ubsan:
-  extends:
-    - debian-arm64
-    - .meson-build-for-tests
-    - .build-run-long
-  variables:
-    VULKAN_DRIVERS: "broadcom"
-    GALLIUM_DRIVERS: "v3d,vc4"
-    C_ARGS: >
-      -Wno-error=array-bounds
-    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}
-
-debian-arm64-build-test:
-  extends:
-    - .meson-arm
-    - .ci-deqp-artifacts
-    - .meson-build-only
-  variables:
-    VULKAN_DRIVERS: "amd,asahi,imagination,nouveau"
-    DRI_LOADERS:
-      -D glvnd=disabled
-    EXTRA_OPTION: >
-      -D tools=panfrost,imagination
-      -D perfetto=true
-
-debian-arm64-release:
-  extends:
-    - debian-arm64
-    - .meson-build-only
-  variables:
-    BUILDTYPE: release
-    S3_ARTIFACT_NAME: mesa-arm64-default-${BUILDTYPE}
-  script:
-    - !reference [.meson-build-only, script]
-    - '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
-    EXTRA_OPTION: >
-      -D freedreno-kmds=kgsl
-      -D glx=dri
-      -D gbm=disabled
-      -D egl=enabled
-      -D perfetto=true
-      -D platforms=x11,wayland
-
-debian-clang:
-  extends:
-    - .meson-build-only
-    - .use-debian/x86_64_build
-  variables:
-    BUILDTYPE: debug
-    UNWIND: "enabled"
-    C_ARGS: >
-      -Wno-error=constant-conversion
-      -Wno-error=enum-conversion
-      -Wno-error=initializer-overrides
-      -Wno-error=sometimes-uninitialized
-      -Werror=misleading-indentation
-      -Wno-error=deprecated-declarations
-    CPP_ARGS: >
-      -Wno-error=c99-designator
-      -Wno-error=overloaded-virtual
-      -Wno-error=tautological-constant-out-of-range-compare
-      -Wno-error=unused-private-field
-      -Wno-error=vla-cxx-extension
-      -Wno-error=deprecated-declarations
-    DRI_LOADERS: >
-      -D glx=dri
-      -D gbm=enabled
-      -D egl=enabled
-      -D glvnd=enabled
-      -D platforms=x11,wayland
-    GALLIUM_ST: >
-      -D gallium-extra-hud=true
-      -D gallium-va=enabled
-      -D gles1=enabled
-      -D gles2=enabled
-      -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"
-    VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,swrast,panfrost,imagination,microsoft-experimental,nouveau
-    EXTRA_OPTION:
-      -D spirv-to-dxil=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-rt=enabled
-      -D imagination-srv=true
-      -D teflon=true
-    CC: clang-${LLVM_VERSION}
-    CXX: clang++-${LLVM_VERSION}
-
-debian-clang-release:
-  extends:
-    - debian-clang
-    - .meson-build-only
-    - .build-run-long
-  variables:
-    BUILDTYPE: "release"
-    C_ARGS: >
-      -Wno-error=constant-conversion
-      -Wno-error=enum-conversion
-      -Wno-error=initializer-overrides
-      -Wno-error=sometimes-uninitialized
-      -Wno-error=deprecated-declarations
-    CPP_ARGS: >
-      -Wno-error=c99-designator
-      -Wno-error=overloaded-virtual
-      -Wno-error=tautological-constant-out-of-range-compare
-      -Wno-error=unused-private-field
-      -Wno-error=vla-cxx-extension
-      -Wno-error=deprecated-declarations
-    DRI_LOADERS: >
-      -D glx=xlib
-      -D platforms=x11,wayland
-    GALLIUM_ST: >
-      -D gallium-extra-hud=true
-      -D gallium-va=enabled
-      -D gles1=disabled
-      -D gles2=disabled
-      -D llvm=enabled
-      -D microsoft-clc=disabled
-      -D shared-llvm=enabled
-
-windows-msvc:
-  extends:
-    - .build-windows
-    - .use-windows_build_msvc
-    - .windows-build-rules
-  stage: build-for-tests
-  script:
-    - pwsh -ExecutionPolicy RemoteSigned .\.gitlab-ci\windows\mesa_build.ps1
-  artifacts:
-    paths:
-      - _build/meson-logs/*.txt
-      - _install/
-
-debian-vulkan:
-  extends:
-    - .meson-build-only
-    - .use-debian/x86_64_build
-  variables:
-    BUILDTYPE: debug
-    UNWIND: "disabled"
-    DRI_LOADERS: >
-      -D glx=disabled
-      -D gbm=disabled
-      -D egl=disabled
-      -D opengl=false
-      -D gles1=disabled
-      -D gles2=disabled
-      -D glvnd=disabled
-      -D platforms=x11,wayland
-    GALLIUM_ST: >
-      -D gallium-va=disabled
-      -D gallium-rusticl=false
-      -D b_sanitize=undefined
-      -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,microsoft-experimental,nouveau,kosmickrisp
-    EXTRA_OPTION: >
-      -D vulkan-layers=device-select,overlay
-      -D tools=drm-shim
-      -D build-radv-tests=true
-      -D build-aco-tests=true
-      -D intel-rt=disabled
-      -D imagination-srv=true
-
-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
-    EXTRA_OPTION: >
-      -D vulkan-layers=device-select,overlay
-      -D mesa-clc=system
-    CPP_ARGS: >
-      -Wno-error=deprecated-declarations
-    C_LINK_ARGS: >
-      -Wl,--no-warn-rwx-segments
-    CPP_LINK_ARGS: >
-      -Wl,--no-warn-rwx-segments
-    HOST_BUILD_OPTIONS: >
-      -D build-tests=false
-      -D enable-glcpp-tests=false
-      -D gallium-drivers=
-      -D vulkan-drivers=
-      -D video-codecs=
-      -D glx=disabled
-      -D platforms=
-      -D mesa-clc=enabled
-      -D install-mesa-clc=true
-
-# In case of issues with this job, contact @frankbinns
-.debian-riscv64:
-  extends:
-    - .meson-cross
-    - .use-debian/riscv64_build
-    - .meson-build-only
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64_KVM
-  variables:
-    BUILDTYPE: debug
-    CROSS: riscv64
-    GALLIUM_DRIVERS: "llvmpipe,zink"
-    VULKAN_DRIVERS: "swrast"
-    # See https://gitlab.freedesktop.org/mesa/mesa/-/issues/14123
-    MESON_TEST_ARGS: "--no-suite mesa:llvmpipe"
-
-# 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
-    - .use-debian/s390x_build
-    - .meson-build-only
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64_KVM
-  variables:
-    BUILDTYPE: debug
-    CROSS: s390x
-    GALLIUM_DRIVERS: "llvmpipe,virgl,zink"
-    VULKAN_DRIVERS: "swrast,virtio"
-    DRI_LOADERS:
-      -D glvnd=disabled
-
-.debian-ppc64el:
-  extends:
-    - .meson-cross
-    - .use-debian/ppc64el_build
-    - .meson-build-only
-  variables:
-    BUILDTYPE: debug
-    CROSS: ppc64el
-    GALLIUM_DRIVERS: "nouveau,llvmpipe,softpipe,virgl,zink"
-    VULKAN_DRIVERS: "swrast"
-    DRI_LOADERS:
-      -D glvnd=disabled
diff --git a/.gitlab-ci/ci-tron/gitlab-ci.yml b/.gitlab-ci/ci-tron/gitlab-ci.yml
deleted file mode 100644
index ec03668..0000000
--- a/.gitlab-ci/ci-tron/gitlab-ci.yml
+++ /dev/null
@@ -1,287 +0,0 @@
-# For CI-tron based testing farm jobs.
-.ci-tron-test:
-  extends:
-    - .ci-tron-b2c-job-v1
-  variables:
-    GIT_STRATEGY: none
-    B2C_VERSION: v0.9.17  # Linux 6.16.3
-
-    CI_TRON_PATTERN__JOB_SUCCESS__REGEX: 'hwci: mesa: exit_code: 0\r$'
-    CI_TRON_PATTERN__SESSION_END__REGEX: '^.*It''s now safe to turn off your computer\r$'
-
-    CI_TRON_TIMEOUT__FIRST_CONSOLE_ACTIVITY__MINUTES: 2
-    CI_TRON_TIMEOUT__FIRST_CONSOLE_ACTIVITY__RETRIES: 3
-    CI_TRON_TIMEOUT__CONSOLE_ACTIVITY__MINUTES: 5
-
-    DEQP_RUNNER_SHADER_CACHE_DIR: /cache
-    VKD3D_SHADER_CACHE_PATH: /cache
-    PIGLIT_CACHE_DIR: /cache
-
-    CI_TRON__B2C_ARTIFACT_EXCLUSION: "install/*"
-    CI_TRON_HTTP_ARTIFACT__INSTALL__PATH: "/install.tar.zst"
-    CI_TRON_HTTP_ARTIFACT__INSTALL__URL: "https://$PIPELINE_ARTIFACTS_BASE/$S3_ARTIFACT_NAME.tar.zst"
-
-    CI_TRON__B2C_MACHINE_REGISTRATION_CMD: "setup --tags $CI_TRON_DUT_SETUP_TAGS"
-
-    CI_TRON__B2C_IMAGE_UNDER_TEST: $MESA_IMAGE
-    CI_TRON__B2C_EXEC_SHELL: bash
-    CI_TRON__B2C_EXEC_SHELL_FLAGS: "-euc -o pipefail"
-    CI_TRON__B2C_EXEC_CMD: "curl --silent --fail-with-body {{ job.http.url }}$CI_TRON_HTTP_ARTIFACT__INSTALL__PATH | tar --zstd --extract && export SCRIPTS_DIR=$$PWD/install && $$SCRIPTS_DIR/common/init-stage2.sh"
-
-    # Assume by default this is running deqp, as that's almost always true
-    HWCI_TEST_SCRIPT: install/deqp-runner.sh
-
-    # Per-job files need to be in CI_PROJECT_DIR
-    S3_JWT_FILE: $CI_PROJECT_DIR/s3_jwt
-
-    # Keep the job script in the artifacts
-    CI_TRON_JOB_SCRIPT_PATH: results/job_script.sh
-  tags:
-    - farm:$RUNNER_FARM_LOCATION
-    - ci-tron:priority:$CI_TRON_JOB_PRIORITY
-    - $CI_TRON_DUT_SETUP_TAGS
-
-  # Override the default before_script, as it is not compatible with the CI-tron environment. We just keep the clearing
-  # of the JWT token for security reasons
-  before_script:
-    - |
-      set -eu
-
-      eval "$S3_JWT_FILE_SCRIPT"
-
-      for var in CI_TRON_DUT_SETUP_TAGS; do
-        if [[ -z "$(eval echo \${$var:-})" ]]; then
-          echo "The required variable '$var' is missing"
-          exit 1
-        fi
-      done
-
-      # Open a section that will be closed by b2c
-      echo -e "\n\e[0Ksection_start:`date +%s`:b2c_kernel_boot[collapsed=true]\r\e[0K\e[0;36mSubmitting the CI-tron job and booting the DUT\e[0m\n"
-
-  # Anything our job places in results/ will be collected by the
-  # Gitlab coordinator for status presentation. results/junit.xml
-  # will be parsed by the UI for more detailed explanations of
-  # test execution.
-  artifacts:
-    when: always
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
-    paths:
-      - results
-    reports:
-      junit: results/**/junit.xml
-
-.ci-tron-x86_64-test:
-  extends:
-    - .ci-tron-test
-  variables:
-    CI_TRON_INITRAMFS__B2C__URL: 'https://gitlab.freedesktop.org/gfx-ci/boot2container/-/releases/$B2C_VERSION/downloads/initramfs.linux_amd64.cpio.xz'
-    CI_TRON_KERNEL__URL: 'https://gitlab.freedesktop.org/gfx-ci/boot2container/-/releases/$B2C_VERSION/downloads/linux-x86_64'
-
-    # Set the following variables if you need AMD, Intel, or NVIDIA support
-    # CI_TRON_INITRAMFS__DEPMOD__URL: "https://gitlab.freedesktop.org/gfx-ci/boot2container/-/releases/$B2C_VERSION/downloads/linux-x86_64.depmod.cpio.xz"
-    # CI_TRON_INITRAMFS__GPU__URL: "https://gitlab.freedesktop.org/gfx-ci/boot2container/-/releases/$B2C_VERSION/downloads/linux-x86_64.gpu.cpio"
-    # CI_TRON_INITRAMFS__GPU__FORMAT__0__ARCHIVE__KEEP__0__PATH: "(lib/(modules|firmware/amdgpu)/.*)"
-
-    S3_ARTIFACT_NAME: "mesa-x86_64-default-debugoptimized"
-
-.ci-tron-x86_64-test-vk:
-  extends:
-    - .use-debian/x86_64_test-vk
-    - .ci-tron-x86_64-test
-  needs:
-    - job: debian/x86_64_test-vk
-      artifacts: false
-      optional: true
-    - job: debian-x86_64
-      artifacts: false
-
-.ci-tron-x86_64-test-vk-manual:
-  extends:
-    - .use-debian/x86_64_test-vk
-    - .ci-tron-x86_64-test
-  variables:
-    S3_ARTIFACT_NAME: "debian-build-x86_64"
-  needs:
-    - job: debian/x86_64_test-vk
-      artifacts: false
-      optional: true
-    - job: debian-build-x86_64
-      artifacts: false
-
-.ci-tron-x86_64-test-video:
-  extends:
-    - .use-debian/x86_64_test-video
-    - .ci-tron-x86_64-test
-  needs:
-    - job: debian/x86_64_test-video
-      artifacts: false
-      optional: true
-    - job: debian-x86_64
-      artifacts: false
-
-.ci-tron-x86_64-test-gl:
-  extends:
-    - .use-debian/x86_64_test-gl
-    - .ci-tron-x86_64-test
-  needs:
-    - job: debian/x86_64_test-gl
-      artifacts: false
-      optional: true
-    - job: debian-x86_64
-      artifacts: false
-
-.ci-tron-x86_64-test-gl-manual:
-  extends:
-    - .use-debian/x86_64_test-gl
-    - .ci-tron-x86_64-test
-  variables:
-    S3_ARTIFACT_NAME: "debian-build-x86_64"
-  needs:
-    - job: debian/x86_64_test-gl
-      artifacts: false
-      optional: true
-    - job: debian-build-x86_64
-      artifacts: false
-
-.ci-tron-x86_64-test-gl-asan-manual:
-  extends:
-    - .use-debian/x86_64_test-gl
-    - .ci-tron-x86_64-test
-  variables:
-    S3_ARTIFACT_NAME: "mesa-x86_64-asan-debugoptimized"
-    DEQP_FORCE_ASAN: 1
-  needs:
-    - job: debian/x86_64_test-gl
-      artifacts: false
-      optional: true
-    - job: debian-x86_64-asan
-      artifacts: false
-
-.ci-tron-arm64-test:
-  extends:
-    - .ci-tron-test
-  variables:
-    CI_TRON_INITRAMFS__B2C__URL: 'https://gitlab.freedesktop.org/gfx-ci/boot2container/-/releases/$B2C_VERSION/downloads/initramfs.linux_arm64.cpio.xz'
-    CI_TRON_KERNEL__URL: 'https://gitlab.freedesktop.org/gfx-ci/boot2container/-/releases/$B2C_VERSION/downloads/linux-arm64'
-    S3_ARTIFACT_NAME: "mesa-arm64-default-debugoptimized"
-
-.ci-tron-arm64-test-vk:
-  extends:
-    - .use-debian/arm64_test-vk
-    - .ci-tron-arm64-test
-  needs:
-    - job: debian/arm64_test-vk
-      artifacts: false
-      optional: true
-    - job: debian-arm64
-      artifacts: false
-
-.ci-tron-arm64-test-asan-vk:
-  extends:
-    - .use-debian/arm64_test-vk
-    - .ci-tron-arm64-test
-  variables:
-    S3_ARTIFACT_NAME: "mesa-arm64-asan-debugoptimized"
-    DEQP_FORCE_ASAN: 1
-  needs:
-    - job: debian/arm64_test-vk
-      artifacts: false
-      optional: true
-    - job: debian-arm64-asan
-      artifacts: false
-
-.ci-tron-arm64-test-ubsan-vk:
-  extends:
-    - .use-debian/arm64_test-vk
-    - .ci-tron-arm64-test
-  variables:
-    S3_ARTIFACT_NAME: "mesa-arm64-ubsan-debugoptimized"
-  needs:
-    - job: debian/arm64_test-vk
-      artifacts: false
-      optional: true
-    - job: debian-arm64-ubsan
-      artifacts: false
-
-.ci-tron-arm64-test-gl:
-  extends:
-    - .use-debian/arm64_test-gl
-    - .ci-tron-arm64-test
-  needs:
-    - job: debian/arm64_test-gl
-      artifacts: false
-      optional: true
-    - job: debian-arm64
-      artifacts: false
-
-.ci-tron-arm64-test-asan-gl:
-  extends:
-    - .use-debian/arm64_test-gl
-    - .ci-tron-arm64-test
-  variables:
-    S3_ARTIFACT_NAME: "mesa-arm64-asan-debugoptimized"
-    DEQP_FORCE_ASAN: 1
-  needs:
-    - job: debian/arm64_test-gl
-      artifacts: false
-      optional: true
-    - job: debian-arm64-asan
-      artifacts: false
-
-.ci-tron-arm64-test-ubsan-gl:
-  extends:
-    - .use-debian/arm64_test-gl
-    - .ci-tron-arm64-test
-  variables:
-    S3_ARTIFACT_NAME: "mesa-arm64-ubsan-debugoptimized"
-  needs:
-    - job: debian/arm64_test-gl
-      artifacts: false
-      optional: true
-    - job: debian-arm64-ubsan
-      artifacts: false
-
-.ci-tron-arm32-test:
-  extends:
-    - .ci-tron-test
-  variables:
-    CI_TRON_INITRAMFS__B2C__URL: 'https://gitlab.freedesktop.org/gfx-ci/boot2container/-/releases/$B2C_VERSION/downloads/initramfs.linux_arm.cpio.xz'
-    CI_TRON_KERNEL__URL: 'https://gitlab.freedesktop.org/gfx-ci/boot2container/-/releases/$B2C_VERSION/downloads/linux-arm'
-    S3_ARTIFACT_NAME: "mesa-arm32-default-debugoptimized"
-
-.ci-tron-arm32-test-vk:
-  extends:
-    - .use-debian/arm32_test-vk
-    - .ci-tron-arm32-test
-  needs:
-    - job: debian/arm32_test-vk
-      artifacts: false
-      optional: true
-    - job: debian-arm32
-      artifacts: false
-
-.ci-tron-arm32-test-gl:
-  extends:
-    - .use-debian/arm32_test-gl
-    - .ci-tron-arm32-test
-  needs:
-    - job: debian/arm32_test-gl
-      artifacts: false
-      optional: true
-    - job: debian-arm32
-      artifacts: false
-
-.ci-tron-arm32-test-asan-gl:
-  extends:
-    - .use-debian/arm32_test-gl
-    - .ci-tron-arm32-test
-  variables:
-    S3_ARTIFACT_NAME: "mesa-arm32-asan-debugoptimized"
-    DEQP_FORCE_ASAN: 1
-  needs:
-    - job: debian/arm32_test-gl
-      artifacts: false
-      optional: true
-    - job: debian-arm32-asan
-      artifacts: false
diff --git a/.gitlab-ci/common/capture-devcoredump.sh b/.gitlab-ci/common/capture-devcoredump.sh
deleted file mode 100755
index f5f615d..0000000
--- a/.gitlab-ci/common/capture-devcoredump.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2035
-# shellcheck disable=SC2061
-# shellcheck disable=SC2086 # we want word splitting
-
-while true; do
-  devcds=$(find /sys/devices/virtual/devcoredump/ -name data 2>/dev/null)
-  for i in $devcds; do
-    echo "Found a devcoredump at $i."
-    if cp $i $RESULTS_DIR/first.devcore; then
-      echo 1 > $i
-      echo "Saved to the job artifacts at /first.devcore"
-      exit 0
-    fi
-  done
-  i915_error_states=$(find /sys/devices/ -path */drm/card*/error)
-  for i in $i915_error_states; do
-    tmpfile=$(mktemp)
-    cp "$i" "$tmpfile"
-    filesize=$(stat --printf="%s" "$tmpfile")
-    # Does the file contain "No error state collected" ?
-    if [ "$filesize" = 25 ]; then
-        rm "$tmpfile"
-    else
-        echo "Found an i915 error state at $i size=$filesize."
-        if cp "$tmpfile" $RESULTS_DIR/first.i915_error_state; then
-            rm "$tmpfile"
-            echo 1 > "$i"
-            echo "Saved to the job artifacts at /first.i915_error_state"
-            exit 0
-        fi
-    fi
-  done
-  sleep 10
-done
diff --git a/.gitlab-ci/common/init-stage1.sh b/.gitlab-ci/common/init-stage1.sh
deleted file mode 100755
index a41b968..0000000
--- a/.gitlab-ci/common/init-stage1.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# Very early init, used to make sure devices and network are set up and
-# reachable.
-
-set -ex
-
-cd /
-
-findmnt --mountpoint /proc || mount -t proc none /proc
-findmnt --mountpoint /sys || mount -t sysfs none /sys
-findmnt --mountpoint /sys/kernel/debug || mount -t debugfs none /sys/kernel/debug
-findmnt --mountpoint /dev || mount -t devtmpfs none /dev
-mkdir -p /dev/pts
-findmnt --mountpoint /dev/pts || mount -t devpts devpts /dev/pts
-mkdir -p /dev/shm
-findmnt --mountpoint /dev/shm || mount -t tmpfs -o noexec,nodev,nosuid tmpfs /dev/shm
-findmnt --mountpoint /tmp || mount -t tmpfs tmpfs /tmp
-
-# For the vmware farm, change the nameserver as 8.8.8.8 is off limit.
-# This is temporary and will be reverted once the farm is moved.
-if [ "${FARM:-}" = "vmware" ]; then
-  echo "nameserver 192.19.189.10" > /etc/resolv.conf
-else
-  echo "nameserver 8.8.8.8" > /etc/resolv.conf
-fi
-
-[ -z "$NFS_SERVER_IP" ] || echo "$NFS_SERVER_IP caching-proxy" >> /etc/hosts
-
-# Set the time so we can validate certificates before we fetch anything;
-# however as not all DUTs have network, make this non-fatal.
-for _ in 1 2 3; do ntpdig -sS pool.ntp.org && break || sleep 2; done || true
-
-# Create a symlink from /dev/fd to /proc/self/fd if /dev/fd is missing.
-if [ ! -e /dev/fd ]; then
-  ln -s /proc/self/fd /dev/fd
-fi
diff --git a/.gitlab-ci/common/init-stage2.sh b/.gitlab-ci/common/init-stage2.sh
deleted file mode 100755
index 26693e1..0000000
--- a/.gitlab-ci/common/init-stage2.sh
+++ /dev/null
@@ -1,245 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC1090
-# shellcheck disable=SC1091
-# shellcheck disable=SC2086 # we want word splitting
-# shellcheck disable=SC2155
-
-# Second-stage init, used to set up devices and our job environment before
-# running tests.
-
-shopt -s extglob
-
-# Make sure to kill itself and all the children process from this script on
-# exiting, since any console output may interfere with LAVA signals handling,
-# which based on the log console.
-cleanup() {
-  if [ "$BACKGROUND_PIDS" = "" ]; then
-    return 0
-  fi
-
-  set +x
-  echo "Killing all child processes"
-  for pid in $BACKGROUND_PIDS
-  do
-    kill "$pid" 2>/dev/null || true
-  done
-
-  # Sleep just a little to give enough time for subprocesses to be gracefully
-  # killed. Then apply a SIGKILL if necessary.
-  sleep 5
-  for pid in $BACKGROUND_PIDS
-  do
-    kill -9 "$pid" 2>/dev/null || true
-  done
-
-  BACKGROUND_PIDS=
-  set -x
-}
-trap cleanup INT TERM EXIT
-
-# Space separated values with the PIDS of the processes started in the
-# background by this script
-BACKGROUND_PIDS=
-
-# Until we uniformize the install dir to /install, we need to make it
-# available to both possible CI_PROJECT_DIR paths.
-if [ "$GIT_STRATEGY" = empty ]; then
-  ln -s "$CI_PROJECT_DIR" "${CI_PROJECT_DIR%-empty}"
-fi
-
-for path in '/dut-env-vars.sh' '/set-job-env-vars.sh' './set-job-env-vars.sh'; do
-    [ -f "$path" ] && source "$path"
-done
-. "$SCRIPTS_DIR"/setup-test-env.sh
-
-# Flush out anything which might be stuck in a serial buffer
-echo
-echo
-echo
-
-section_switch init_stage2 "Pre-testing hardware setup"
-
-job_time=$(get_job_seconds)
-uptime=$(cut -d ' ' -f1 /proc/uptime)
-echo "$(get_current_minsec) after job start == $uptime sec after kernel boot time"
-printf -v uptime_rounded "%.0f" "$uptime"
-echo "Kernel boot occurred $((job_time-uptime_rounded)) seconds after job start"
-
-set -ex
-
-# Set up any devices required by the jobs
-[ -z "$HWCI_KERNEL_MODULES" ] || {
-    echo -n $HWCI_KERNEL_MODULES | xargs -d, -n1 /usr/sbin/modprobe
-}
-
-# Set up ZRAM
-HWCI_ZRAM_SIZE=2G
-if /sbin/zramctl --find --size $HWCI_ZRAM_SIZE -a zstd; then
-    mkswap /dev/zram0
-    swapon /dev/zram0
-    echo "zram: $HWCI_ZRAM_SIZE activated"
-else
-    echo "zram: skipping, not supported"
-fi
-
-#
-# Load the KVM module specific to the detected CPU virtualization extensions:
-# - vmx for Intel VT
-# - svm for AMD-V
-#
-if [ -n "$HWCI_ENABLE_X86_KVM" ]; then
-    unset KVM_KERNEL_MODULE
-    {
-      grep -qs '\bvmx\b' /proc/cpuinfo && KVM_KERNEL_MODULE=kvm_intel
-    } || {
-      grep -qs '\bsvm\b' /proc/cpuinfo && KVM_KERNEL_MODULE=kvm_amd
-    }
-
-    {
-      [ -z "${KVM_KERNEL_MODULE}" ] && \
-      echo "WARNING: Failed to detect CPU virtualization extensions"
-    } || \
-        modprobe ${KVM_KERNEL_MODULE}
-fi
-
-if ! [ -e /install/ ] && ! [ -e $CI_PROJECT_DIR/install/ ]; then
-  echo "Missing install/ dir"
-  exit 1
-fi
-
-# Fix prefix confusion: the build installs to $CI_PROJECT_DIR, but we expect
-# it in /install
-ln -sf $CI_PROJECT_DIR/install /install
-export LD_LIBRARY_PATH=/install/lib
-export LIBGL_DRIVERS_PATH=/install/lib/dri
-
-# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22495#note_1876691
-# The navi21 boards seem to have trouble with ld.so.cache, so try explicitly
-# telling it to look in /usr/local/lib.
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-
-# The Broadcom devices need /usr/local/bin unconditionally added to the path
-export PATH=/usr/local/bin:$PATH
-
-# Store Mesa's disk cache under /tmp, rather than sending it out over NFS.
-export XDG_CACHE_HOME=/tmp
-
-# If we need to specify a driver, it means several drivers could pick up this gpu;
-# ensure that the other driver can't accidentally be used
-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
-
-if [ "$HWCI_FREQ_MAX" = "true" ]; then
-  # Ensure initialization of the DRM device (needed by MSM)
-  head -0 /dev/dri/renderD128
-
-  # Disable GPU frequency scaling
-  DEVFREQ_GOVERNOR=$(find /sys/devices -name governor | grep gpu || true)
-  test -z "$DEVFREQ_GOVERNOR" || echo performance > $DEVFREQ_GOVERNOR || true
-
-  # Disable CPU frequency scaling
-  echo performance | tee -a /sys/devices/system/cpu/cpufreq/policy*/scaling_governor || true
-
-  # Disable GPU runtime power management
-  GPU_AUTOSUSPEND=$(find /sys/devices -name autosuspend_delay_ms | grep gpu | head -1)
-  test -z "$GPU_AUTOSUSPEND" || echo -1 > $GPU_AUTOSUSPEND || true
-  # Lock Intel GPU frequency to 70% of the maximum allowed by hardware
-  # and enable throttling detection & reporting.
-  # Additionally, set the upper limit for CPU scaling frequency to 65% of the
-  # maximum permitted, as an additional measure to mitigate thermal throttling.
-  /install/common/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
-  echo "launch kdl.sh!"
-  $KDL_PATH &
-  BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
-else
-  echo "kdl.sh not found!"
-fi
-
-# Increase freedreno hangcheck timer because it's right at the edge of the
-# spilling tests timing out (and some traces, too)
-if [ -n "$FREEDRENO_HANGCHECK_MS" ]; then
-    echo $FREEDRENO_HANGCHECK_MS | tee -a /sys/kernel/debug/dri/128/hangcheck_period_ms
-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 &
-  BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
-fi
-
-ARCH=$(uname -m)
-export VK_DRIVER_FILES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json"
-
-if [ -n "$HWCI_START_WESTON" ] && [ -n "$HWCI_START_XORG" ]; then
-  echo "Please drop HWCI_START_XORG and instead use Weston XWayland for testing."
-  exit 1
-fi
-
-# If we want Xorg to be running for the test, then we start it up before the
-# HWCI_TEST_SCRIPT because we need to use xinit to start X (otherwise
-# without using -displayfd you can race with Xorg's startup), but xinit will eat
-# your client's return code
-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" &
-  BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
-
-  # Wait for xorg to be ready for connections.
-  for _ in 1 2 3 4 5; do
-    if [ -e /xorg-started ]; then
-      break
-    fi
-    sleep 5
-  done
-  export DISPLAY=:0
-fi
-
-if [ -n "$HWCI_START_WESTON" ]; then
-  . /install/common/weston.sh --renderer=gl
-  BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
-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=$?
-set -e
-
-section_start post_test_cleanup "Cleaning up after testing, uploading results"
-set -x
-
-# 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)
-if [ -n "$S3_RESULTS_UPLOAD" ]; then
-  tar --zstd -cf results.tar.zst results/;
-  ci-fairy s3cp --token-file "${S3_JWT_FILE}" results.tar.zst https://"$S3_RESULTS_UPLOAD"/results.tar.zst
-fi
-
-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: exit_code: $EXIT_CODE"; sleep 1; echo; done
-
-exit $EXIT_CODE
diff --git a/.gitlab-ci/common/intel-gpu-freq.sh b/.gitlab-ci/common/intel-gpu-freq.sh
deleted file mode 100755
index 35da5a9..0000000
--- a/.gitlab-ci/common/intel-gpu-freq.sh
+++ /dev/null
@@ -1,820 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2013
-# shellcheck disable=SC2015
-# shellcheck disable=SC2034
-# shellcheck disable=SC2046
-# shellcheck disable=SC2059
-# shellcheck disable=SC2086 # we want word splitting
-# shellcheck disable=SC2154
-# shellcheck disable=SC2155
-# shellcheck disable=SC2162
-# shellcheck disable=SC2229
-#
-# This is an utility script to manage Intel GPU frequencies.
-# It can be used for debugging performance problems or trying to obtain a stable
-# frequency while benchmarking.
-#
-# Note the Intel i915 GPU driver allows to change the minimum, maximum and boost
-# frequencies in steps of 50 MHz via:
-#
-# /sys/class/drm/card<n>/<freq_info>
-#
-# Where <n> is the DRM card index and <freq_info> one of the following:
-#
-# - gt_max_freq_mhz (enforced maximum freq)
-# - gt_min_freq_mhz (enforced minimum freq)
-# - gt_boost_freq_mhz (enforced boost freq)
-#
-# The hardware capabilities can be accessed via:
-#
-# - gt_RP0_freq_mhz (supported maximum freq)
-# - gt_RPn_freq_mhz (supported minimum freq)
-# - gt_RP1_freq_mhz (most efficient freq)
-#
-# The current frequency can be read from:
-# - 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
-# maximum frequency allowed by the hardware.
-#
-# Copyright (C) 2022 Collabora Ltd.
-# Author: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
-#
-# SPDX-License-Identifier: MIT
-#
-
-#
-# 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
-ACT_FREQ_INFO="act cur"
-THROTT_DETECT_SLEEP_SEC=2
-THROTT_DETECT_PID_FILE_PATH=/tmp/thrott-detect.pid
-
-# CPU
-CPU_SYSFS_PREFIX=/sys/devices/system/cpu
-CPU_PSTATE_SYSFS_PATTERN="${CPU_SYSFS_PREFIX}/intel_pstate/%s"
-CPU_FREQ_SYSFS_PATTERN="${CPU_SYSFS_PREFIX}/cpu%s/cpufreq/%s_freq"
-CAP_CPU_FREQ_INFO="cpuinfo_max cpuinfo_min"
-ENF_CPU_FREQ_INFO="scaling_max scaling_min"
-ACT_CPU_FREQ_INFO="scaling_cur"
-
-#
-# Global variables.
-#
-unset INTEL_DRM_CARD_INDEX
-unset GET_ACT_FREQ GET_ENF_FREQ GET_CAP_FREQ
-unset SET_MIN_FREQ SET_MAX_FREQ
-unset MONITOR_FREQ
-unset CPU_SET_MAX_FREQ
-unset DETECT_THROTT
-unset DRY_RUN
-
-#
-# Simple printf based stderr logger.
-#
-log() {
-    local msg_type=$1
-
-    shift
-    printf "%s: %s: " "${msg_type}" "${0##*/}" >&2
-    printf "$@" >&2
-    printf "\n" >&2
-}
-
-#
-# Helper to print sysfs path for the given card index and freq info.
-#
-# arg1: Frequency info sysfs name, one of *_FREQ_INFO constants above
-# arg2: Video card index, defaults to INTEL_DRM_CARD_INDEX
-#
-print_freq_sysfs_path() {
-    printf ${DRM_FREQ_SYSFS_PATTERN} "${2:-${INTEL_DRM_CARD_INDEX}}" "$1"
-}
-
-#
-# Helper to set INTEL_DRM_CARD_INDEX for the first identified Intel video card.
-#
-identify_intel_gpu() {
-    local i=0 vendor path
-
-    while [ ${i} -lt 16 ]; do
-        [ -c "/dev/dri/card$i" ] || {
-            i=$((i + 1))
-            continue
-        }
-
-        path=$(print_freq_sysfs_path "" ${i})
-        if [ "$USE_XE" -eq 1 ]; then
-            path=${path%/*/*/*/*/*}/device/vendor
-        else
-            path=${path%/*}/device/vendor
-        fi
-
-        [ -r "${path}" ] && read vendor < "${path}" && \
-            [ "${vendor}" = "0x8086" ] && INTEL_DRM_CARD_INDEX=$i && return 0
-
-        i=$((i + 1))
-    done
-
-    return 1
-}
-
-#
-# Read the specified freq info from sysfs.
-#
-# arg1: Flag (y/n) to also enable printing the freq info.
-# arg2...: Frequency info sysfs name(s), see *_FREQ_INFO constants above
-# return: Global variable(s) FREQ_${arg} containing the requested information
-#
-read_freq_info() {
-    local var val info path print=0 ret=0
-
-    [ "$1" = "y" ] && print=1
-    shift
-
-    while [ $# -gt 0 ]; do
-        info=$1
-        shift
-        var=FREQ_${info}
-        path=$(print_freq_sysfs_path "${info}")
-
-        [ -r ${path} ] && read ${var} < ${path} || {
-            log ERROR "Failed to read freq info from: %s" "${path}"
-            ret=1
-            continue
-        }
-
-        [ -n "${var}" ] || {
-            log ERROR "Got empty freq info from: %s" "${path}"
-            ret=1
-            continue
-        }
-
-        [ ${print} -eq 1 ] && {
-            eval val=\$${var}
-            printf "%6s: %4s MHz\n" "${info}" "${val}"
-        }
-    done
-
-    return ${ret}
-}
-
-#
-# Display requested info.
-#
-print_freq_info() {
-    local req_freq
-
-    [ -n "${GET_CAP_FREQ}" ] && {
-        printf "* Hardware capabilities\n"
-        read_freq_info y ${CAP_FREQ_INFO}
-        printf "\n"
-    }
-
-    [ -n "${GET_ENF_FREQ}" ] && {
-        printf "* Enforcements\n"
-        read_freq_info y ${ENF_FREQ_INFO}
-        printf "\n"
-    }
-
-    [ -n "${GET_ACT_FREQ}" ] && {
-        printf "* Actual\n"
-        read_freq_info y ${ACT_FREQ_INFO}
-        printf "\n"
-    }
-}
-
-#
-# Helper to print frequency value as requested by user via '-s, --set' option.
-# arg1: user requested freq value
-#
-compute_freq_set() {
-    local val
-
-    case "$1" in
-    +)
-        val=$(eval "echo \${FREQ_$(echo $CAP_FREQ_INFO | cut -d' ' -f1)}")  # FREQ_rp0 or FREQ_RP0
-        ;;
-    -)
-        val=$(eval "echo \${FREQ_$(echo $CAP_FREQ_INFO | cut -d' ' -f2)}")  # FREQ_rpn or FREQ_RPn
-        ;;
-    *%)
-        val=$((${1%?} * $(eval "echo \${FREQ_$(echo $CAP_FREQ_INFO | cut -d' ' -f1)}") / 100))
-        # Adjust freq to comply with 50 MHz increments
-        val=$((val / 50 * 50))
-        ;;
-    *[!0-9]*)
-        log ERROR "Cannot set freq to invalid value: %s" "$1"
-        return 1
-        ;;
-    "")
-        log ERROR "Cannot set freq to unspecified value"
-        return 1
-        ;;
-    *)
-        # Adjust freq to comply with 50 MHz increments
-        val=$(($1 / 50 * 50))
-        ;;
-    esac
-
-    printf "%s" "${val}"
-}
-
-#
-# Helper for set_freq().
-#
-set_freq_max() {
-    log INFO "Setting GPU max freq to %s MHz" "${SET_MAX_FREQ}"
-
-    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)}") ] && {
-        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)}")"
-        return 1
-    }
-
-    # FREQ_rpn or FREQ_RPn
-    [ ${SET_MAX_FREQ} -lt $(eval "echo \${FREQ_$(echo $CAP_FREQ_INFO | cut -d' ' -f2)}") ] && {
-        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)}")"
-        return 1
-    }
-
-    [ ${SET_MAX_FREQ} -lt ${FREQ_min} ] && {
-        log ERROR "Cannot set GPU max freq (%s) to be less than min freq (%s)" \
-            "${SET_MAX_FREQ}" "${FREQ_min}"
-        return 1
-    }
-
-    [ -z "${DRY_RUN}" ] || return 0
-
-    # Write to max freq path
-    if ! printf "%s" ${SET_MAX_FREQ} | tee $(print_freq_sysfs_path max) > /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
-}
-
-#
-# Helper for set_freq().
-#
-set_freq_min() {
-    log INFO "Setting GPU min freq to %s MHz" "${SET_MIN_FREQ}"
-
-    read_freq_info n max || return $?
-
-    [ ${SET_MIN_FREQ} -gt ${FREQ_max} ] && {
-        log ERROR "Cannot set GPU min freq (%s) to be greater than max freq (%s)" \
-            "${SET_MIN_FREQ}" "${FREQ_max}"
-        return 1
-    }
-
-    [ ${SET_MIN_FREQ} -lt $(eval "echo \${FREQ_$(echo $CAP_FREQ_INFO | cut -d' ' -f2)}") ] && {
-        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)}")"
-        return 1
-    }
-
-    [ -z "${DRY_RUN}" ] || return 0
-
-    if ! printf "%s" ${SET_MIN_FREQ} > $(print_freq_sysfs_path min);
-    then
-        log ERROR "Failed to set GPU min frequency"
-        return 1
-    fi
-}
-
-#
-# Set min or max or both GPU frequencies to the user indicated values.
-#
-set_freq() {
-    # Get hw max & min frequencies
-    read_freq_info n $(echo $CAP_FREQ_INFO | cut -d' ' -f1,2) || return $? # RP0 RPn
-
-    [ -z "${SET_MAX_FREQ}" ] || {
-        SET_MAX_FREQ=$(compute_freq_set "${SET_MAX_FREQ}")
-        [ -z "${SET_MAX_FREQ}" ] && return 1
-    }
-
-    [ -z "${SET_MIN_FREQ}" ] || {
-        SET_MIN_FREQ=$(compute_freq_set "${SET_MIN_FREQ}")
-        [ -z "${SET_MIN_FREQ}" ] && return 1
-    }
-
-    #
-    # Ensure correct operation order, to avoid setting min freq
-    # to a value which is larger than max freq.
-    #
-    # E.g.:
-    #   crt_min=crt_max=600; new_min=new_max=700
-    #   > operation order: max=700; min=700
-    #
-    #   crt_min=crt_max=600; new_min=new_max=500
-    #   > operation order: min=500; max=500
-    #
-    if [ -n "${SET_MAX_FREQ}" ] && [ -n "${SET_MIN_FREQ}" ]; then
-        [ ${SET_MAX_FREQ} -lt ${SET_MIN_FREQ} ] && {
-            log ERROR "Cannot set GPU max freq to be less than min freq"
-            return 1
-        }
-
-        read_freq_info n min || return $?
-
-        if [ ${SET_MAX_FREQ} -lt ${FREQ_min} ]; then
-            set_freq_min || return $?
-            set_freq_max
-        else
-            set_freq_max || return $?
-            set_freq_min
-        fi
-    elif [ -n "${SET_MAX_FREQ}" ]; then
-        set_freq_max
-    elif [ -n "${SET_MIN_FREQ}" ]; then
-        set_freq_min
-    else
-        log "Unexpected call to set_freq()"
-        return 1
-    fi
-}
-
-#
-# Helper for detect_throttling().
-#
-get_thrott_detect_pid() {
-    [ -e ${THROTT_DETECT_PID_FILE_PATH} ] || return 0
-
-    local pid
-    read pid < ${THROTT_DETECT_PID_FILE_PATH} || {
-        log ERROR "Failed to read pid from: %s" "${THROTT_DETECT_PID_FILE_PATH}"
-        return 1
-    }
-
-    local proc_path=/proc/${pid:-invalid}/cmdline
-    [ -r ${proc_path} ] && grep -qs "${0##*/}" ${proc_path} && {
-        printf "%s" "${pid}"
-        return 0
-    }
-
-    # Remove orphaned PID file
-    rm -rf ${THROTT_DETECT_PID_FILE_PATH}
-    return 1
-}
-
-#
-# Control detection and reporting of GPU throttling events.
-# arg1: start - run throttle detector in background
-#       stop - stop throttle detector process, if any
-#       status - verify if throttle detector is running
-#
-detect_throttling() {
-    local pid
-    pid=$(get_thrott_detect_pid)
-
-    case "$1" in
-    status)
-        printf "Throttling detector is "
-        [ -z "${pid}" ] && printf "not running\n" && return 0
-        printf "running (pid=%s)\n" ${pid}
-        ;;
-
-    stop)
-        [ -z "${pid}" ] && return 0
-
-        log INFO "Stopping throttling detector (pid=%s)" "${pid}"
-        kill ${pid}; sleep 1; kill -0 ${pid} 2>/dev/null && kill -9 ${pid}
-        rm -rf ${THROTT_DETECT_PID_FILE_PATH}
-        ;;
-
-    start)
-        [ -n "${pid}" ] && {
-            log WARN "Throttling detector is already running (pid=%s)" ${pid}
-            return 0
-        }
-
-        (
-            read_freq_info n $(echo $CAP_FREQ_INFO | cut -d' ' -f2) || return $? # RPn
-
-            while true; do
-                sleep ${THROTT_DETECT_SLEEP_SEC}
-                read_freq_info n act min cur || exit $?
-
-                #
-                # 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.
-                #
-                [ ${FREQ_act} -lt ${FREQ_min} ] && \
-                [ ${FREQ_act} -gt $(eval "echo \${FREQ_$(echo $CAP_FREQ_INFO | cut -d' ' -f2)}") ] && \
-                [ ${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)}")
-            done
-        ) &
-
-        pid=$!
-        log INFO "Started GPU throttling detector (pid=%s)" ${pid}
-
-        printf "%s\n" ${pid} > ${THROTT_DETECT_PID_FILE_PATH} || \
-            log WARN "Failed to write throttle detector PID file"
-        ;;
-    esac
-}
-
-#
-# Retrieve the list of online CPUs.
-#
-get_online_cpus() {
-    local path cpu_index
-
-    printf "0"
-    for path in $(grep 1 ${CPU_SYSFS_PREFIX}/cpu*/online); do
-        cpu_index=${path##*/cpu}
-        printf " %s" ${cpu_index%%/*}
-    done
-}
-
-#
-# Helper to print sysfs path for the given CPU index and freq info.
-#
-# arg1: Frequency info sysfs name, one of *_CPU_FREQ_INFO constants above
-# arg2: CPU index
-#
-print_cpu_freq_sysfs_path() {
-    printf ${CPU_FREQ_SYSFS_PATTERN} "$2" "$1"
-}
-
-#
-# Read the specified CPU freq info from sysfs.
-#
-# arg1: CPU index
-# arg2: Flag (y/n) to also enable printing the freq info.
-# arg3...: Frequency info sysfs name(s), see *_CPU_FREQ_INFO constants above
-# return: Global variable(s) CPU_FREQ_${arg} containing the requested information
-#
-read_cpu_freq_info() {
-    local var val info path cpu_index print=0 ret=0
-
-    cpu_index=$1
-    [ "$2" = "y" ] && print=1
-    shift 2
-
-    while [ $# -gt 0 ]; do
-        info=$1
-        shift
-        var=CPU_FREQ_${info}
-        path=$(print_cpu_freq_sysfs_path "${info}" ${cpu_index})
-
-        [ -r ${path} ] && read ${var} < ${path} || {
-            log ERROR "Failed to read CPU freq info from: %s" "${path}"
-            ret=1
-            continue
-        }
-
-        [ -n "${var}" ] || {
-            log ERROR "Got empty CPU freq info from: %s" "${path}"
-            ret=1
-            continue
-        }
-
-        [ ${print} -eq 1 ] && {
-            eval val=\$${var}
-            printf "%6s: %4s Hz\n" "${info}" "${val}"
-        }
-    done
-
-    return ${ret}
-}
-
-#
-# Helper to print freq. value as requested by user via '--cpu-set-max' option.
-# arg1: user requested freq value
-#
-compute_cpu_freq_set() {
-    local val
-
-    case "$1" in
-    +)
-        val=${CPU_FREQ_cpuinfo_max}
-        ;;
-    -)
-        val=${CPU_FREQ_cpuinfo_min}
-        ;;
-    *%)
-        val=$((${1%?} * CPU_FREQ_cpuinfo_max / 100))
-        ;;
-    *[!0-9]*)
-        log ERROR "Cannot set CPU freq to invalid value: %s" "$1"
-        return 1
-        ;;
-    "")
-        log ERROR "Cannot set CPU freq to unspecified value"
-        return 1
-        ;;
-    *)
-        log ERROR "Cannot set CPU freq to custom value; use +, -, or % instead"
-        return 1
-        ;;
-    esac
-
-    printf "%s" "${val}"
-}
-
-#
-# Adjust CPU max scaling frequency.
-#
-set_cpu_freq_max() {
-    local target_freq res=0
-    case "${CPU_SET_MAX_FREQ}" in
-    +)
-        target_freq=100
-        ;;
-    -)
-        target_freq=1
-        ;;
-    *%)
-        target_freq=${CPU_SET_MAX_FREQ%?}
-        ;;
-    *)
-        log ERROR "Invalid CPU freq"
-        return 1
-        ;;
-    esac
-
-    local pstate_info=$(printf "${CPU_PSTATE_SYSFS_PATTERN}" max_perf_pct)
-    [ -e "${pstate_info}" ] && {
-        log INFO "Setting intel_pstate max perf to %s" "${target_freq}%"
-        if ! printf "%s" "${target_freq}" > "${pstate_info}";
-	then
-            log ERROR "Failed to set intel_pstate max perf"
-            res=1
-	fi
-    }
-
-    local cpu_index
-    for cpu_index in $(get_online_cpus); do
-        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; }
-
-        log INFO "Setting CPU%s max scaling freq to %s Hz" ${cpu_index} "${target_freq}"
-        [ -n "${DRY_RUN}" ] && continue
-
-        if ! printf "%s" ${target_freq} > $(print_cpu_freq_sysfs_path scaling_max ${cpu_index});
-	then
-            res=1
-            log ERROR "Failed to set CPU%s max scaling frequency" ${cpu_index}
-	fi
-    done
-
-    return ${res}
-}
-
-#
-# Show help message.
-#
-print_usage() {
-    cat <<EOF
-Usage: ${0##*/} [OPTION]...
-
-A script to manage Intel GPU frequencies. Can be used for debugging performance
-problems or trying to obtain a stable frequency while benchmarking.
-
-Note Intel GPUs only accept specific frequencies, usually multiples of 50 MHz.
-
-Options:
-  -g, --get [act|enf|cap|all]
-                        Get frequency information: active (default), enforced,
-                        hardware capabilities or all of them.
-
-  -s, --set [{min|max}=]{FREQUENCY[%]|+|-}
-                        Set min or max frequency to the given value (MHz).
-                        Append '%' to interpret FREQUENCY as % of hw max.
-                        Use '+' or '-' to set frequency to hardware max or min.
-                        Omit min/max prefix to set both frequencies.
-
-  -r, --reset           Reset frequencies to hardware defaults.
-
-  -m, --monitor [act|enf|cap|all]
-                        Monitor the indicated frequencies via 'watch' utility.
-                        See '-g, --get' option for more details.
-
-  -d|--detect-thrott [start|stop|status]
-                        Start (default operation) the throttling detector
-                        as a background process. Use 'stop' or 'status' to
-                        terminate the detector process or verify its status.
-
-  --cpu-set-max [FREQUENCY%|+|-}
-                        Set CPU max scaling frequency as % of hw max.
-                        Use '+' or '-' to set frequency to hardware max or min.
-
-  -r, --reset           Reset frequencies to hardware defaults.
-
-  --dry-run             See what the script will do without applying any
-                        frequency changes.
-
-  -h, --help            Display this help text and exit.
-EOF
-}
-
-#
-# Parse user input for '-g, --get' option.
-# Returns 0 if a value has been provided, otherwise 1.
-#
-parse_option_get() {
-    local ret=0
-
-    case "$1" in
-    act) GET_ACT_FREQ=1;;
-    enf) GET_ENF_FREQ=1;;
-    cap) GET_CAP_FREQ=1;;
-    all) GET_ACT_FREQ=1; GET_ENF_FREQ=1; GET_CAP_FREQ=1;;
-    -*|"")
-        # No value provided, using default.
-        GET_ACT_FREQ=1
-        ret=1
-        ;;
-    *)
-        print_usage
-        exit 1
-        ;;
-    esac
-
-    return ${ret}
-}
-
-#
-# Validate user input for '-s, --set' option.
-# arg1: input value to be validated
-# arg2: optional flag indicating input is restricted to %
-#
-validate_option_set() {
-    case "$1" in
-    +|-|[0-9]%|[0-9][0-9]%)
-        return 0
-        ;;
-    *[!0-9]*|"")
-        print_usage
-        exit 1
-        ;;
-    esac
-
-    [ -z "$2" ] || { print_usage; exit 1; }
-}
-
-#
-# Parse script arguments.
-#
-[ $# -eq 0 ] && { print_usage; exit 1; }
-
-while [ $# -gt 0 ]; do
-    case "$1" in
-    -g|--get)
-        parse_option_get "$2" && shift
-        ;;
-
-    -s|--set)
-        shift
-        case "$1" in
-        min=*)
-            SET_MIN_FREQ=${1#min=}
-            validate_option_set "${SET_MIN_FREQ}"
-            ;;
-        max=*)
-            SET_MAX_FREQ=${1#max=}
-            validate_option_set "${SET_MAX_FREQ}"
-            ;;
-        *)
-            SET_MIN_FREQ=$1
-            validate_option_set "${SET_MIN_FREQ}"
-            SET_MAX_FREQ=${SET_MIN_FREQ}
-            ;;
-        esac
-        ;;
-
-    -r|--reset)
-        RESET_FREQ=1
-        SET_MIN_FREQ="-"
-        SET_MAX_FREQ="+"
-        ;;
-
-    -m|--monitor)
-        MONITOR_FREQ=act
-        parse_option_get "$2" && MONITOR_FREQ=$2 && shift
-        ;;
-
-    -d|--detect-thrott)
-        DETECT_THROTT=start
-        case "$2" in
-        start|stop|status)
-            DETECT_THROTT=$2
-            shift
-            ;;
-        esac
-        ;;
-
-    --cpu-set-max)
-        shift
-        CPU_SET_MAX_FREQ=$1
-        validate_option_set "${CPU_SET_MAX_FREQ}" restricted
-        ;;
-
-    --dry-run)
-        DRY_RUN=1
-        ;;
-
-    -h|--help)
-        print_usage
-        exit 0
-        ;;
-
-    *)
-        print_usage
-        exit 1
-        ;;
-    esac
-
-    shift
-done
-
-#
-# Main
-#
-RET=0
-
-identify_intel_gpu || {
-    log INFO "No Intel GPU detected"
-    exit 0
-}
-
-[ -n "${SET_MIN_FREQ}${SET_MAX_FREQ}" ] && { set_freq || RET=$?; }
-print_freq_info
-
-[ -n "${DETECT_THROTT}" ] && detect_throttling ${DETECT_THROTT}
-
-[ -n "${CPU_SET_MAX_FREQ}" ] && { set_cpu_freq_max || RET=$?; }
-
-[ -n "${MONITOR_FREQ}" ] && {
-    log INFO "Entering frequency monitoring mode"
-    sleep 2
-    exec watch -d -n 1 "$0" -g "${MONITOR_FREQ}"
-}
-
-exit ${RET}
diff --git a/.gitlab-ci/common/kdl.sh b/.gitlab-ci/common/kdl.sh
deleted file mode 100755
index 0459d8e..0000000
--- a/.gitlab-ci/common/kdl.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/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
-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}
diff --git a/.gitlab-ci/common/weston.ini b/.gitlab-ci/common/weston.ini
deleted file mode 100644
index b353577..0000000
--- a/.gitlab-ci/common/weston.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[core]
-backend=headless-backend.so
-xwayland=true
-idle-time=0
-
-[xwayland]
-path=/usr/local/bin/Xwayland
diff --git a/.gitlab-ci/common/weston.sh b/.gitlab-ci/common/weston.sh
deleted file mode 100755
index de36afd..0000000
--- a/.gitlab-ci/common/weston.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-CI_COMMON_DIR=$(dirname -- "${BASH_SOURCE[0]}")
-
-mkdir -p /tmp/.X11-unix
-export DISPLAY=:0
-
-WAYLAND_DISPLAY=wayland-0
-weston --config="$CI_COMMON_DIR/weston.ini" --socket="$WAYLAND_DISPLAY" --log "$RESULTS_DIR/weston.log" --logger-scopes=log,xwm-wm-x11 "$@" &
-export WAYLAND_DISPLAY
-
-while [ ! -S /tmp/.X11-unix/X0 ]; do sleep 1; done
diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml
deleted file mode 100644
index cc32d01..0000000
--- a/.gitlab-ci/conditional-build-image-tags.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-variables:
-  CONDITIONAL_BUILD_ANDROID_CTS_TAG: 2dfd3e288249e4776ef6866d34d344d4
-  CONDITIONAL_BUILD_ANGLE_TAG: e40de41a79653aa19fac70dc6289d8e9
-  CONDITIONAL_BUILD_CROSVM_TAG: 4c61f9707203afca91db3efeb57175db
-  CONDITIONAL_BUILD_FLUSTER_TAG: e13f8521875ebd70e207ec0f6f3d3e5b
-  CONDITIONAL_BUILD_PIGLIT_TAG: 7c554632e450496da9382764f449abae
-  CONDITIONAL_BUILD_VKD3D_PROTON_TAG: 3c680463034cc7273d9e98393861c61c
diff --git a/.gitlab-ci/container/alpine/gitlab-ci.yml b/.gitlab-ci/container/alpine/gitlab-ci.yml
deleted file mode 100644
index b8475aa..0000000
--- a/.gitlab-ci/container/alpine/gitlab-ci.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-# Build the CI Alpine docker images.
-#
-# MESA_IMAGE_TAG is the tag of the docker image used by later stage jobs. If the
-# image doesn't exist yet, the container stage job generates it.
-#
-# In order to generate a new image, one should generally change the tag.
-# While removing the image from the registry would also work, that's not
-# recommended except for ephemeral images during development: Replacing
-# an image after a significant amount of time might pull in newer
-# versions of gcc/clang or other packages, which might break the build
-# with older commits using the same tag.
-#
-# After merging a change resulting in generating a new image to the
-# main repository, it's recommended to remove the image from the source
-# repository's container registry, so that the image from the main
-# repository's registry will be used there as well.
-
-# Alpine based x86_64 build image
-.alpine/x86_64_build-base:
-  extends:
-    - .fdo.container-build@alpine
-    - .container
-  variables:
-    FDO_DISTRIBUTION_VERSION: "3.21"
-    FDO_BASE_IMAGE: alpine:$FDO_DISTRIBUTION_VERSION  # since cbuild ignores it
-
-# Alpine based x86_64 build image
-alpine/x86_64_build:
-  extends:
-    - .alpine/x86_64_build-base
-  variables:
-    MESA_IMAGE_TAG: &alpine-x86_64_build ${ALPINE_X86_64_BUILD_TAG}
-    LLVM_VERSION: &alpine-llvm_version 19
-  rules:
-    - !reference [.container, rules]
-    # Note: the next three lines must remain in that order, so that the rules
-    # in `linkcheck-docs` catch nightly pipelines before the rules in `deploy-docs`
-    # exclude them.
-    - !reference [linkcheck-docs, rules]
-    - !reference [deploy-docs, rules]
-    - !reference [test-docs, rules]
-
-.use-alpine/x86_64_build:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64
-  extends:
-    - .set-image
-  variables:
-    MESA_IMAGE_PATH: "alpine/x86_64_build"
-    MESA_IMAGE_TAG: *alpine-x86_64_build
-    LLVM_VERSION: *alpine-llvm_version
-  needs:
-    - job: sanity
-      optional: true
-    - job: alpine/x86_64_build
-      optional: true
diff --git a/.gitlab-ci/container/alpine/x86_64_build.sh b/.gitlab-ci/container/alpine/x86_64_build.sh
deleted file mode 100644
index 0e6d955..0000000
--- a/.gitlab-ci/container/alpine/x86_64_build.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC1091
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# ALPINE_X86_64_BUILD_TAG
-
-set -e
-
-. .gitlab-ci/setup-test-env.sh
-
-set -o xtrace
-
-EPHEMERAL=(
-)
-
-
-DEPS=(
-    bash
-    bison
-    ccache
-    "clang${LLVM_VERSION}-dev"
-    clang-dev
-    cmake
-    coreutils
-    curl
-    elfutils-dev
-    expat-dev
-    flex
-    g++
-    gcc
-    gettext
-    git
-    glslang
-    graphviz
-    libclc-dev
-    libdrm-dev
-    libpciaccess-dev
-    libva-dev
-    linux-headers
-    "llvm${LLVM_VERSION}-dev"
-    "llvm${LLVM_VERSION}-static"
-    mold
-    musl-dev
-    ninja-build
-    py3-clang
-    py3-cparser
-    py3-mako
-    py3-packaging
-    py3-pip
-    py3-ply
-    py3-yaml
-    python3-dev
-    spirv-llvm-translator-dev
-    spirv-tools-dev
-    util-macros
-    vulkan-headers
-    zlib-dev
-)
-
-apk --no-cache add "${DEPS[@]}" "${EPHEMERAL[@]}"
-
-# shellcheck disable=2016  # we're not trying to evaluate $PATH now
-echo 'export PATH="/usr/lib/ninja-build/bin/:$PATH"' > /etc/profile.d/ninja-path.sh
-source /etc/profile.d/ninja-path.sh
-
-pip3 install --break-system-packages sphinx===8.2.3 hawkmoth===0.19.0
-
-. .gitlab-ci/container/container_pre_build.sh
-
-. .gitlab-ci/container/install-meson.sh
-
-. .gitlab-ci/container/build-rust.sh build
-
-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
diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh
deleted file mode 100644
index a855e1e..0000000
--- a/.gitlab-ci/container/baremetal_build.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2154 # arch is assigned in previous scripts
-
-set -e
-set -o xtrace
-
-# Fetch the arm-built rootfs image and unpack it in our x86_64 container (saves
-# network transfer, disk usage, and runtime on test jobs)
-
-# shellcheck disable=SC2034 # S3_BASE_PATH is used in find_s3_project_artifact
-S3_BASE_PATH="${S3_HOST}/${S3_KERNEL_BUCKET}"
-ARTIFACTS_PATH="${LAVA_DISTRIBUTION_TAG}/lava-rootfs.tar.zst"
-ARTIFACTS_URL="$(find_s3_project_artifact "${ARTIFACTS_PATH}")"
-
-curl-with-retry -o rootfs.tar.zst "${ARTIFACTS_URL}"
-mkdir -p /rootfs-"$arch"
-tar -C /rootfs-"$arch" '--exclude=./dev/*' --zstd -xf rootfs.tar.zst
-rm rootfs.tar.zst
-
-if [[ $arch == "arm64" ]]; then
-    mkdir -p /baremetal-files
-    pushd /baremetal-files
-
-    curl-with-retry -O "${KERNEL_IMAGE_BASE}"/arm64/Image
-    curl-with-retry -O "${KERNEL_IMAGE_BASE}"/arm64/Image.gz
-    popd
-fi
diff --git a/.gitlab-ci/container/build-android-cts.sh b/.gitlab-ci/container/build-android-cts.sh
deleted file mode 100644
index c9eb710..0000000
--- a/.gitlab-ci/container/build-android-cts.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env bash
-#
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_ANDROID_TAG
-
-# This script runs in a container to:
-# 1. Download the Android CTS (Compatibility Test Suite)
-# 2. Filter out unneeded test modules
-# 3. Compress and upload the stripped version to S3
-# Note: The 'build-' prefix in the filename is only to make it compatible
-# with the bin/ci/update_tag.py script.
-
-set -euo pipefail
-
-section_start android-cts "Downloading Android CTS"
-
-# xtrace is getting lost with the section switching
-set -x
-
-# 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 "ANDROID_CTS_TAG"
-
-# List of all CTS modules we might want to run in CI
-# This should be the union of all modules required by our CI jobs
-# Specific modules to run are selected via the ${GPU_VERSION}-android-cts-include.txt files
-ANDROID_CTS_MODULES=(
-    "CtsDeqpTestCases"
-    "CtsGraphicsTestCases"
-    "CtsNativeHardwareTestCases"
-    "CtsSkQPTestCases"
-)
-
-ANDROID_CTS_VERSION="${ANDROID_VERSION}_r3"
-ANDROID_CTS_DEVICE_ARCH="x86"
-
-# Download the stripped CTS from S3, because the CTS download from Google can take 20 minutes
-CTS_FILENAME="android-cts-${ANDROID_CTS_VERSION}-linux_x86-${ANDROID_CTS_DEVICE_ARCH}"
-ARTIFACT_PATH="${DATA_STORAGE_PATH}/android-cts/${ANDROID_CTS_TAG}.tar.zst"
-
-if FOUND_ARTIFACT_URL="$(find_s3_project_artifact "${ARTIFACT_PATH}")"; then
-    echo "Found Android CTS at: ${FOUND_ARTIFACT_URL}"
-    curl-with-retry "${FOUND_ARTIFACT_URL}" | tar --zstd -x -C /
-else
-    echo "No cached CTS found, downloading from Google and uploading to S3..."
-    curl-with-retry --remote-name "https://dl.google.com/dl/android/cts/${CTS_FILENAME}.zip"
-
-    # Disable zipbomb detection, because the CTS zip file is too big
-    # At least locally, it is detected as a zipbomb
-    UNZIP_DISABLE_ZIPBOMB_DETECTION=true \
-        unzip -q -d / "${CTS_FILENAME}.zip"
-    rm "${CTS_FILENAME}.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
-
-    # Using zstd compressed tarball instead of zip, the compression ratio is almost the same, but
-    # the extraction is faster, also LAVA overlays don't support zip compression.
-    tar --zstd -cf "${CTS_FILENAME}.tar.zst" /android-cts
-    ci-fairy s3cp --token-file "${S3_JWT_FILE}" "${CTS_FILENAME}.tar.zst" \
-        "https://${S3_BASE_PATH}/${CI_PROJECT_PATH}/${ARTIFACT_PATH}"
-fi
-
-section_end android-cts
diff --git a/.gitlab-ci/container/build-android-x86_64-llvm.sh b/.gitlab-ci/container/build-android-x86_64-llvm.sh
deleted file mode 100755
index f79cb1b..0000000
--- a/.gitlab-ci/container/build-android-x86_64-llvm.sh
+++ /dev/null
@@ -1,123 +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
-
-# shellcheck disable=SC2034 # S3_BASE_PATH is used in find_s3_project_artifact
-S3_BASE_PATH="${S3_HOST}/${S3_ANDROID_BUCKET}"
-ARTIFACTS_PATH="${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst"
-
-if ARTIFACTS_URL="$(find_s3_project_artifact "${ARTIFACTS_PATH}")"; 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-with-retry -o "/${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst" "${ARTIFACTS_URL}"
-  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-with-retry -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
-  ci-fairy s3cp --token-file "${S3_JWT_FILE}" "${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst" "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CI_PROJECT_PATH}/${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst"
-  rm "${ANDROID_LLVM_ARTIFACT_NAME}.tar.zst"
-fi
-
-apt-get purge -y "${EPHEMERAL[@]}"
diff --git a/.gitlab-ci/container/build-angle.sh b/.gitlab-ci/container/build-angle.sh
deleted file mode 100755
index 7da3ffb..0000000
--- a/.gitlab-ci/container/build-angle.sh
+++ /dev/null
@@ -1,189 +0,0 @@
-#!/usr/bin/env bash
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_ANDROID_TAG
-# DEBIAN_TEST_GL_TAG
-
-set -uex
-
-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="5e591d03650dd427001e355f4884b857cadab113"
-DEPOT_REV="5982a1aeb33dc36382ed8c62eddf52a6135e7dd3"
-
-# 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
-
-# DEPOT tools
-mkdir /depot-tools
-pushd /depot-tools
-git init
-git remote add origin https://chromium.googlesource.com/chromium/tools/depot_tools.git
-git fetch --depth 1 origin "$DEPOT_REV"
-git checkout FETCH_HEAD
-export PATH=/depot-tools:$PATH
-export DEPOT_TOOLS_UPDATE=0
-popd
-
-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}"
-
-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
-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"
-clang_unsafe_buffers_paths=""
-clang_use_chrome_plugins=false
-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}"
-android_ndk_api_level=${ANDROID_SDK_VERSION}
-use_custom_libcxx=true
-EOF
-    ;;
-    *) echo "Unexpected ANGLE_TARGET value: $ANGLE_TARGET"; exit 1;;
-esac
-
-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
-
-  # The Bullseye sysroot is too old for Chromium's default PAC/BTI setup.
-  # Chromium forces -z force-bti on arm64, but our sysroot objects lack BTI
-  # notes, which breaks linking. Disable branch protection to keep the build
-  # sane. See:
-  # https://chromium.googlesource.com/chromium/src/build/+/7c4a6063/config/linux/BUILD.gn#87
-  # https://chromium.googlesource.com/chromium/src/build/+/7c4a6063/config/arm.gni#77
-  cat >> out/Release/args.gn <<EOF
-arm_control_flow_integrity="none"
-EOF
-fi
-
-# The Chromium build system hardcodes these flags, and they're not compatible
-# with our clang19 'unbundled' toolchain. See:
-# https://chromium.googlesource.com/chromium/src/build/+/39d42026/config/compiler/BUILD.gn#619
-# https://chromium.googlesource.com/chromium/src/build/+/42209031/config/sanitizers/sanitizers.gni#548
-sed -i '/-fno-lifetime-dse/d' build/config/compiler/BUILD.gn
-sed -i '/-fsanitize-ignore-for-ubsan-feature=/d' build/config/sanitizers/sanitizers.gni
-
-(
-  # 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/ 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
-
-rm -rf out
-
-popd
-rm -rf /depot-tools
-rm -rf /angle-build
-
-section_end angle
diff --git a/.gitlab-ci/container/build-apitrace.sh b/.gitlab-ci/container/build-apitrace.sh
deleted file mode 100644
index 858cf92..0000000
--- a/.gitlab-ci/container/build-apitrace.sh
+++ /dev/null
@@ -1,27 +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_TEST_BASE_TAG
-
-set -uex
-
-section_start apitrace "Building apitrace"
-
-APITRACE_VERSION="45a005875d348b055d5b88dca285c109dee90457"
-
-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 --build _build --parallel --target apitrace eglretrace
-mkdir build
-cp _build/apitrace build
-cp _build/eglretrace build
-${STRIP_CMD:-strip} build/*
-find . -not -path './build' -not -path './build/*' -delete
-popd
-
-section_end apitrace
diff --git a/.gitlab-ci/container/build-bindgen.sh b/.gitlab-ci/container/build-bindgen.sh
deleted file mode 100644
index 9884557..0000000
--- a/.gitlab-ci/container/build-bindgen.sh
+++ /dev/null
@@ -1,28 +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_BUILD_TAG
-# FEDORA_X86_64_BUILD_TAG
-
-section_start bindgen "Building bindgen"
-
-BINDGEN_VER=0.71.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
diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh
deleted file mode 100644
index d66bd3a..0000000
--- a/.gitlab-ci/container/build-crosvm.sh
+++ /dev/null
@@ -1,56 +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_TEST_BASE_TAG
-
-# 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 "CROSVM_TAG"
-
-set -uex
-
-section_start crosvm "Building crosvm"
-
-git config --global user.email "mesa@example.com"
-git config --global user.name "Mesa CI"
-
-CROSVM_VERSION=f58c8e685f3f21d733861a080a0857acafd0da56
-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=95610d57da49d76617bd6d8d21b9bfb1bf360f64
-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 install -C build
-popd
-
-rm rust-toolchain
-
-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:-}
-
-CROSVM_USE_SYSTEM_MINIGBM=1 CROSVM_USE_SYSTEM_VIRGLRENDERER=1 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
-  -j ${FDO_CI_CONCURRENT:-4} \
-  --locked \
-  --features 'default-no-sandbox gpu x virgl_renderer' \
-  --path . \
-  --root /usr/local \
-  ${EXTRA_CARGO_ARGS:-}
-
-popd
-
-rm -rf /platform/crosvm
-
-section_end crosvm
diff --git a/.gitlab-ci/container/build-deqp-runner.sh b/.gitlab-ci/container/build-deqp-runner.sh
deleted file mode 100644
index f02826b..0000000
--- a/.gitlab-ci/container/build-deqp-runner.sh
+++ /dev/null
@@ -1,98 +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_TEST_BASE_TAG
-
-set -uex
-
-section_start deqp-runner "Building deqp-runner"
-
-DEQP_RUNNER_VERSION=0.23.2
-
-commits_to_backport=(
-)
-
-patch_files=(
-)
-
-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"
-else
-    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
-else
-    cargo install --locked  \
-        -j ${FDO_CI_CONCURRENT:-4} \
-        --root /usr/local --version 2.10.0 \
-        cargo-ndk
-
-    rustup target add $RUST_TARGET
-    RUSTFLAGS='-C target-feature=+crt-static' cargo ndk --target $RUST_TARGET build --release
-
-    mv target/$RUST_TARGET/release/deqp-runner /deqp-runner
-
-    cargo uninstall --locked  \
-        --root /usr/local \
-        cargo-ndk
-fi
-
-popd
-rm -rf deqp-runner-git
-popd
-
-# 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
-    rm -f /usr/local/bin/igt-runner
-fi
-
-section_end deqp-runner
diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh
deleted file mode 100755
index 76e2867..0000000
--- a/.gitlab-ci/container/build-deqp.sh
+++ /dev/null
@@ -1,321 +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_TEST_ANDROID_TAG
-# DEBIAN_TEST_GL_TAG
-# DEBIAN_TEST_VK_TAG
-
-set -ue -o pipefail
-
-# shellcheck disable=SC2153
-deqp_api=${DEQP_API,,}
-
-section_start deqp-$deqp_api "Building dEQP $DEQP_API"
-
-set -x
-
-# 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=634a3fc62d82c34de68c3b1add25e6b7f5777524
-DEQP_VK_VERSION=1.4.4.2
-DEQP_GL_VERSION=4.6.8.0
-DEQP_GLES_VERSION=3.2.14.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
-# directory `$OLDPWD/.gitlab-ci/container/patches/` listed in cts_patch_files).
-# 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=(
-  # Add an option to print to logcat in Android executable builds
-  fc51668efdfd0dffa30b3eddee34aa26172969fb
-)
-
-# shellcheck disable=SC2034
-vk_cts_patch_files=(
-)
-
-# shellcheck disable=SC2034
-gl_cts_commits_to_backport=(
-)
-
-# shellcheck disable=SC2034
-gl_cts_patch_files=(
-  build-deqp-gl_Build-Don-t-build-Vulkan-utilities-for-GL-builds.patch
-)
-
-# shellcheck disable=SC2034
-# GLES builds also EGL
-gles_cts_commits_to_backport=(
-  # Fix EGL render tests for rgba16 and rgb16 unorm fixed point
-  b5ed8718f19492781f8e9be3eb9d3346e961efa9
-  # Fix glGetnUniform* error codes when bufSize < 0
-  34259553e0cc77061465ae0c4bcd4c4658a0fb4a
-)
-
-# shellcheck disable=SC2034
-gles_cts_patch_files=(
-  build-deqp-gl_Build-Don-t-build-Vulkan-utilities-for-GL-builds.patch
-)
-
-
-### Careful editing anything below this line
-
-
-git config --global user.email "mesa@example.com"
-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
-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
-  for i in {5..1}; do
-    if merge_base=$(curl-with-retry -s https://api.github.com/repos/KhronosGroup/VK-GL-CTS/compare/main...$DEQP_MAIN_COMMIT | jq -e -r .merge_base_commit.sha); then
-      break
-    fi
-
-    if [ "$i" -eq 1 ]; then
-      echo "Final attempt to fetch merge base from GitHub failed. VK-GL-CTS GitHub API might be down or rate-limited."
-      exit 1
-    fi
-    sleep 10
-  done
-
-  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-$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[@]"
-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-with-retry $PATCH_URL | GIT_COMMITTER_DATE=$(LC_TIME=C date -d@0) git am -
-done
-
-cts_patch_files="${prefix}_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
-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
-
-# --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
-
-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
-
-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}
-  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}
-
-    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}
-  fi
-fi
-
-cmake -S /VK-GL-CTS -B . -G Ninja \
-      -DDEQP_TARGET=${DEQP_TARGET} \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DSELECTED_BUILD_TARGETS="${CMAKE_SBT}" \
-      ${EXTRA_CMAKE_ARGS:-}
-
-# Make sure `default` doesn't silently stop detecting one of the platforms we care about
-if [ "${DEQP_TARGET}" = 'default' ]; then
-  grep -q DEQP_SUPPORT_WAYLAND=1 build.ninja
-  grep -q DEQP_SUPPORT_X11=1 build.ninja
-  grep -q DEQP_SUPPORT_XCB=1 build.ninja
-fi
-
-ninja "${deqp_build_targets[@]}"
-
-if [ "$DEQP_API" != tools ]; then
-    # Copy out the mustpass lists we want.
-    mkdir -p mustpass
-
-    if [ "${DEQP_API}" = 'VK' ] || [ "${DEQP_API}" = 'VK-main' ]; 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
-        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/
-        cp \
-            /VK-GL-CTS/external/openglcts/data/gl_cts/data/mustpass/gl/khronos_mustpass_single/main/*-single.txt \
-            mustpass/
-    fi
-
-    if [ "${DEQP_API}" = 'GLES' ]; then
-        cp \
-            /VK-GL-CTS/external/openglcts/data/gl_cts/data/mustpass/gles/aosp_mustpass/main/*.txt \
-            mustpass/
-        cp \
-            /VK-GL-CTS/external/openglcts/data/gl_cts/data/mustpass/egl/aosp_mustpass/main/egl-main.txt \
-            mustpass/
-        cp \
-            /VK-GL-CTS/external/openglcts/data/gl_cts/data/mustpass/gles/khronos_mustpass/main/*-main.txt \
-            mustpass/
-    fi
-
-    # Compress the caselists, since Vulkan's in particular are gigantic; higher
-    # compression levels provide no real measurable benefit.
-    zstd -f -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
-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 external/openglcts/modules/cts-runner
-rm -rf modules/internal
-rm -rf execserver
-rm -rf 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
-  ${STRIP_CMD:-strip} external/vulkancts/modules/vulkan/deqp-vk
-fi
-if [ "${DEQP_API}" = 'GL' ] || [ "${DEQP_API}" = 'GLES' ]; then
-  ${STRIP_CMD:-strip} external/openglcts/modules/glcts
-fi
-if [ "${DEQP_API}" = 'GLES' ]; then
-  ${STRIP_CMD:-strip} modules/*/deqp-*
-fi
-du -sh ./*
-popd
-
-section_end deqp-$deqp_api
diff --git a/.gitlab-ci/container/build-directx-headers.sh b/.gitlab-ci/container/build-directx-headers.sh
deleted file mode 100644
index 18e99d0..0000000
--- a/.gitlab-ci/container/build-directx-headers.sh
+++ /dev/null
@@ -1,19 +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_BUILD_TAG
-
-set -uex
-
-section_start directx-headers "Building directx-headers"
-
-git clone https://github.com/microsoft/DirectX-Headers -b v1.619.1 --depth 1
-pushd DirectX-Headers
-meson setup build --backend=ninja --buildtype=release -Dbuild-test=false ${EXTRA_MESON_ARGS:-}
-meson install -C build
-popd
-rm -rf DirectX-Headers
-
-section_end directx-headers
diff --git a/.gitlab-ci/container/build-fluster.sh b/.gitlab-ci/container/build-fluster.sh
deleted file mode 100644
index 79b1334..0000000
--- a/.gitlab-ci/container/build-fluster.sh
+++ /dev/null
@@ -1,52 +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
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_VIDEO_TAG
-
-# Install fluster in /fluster.
-
-set -uex
-
-section_start fluster "Installing Fluster"
-
-# 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 "FLUSTER_TAG"
-
-FLUSTER_REVISION="3dad9c71f4d5eacbb692be6b328a645822b591d6"
-
-git clone https://github.com/fluendo/fluster.git --single-branch --no-checkout
-
-pushd fluster || exit
-git checkout "${FLUSTER_REVISION}"
-popd || exit
-
-ARTIFACT_PATH="${DATA_STORAGE_PATH}/fluster/${FLUSTER_TAG}/vectors.tar.zst"
-
-if FOUND_ARTIFACT_URL="$(find_s3_project_artifact "${ARTIFACT_PATH}")"; then
-    echo "Found fluster vectors at: ${FOUND_ARTIFACT_URL}"
-    mv fluster/ /
-    curl-with-retry "${FOUND_ARTIFACT_URL}" | tar --zstd -x -C /
-else
-    echo "No cached vectors found, rebuilding..."
-    # 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 -j ${FDO_CI_CONCURRENT:-4} \
-	JVT-AVC_V1 JVT-FR-EXT JVT-MVC JVT-Professional_profiles JVT-SVC \
-	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/
-    ci-fairy s3cp --token-file "${S3_JWT_FILE}" "vectors.tar.zst" \
-        "https://${S3_BASE_PATH}/${CI_PROJECT_PATH}/${ARTIFACT_PATH}"
-    mv fluster/ /
-fi
-
-section_end fluster
diff --git a/.gitlab-ci/container/build-fossilize.sh b/.gitlab-ci/container/build-fossilize.sh
deleted file mode 100644
index 9b51ad6..0000000
--- a/.gitlab-ci/container/build-fossilize.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_VK_TAG
-
-set -ex
-
-section_start fossilize "Building fossilize"
-
-git clone https://github.com/ValveSoftware/Fossilize.git
-cd Fossilize
-git checkout b43ee42bbd5631ea21fe9a2dee4190d5d875c327
-git submodule update --init
-mkdir build
-cd build
-cmake -S .. -B . -G Ninja -DCMAKE_BUILD_TYPE=Release
-ninja -C . install
-cd ../..
-rm -rf Fossilize
-
-section_end fossilize
diff --git a/.gitlab-ci/container/build-gfxreconstruct.sh b/.gitlab-ci/container/build-gfxreconstruct.sh
deleted file mode 100644
index 3dceb38..0000000
--- a/.gitlab-ci/container/build-gfxreconstruct.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_VK_TAG
-
-set -ex
-
-section_start gfxreconstruct "Building gfxreconstruct"
-
-GFXRECONSTRUCT_VERSION=6670c53aa2013d1e839e57410f8b332dc58e38ce
-
-git clone https://github.com/LunarG/gfxreconstruct.git \
-    --single-branch \
-    -b master \
-    --no-checkout \
-    /gfxreconstruct
-pushd /gfxreconstruct
-git checkout "$GFXRECONSTRUCT_VERSION"
-git submodule update --init
-git submodule update
-cmake -S . -B _build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=/gfxreconstruct/build -DBUILD_WERROR=OFF
-cmake --build _build --parallel --target tools/{replay,info}/install/strip
-find . -not -path './build' -not -path './build/*' -delete
-popd
-
-section_end gfxreconstruct
diff --git a/.gitlab-ci/container/build-kdl.sh b/.gitlab-ci/container/build-kdl.sh
deleted file mode 100755
index 640790e..0000000
--- a/.gitlab-ci/container/build-kdl.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC1091  # the path is created by the script
-
-set -ex
-
-section_start kdl "Building kdl"
-
-KDL_REVISION="42218ba7297a28d64ddd1d4b5f200a60b3659d42"
-KDL_CHECKOUT_DIR="/tmp/ci-kdl.git"
-
-mkdir -p ${KDL_CHECKOUT_DIR}
-pushd ${KDL_CHECKOUT_DIR}
-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
-)
-
-rm -rf ${KDL_CHECKOUT_DIR}
-
-section_end kdl
diff --git a/.gitlab-ci/container/build-libclc.sh b/.gitlab-ci/container/build-libclc.sh
deleted file mode 100644
index f3c652a..0000000
--- a/.gitlab-ci/container/build-libclc.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-
-set -uex
-
-section_start libclc "Building libclc"
-
-export LLVM_CONFIG="llvm-config-${LLVM_VERSION:?"llvm unset!"}"
-LLVM_TAG="llvmorg-15.0.7"
-
-$LLVM_CONFIG --version
-
-git config --global user.email "mesa@example.com"
-git config --global user.name "Mesa CI"
-git clone \
-    https://github.com/llvm/llvm-project \
-    --depth 1 \
-    -b "${LLVM_TAG}" \
-    /llvm-project
-
-mkdir /libclc
-pushd /libclc
-cmake -S /llvm-project/libclc -B . -G Ninja -DLLVM_CONFIG="$LLVM_CONFIG" -DLIBCLC_TARGETS_TO_BUILD="spirv-mesa3d-;spirv64-mesa3d-" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DLLVM_SPIRV=/usr/bin/llvm-spirv
-ninja
-ninja install
-popd
-
-# workaroud cmake vs debian packaging.
-mkdir -p /usr/lib/clc
-ln -s /usr/share/clc/spirv64-mesa3d-.spv /usr/lib/clc/
-ln -s /usr/share/clc/spirv-mesa3d-.spv /usr/lib/clc/
-
-du -sh ./*
-rm -rf /libclc /llvm-project
-
-section_end libclc
diff --git a/.gitlab-ci/container/build-libdrm.sh b/.gitlab-ci/container/build-libdrm.sh
deleted file mode 100644
index 479ea07..0000000
--- a/.gitlab-ci/container/build-libdrm.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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)
-# shellcheck disable=SC2086 # we want word splitting
-
-set -uex
-
-section_start libdrm "Building libdrm"
-
-export LIBDRM_VERSION=libdrm-2.4.122
-
-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 install -C build
-cd ..
-rm -rf "$LIBDRM_VERSION"
-
-section_end libdrm
diff --git a/.gitlab-ci/container/build-llvm-spirv.sh b/.gitlab-ci/container/build-llvm-spirv.sh
deleted file mode 100644
index 06565a8..0000000
--- a/.gitlab-ci/container/build-llvm-spirv.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-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
-
-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"
-tar -xvf "v${VER}.tar.gz" && rm "v${VER}.tar.gz"
-
-mkdir "SPIRV-LLVM-Translator-${VER}/build"
-pushd "SPIRV-LLVM-Translator-${VER}/build"
-cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
-ninja
-ninja install
-# For some reason llvm-spirv is not installed by default
-ninja llvm-spirv
-cp tools/llvm-spirv/llvm-spirv /usr/bin/
-popd
-
-du -sh "SPIRV-LLVM-Translator-${VER}"
-rm -rf "SPIRV-LLVM-Translator-${VER}"
-
-section_end llvm-spirv
diff --git a/.gitlab-ci/container/build-mold.sh b/.gitlab-ci/container/build-mold.sh
deleted file mode 100644
index f113342..0000000
--- a/.gitlab-ci/container/build-mold.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# ALPINE_X86_64_BUILD_TAG
-# DEBIAN_BUILD_TAG
-# DEBIAN_TEST_BASE_TAG
-# FEDORA_X86_64_BUILD_TAG
-
-set -ex
-
-section_start mold "Building mold"
-
-MOLD_VERSION="2.40.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 {} +
-
-popd
-rm -rf mold
-
-section_end mold
diff --git a/.gitlab-ci/container/build-perfetto.sh b/.gitlab-ci/container/build-perfetto.sh
deleted file mode 100755
index 328851d..0000000
--- a/.gitlab-ci/container/build-perfetto.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/env bash
-
-set -uex
-
-section_start perfetto "Building perfetto"
-
-BASE_PWD=$PWD
-
-PERFETTO_REVISION=$(grep 'revision =' subprojects/perfetto.wrap | cut -d ' ' -f3)
-
-patch_files=(
-  "build-perfetto-Fix-C-standard-library-build-errors-with-Debian-13.patch"
-)
-
-# Set PERFETTO_ARCH based on DEBIAN_ARCH
-if [[ -z "${PERFETTO_ARCH:-}" ]]; then
-  case "$DEBIAN_ARCH" in
-    amd64) PERFETTO_ARCH=x64;;
-    arm64) PERFETTO_ARCH=arm64;;
-  esac
-fi
-
-git clone --branch "$PERFETTO_REVISION" --depth 1 https://github.com/google/perfetto /perfetto
-
-pushd /perfetto
-
-for patch in "${patch_files[@]}"; do
-  echo "Applying patch: $patch"
-  git am "$BASE_PWD/.gitlab-ci/container/patches/$patch"
-done
-
-# Base GN args
-mkdir -p _build
-cat >_build/args.gn <<EOF
-is_debug=false
-target_cpu="${PERFETTO_ARCH}"
-target_os="${PERFETTO_TARGET}"
-EOF
-
-case "$PERFETTO_TARGET" in
-linux)
-        # Override Perfetto’s default toolchain selection here, as the bundled
-        # arm64 toolchain is an x86-64 -> arm64 cross-compiler.
-        cat >>_build/args.gn <<EOF
-is_system_compiler = true
-is_hermetic_clang = false
-ar = "ar"
-cc = "clang-${LLVM_VERSION}"
-cxx = "clang++-${LLVM_VERSION}"
-extra_ldflags = "-fuse-ld=lld-${LLVM_VERSION} -lpthread -ldl"
-EOF
-        ./tools/install-build-deps
-        ;;
-android)
-        # No additional args needed when cross-building for Android
-        ./tools/install-build-deps --android
-        ;;
-*)
-        echo "Unexpected PERFETTO_TARGET value: $PERFETTO_TARGET"
-        exit 1
-        ;;
-esac
-
-./tools/gn gen _build/
-./tools/ninja -C _build/ tracebox
-
-mkdir -p build
-cp _build/tracebox build/
-
-"${STRIP_CMD:-strip}" build/tracebox || true
-
-# Cleanup everything except build/
-find . -mindepth 1 -maxdepth 1 ! -name build -exec rm -rf {} +
-
-popd
-
-section_end perfetto
diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh
deleted file mode 100644
index 02335b9..0000000
--- a/.gitlab-ci/container/build-piglit.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC2086 # we want word splitting
-set -uex
-
-section_start piglit "Building piglit"
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_GL_TAG
-# DEBIAN_TEST_VK_TAG
-
-# 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 "PIGLIT_TAG"
-
-REV="11ce9eb56edb00e6a7702d13168cc827ce5e0cbd"
-
-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 {} \;
-rm -rf target_api
-if [ "${PIGLIT_BUILD_TARGETS:-}" = "piglit_replayer" ]; then
-    find . -depth \
-         ! -regex "^\.$" \
-         ! -regex "^\.\/piglit.*" \
-         ! -regex "^\.\/framework.*" \
-         ! -regex "^\.\/bin$" \
-         ! -regex "^\.\/bin\/replayer\.py" \
-         ! -regex "^\.\/templates.*" \
-         ! -regex "^\.\/tests$" \
-         ! -regex "^\.\/tests\/replay\.py" \
-         -exec rm -rf {} \; 2>/dev/null
-fi
-popd
-
-section_end piglit
diff --git a/.gitlab-ci/container/build-rust.sh b/.gitlab-ci/container/build-rust.sh
deleted file mode 100644
index b21e4fc..0000000
--- a/.gitlab-ci/container/build-rust.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-# Note that this script is not actually "building" rust, but build- is the
-# convention for the shared helpers for putting stuff in our containers.
-
-set -ex
-
-section_start rust "Building Rust toolchain"
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BUILD_BASE_TAG
-# DEBIAN_TEST_BASE_TAG
-
-MINIMUM_SUPPORTED_RUST_VERSION=$(python3 -c 'import tomllib; print(tomllib.load(open("clippy.toml", "rb"))["msrv"])')
-
-# This version number can be bumped freely, to benefit from the latest
-# diagnostics in CI `build-only` jobs, and for building external CI
-# components.
-LATEST_RUST_VERSION=1.90.0
-
-# 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
-# with.
-curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \
-      --default-toolchain $LATEST_RUST_VERSION \
-      --profile minimal \
-      --component clippy,rustfmt \
-      -y
-
-# Make rustup tools available in the PATH environment variable
-# shellcheck disable=SC1091
-. "$HOME/.cargo/env"
-
-if [ "$1" = "build" ]
-then
-  rustup toolchain install --profile minimal --component clippy,rustfmt "$MINIMUM_SUPPORTED_RUST_VERSION"
-fi
-
-find "$HOME"/.rustup/toolchains/*/lib -type f -name "*.so" -exec strip {} \;
-find "$HOME"/.rustup/toolchains -type f -executable -exec strip {} \;
-
-# 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
-[target.armv7-unknown-linux-gnueabihf]
-linker = "arm-linux-gnueabihf-gcc"
-
-[target.aarch64-unknown-linux-gnu]
-linker = "aarch64-linux-gnu-gcc"
-EOF
-
-section_end rust
diff --git a/.gitlab-ci/container/build-shader-db.sh b/.gitlab-ci/container/build-shader-db.sh
deleted file mode 100644
index 7b50c95..0000000
--- a/.gitlab-ci/container/build-shader-db.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BUILD_TAG
-
-set -ex
-
-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
diff --git a/.gitlab-ci/container/build-skqp.sh b/.gitlab-ci/container/build-skqp.sh
deleted file mode 100755
index bff3b2f..0000000
--- a/.gitlab-ci/container/build-skqp.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
-#
-# Copyright © 2022 Collabora Limited
-# Author: Guilherme Gallo <guilherme.gallo@collabora.com>
-#
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_GL_TAG
-
-set -uex
-
-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)
-
-create_gn_args() {
-    # gn can be configured to cross-compile skia and its tools
-    # It is important to set the target_cpu to guarantee the intended target
-    # machine
-    cp "${BASE_ARGS_GN_FILE}" "${SKQP_OUT_DIR}"/args.gn
-    echo "target_cpu = \"${SKQP_ARCH}\"" >> "${SKQP_OUT_DIR}"/args.gn
-}
-
-
-download_skia_source() {
-    if [ -z ${SKIA_DIR+x} ]
-    then
-        return 1
-    fi
-
-    # Skia cloned from https://android.googlesource.com/platform/external/skqp
-    # has all needed assets tracked on git-fs
-    SKQP_REPO=https://android.googlesource.com/platform/external/skqp
-
-    git clone --branch "${SKQP_BRANCH}" --depth 1 "${SKQP_REPO}" "${SKIA_DIR}"
-}
-
-download_skia_source
-
-pushd "${SKIA_DIR}"
-
-# Apply all skqp patches for Mesa CI
-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.
-python3 tools/git-sync-deps
-
-mkdir -p "${SKQP_OUT_DIR}"
-mkdir -p "${SKQP_INSTALL_DIR}"
-
-create_gn_args
-
-# Build and install skqp binaries
-bin/gn gen "${SKQP_OUT_DIR}"
-
-for BINARY in "${SKQP_BINARIES[@]}"
-do
-    /usr/bin/ninja -C "${SKQP_OUT_DIR}" "${BINARY}"
-    # Strip binary, since gn is not stripping it even when `is_debug == false`
-    ${STRIP_CMD:-strip} "${SKQP_OUT_DIR}/${BINARY}"
-    install -m 0755 "${SKQP_OUT_DIR}/${BINARY}" "${SKQP_INSTALL_DIR}"
-done
-
-# Move assets to the target directory, which will reside in rootfs.
-mv platform_tools/android/apps/skqp/src/main/assets/ "${SKQP_ASSETS_DIR}"
-
-popd
-rm -Rf "${SKIA_DIR}"
-
-set +ex
-
-section_end skqp
diff --git a/.gitlab-ci/container/build-skqp_base.gn b/.gitlab-ci/container/build-skqp_base.gn
deleted file mode 100644
index 1a64da3..0000000
--- a/.gitlab-ci/container/build-skqp_base.gn
+++ /dev/null
@@ -1,64 +0,0 @@
-cc = "clang"
-cxx = "clang++"
-
-extra_cflags = [
-        "-Wno-error",
-
-        "-DSK_ENABLE_DUMP_GPU",
-        "-DSK_BUILD_FOR_SKQP"
-    ]
-extra_cflags_cc = [
-        "-Wno-error",
-
-        # skqp build process produces a lot of compilation warnings, silencing
-        # most of them to remove clutter and avoid the CI job log to exceed the
-        # maximum size
-
-        # GCC flags
-        "-Wno-redundant-move",
-        "-Wno-suggest-override",
-        "-Wno-class-memaccess",
-        "-Wno-deprecated-copy",
-        "-Wno-uninitialized",
-
-        # Clang flags
-        "-Wno-macro-redefined",
-        "-Wno-anon-enum-enum-conversion",
-        "-Wno-suggest-destructor-override",
-        "-Wno-return-std-move-in-c++11",
-        "-Wno-extra-semi-stmt",
-        "-Wno-reserved-identifier",
-        "-Wno-bitwise-instead-of-logical",
-        "-Wno-reserved-identifier",
-        "-Wno-psabi",
-        "-Wno-unused-but-set-variable",
-        "-Wno-sizeof-array-div",
-        "-Wno-string-concatenation",
-        "-Wno-unsafe-buffer-usage",
-        "-Wno-switch-default",
-        "-Wno-cast-function-type-strict",
-        "-Wno-format",
-        "-Wno-enum-constexpr-conversion",
-    ]
-
-cc_wrapper = "ccache"
-
-is_debug = false
-
-skia_enable_fontmgr_android = false
-skia_enable_fontmgr_empty = true
-skia_enable_pdf = false
-skia_enable_skottie = false
-
-skia_skqp_global_error_tolerance = 8
-skia_tools_require_resources = true
-
-skia_use_dng_sdk = false
-skia_use_expat = true
-skia_use_icu = false
-skia_use_libheif = false
-skia_use_lua = false
-skia_use_piex = false
-skia_use_vulkan = true
-
-target_os = "linux"
diff --git a/.gitlab-ci/container/build-va-tools.sh b/.gitlab-ci/container/build-va-tools.sh
deleted file mode 100644
index f9b6609..0000000
--- a/.gitlab-ci/container/build-va-tools.sh
+++ /dev/null
@@ -1,28 +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_TEST_VIDEO_TAG
-
-set -uex
-
-section_start va-tools "Building va-tools"
-
-git config --global user.email "mesa@example.com"
-git config --global user.name "Mesa CI"
-
-git clone \
-    https://github.com/intel/libva-utils.git \
-    -b 2.22.0 \
-    --depth 1 \
-    /va-utils
-
-pushd /va-utils
-
-meson setup build -D tests=true -Dprefix=/va ${EXTRA_MESON_ARGS:-}
-meson install -C build
-popd
-rm -rf /va-utils
-
-section_end va-tools
diff --git a/.gitlab-ci/container/build-vkd3d-proton.sh b/.gitlab-ci/container/build-vkd3d-proton.sh
deleted file mode 100644
index c6575e1..0000000
--- a/.gitlab-ci/container/build-vkd3d-proton.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_VK_TAG
-set -ex
-
-section_start vkd3d-proton "Building vkd3d-proton"
-
-# 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 "VKD3D_PROTON_TAG"
-
-VKD3D_PROTON_COMMIT="a83811bf228ec4e7fc09727388521c725126d868"
-
-VKD3D_PROTON_DST_DIR="/vkd3d-proton-tests"
-VKD3D_PROTON_SRC_DIR="/vkd3d-proton-src"
-VKD3D_PROTON_WINE_DIR="/vkd3d-proton-wine64"
-VKD3D_PROTON_S3_ARTIFACT="vkd3d-proton.tar.zst"
-
-if [ ! -d "$VKD3D_PROTON_WINE_DIR" ]; then
-  echo "Fatal: Directory '$VKD3D_PROTON_WINE_DIR' does not exist. Aborting."
-  exit 1
-fi
-
-mkdir -p "$VKD3D_PROTON_SRC_DIR"
-pushd "$VKD3D_PROTON_SRC_DIR"
-git init
-git remote add origin https://github.com/HansKristian-Work/vkd3d-proton.git
-git fetch --depth 1 origin "$VKD3D_PROTON_COMMIT"
-git checkout FETCH_HEAD
-git submodule update --init --recursive
-
-meson setup build --buildtype release -D enable_tests=true \
-      -D c_args=-Wno-error=incompatible-pointer-types
-# Build and install specifically the bits we want; gets rid of 24MB of
-# unwanted files, keeping only 7.6MB of the three useful files.
-for file in \
-  libs/d3d12/libvkd3d-proton-d3d12.so \
-  libs/d3d12core/libvkd3d-proton-d3d12core.so \
-  tests/d3d12 \
-; do
-  ninja -C build "$file"
-  strip build/"$file"
-  install -Dm755 -t "${VKD3D_PROTON_DST_DIR}/$(dirname "$file")" build/"$file"
-done
-
-install -m755 -t "${VKD3D_PROTON_DST_DIR}/tests" tests/test-runner.sh
-popd
-
-# Archive and upload vkd3d-proton for use as a LAVA overlay, if the archive doesn't exist yet
-ARTIFACT_PATH="${DATA_STORAGE_PATH}/vkd3d-proton/${VKD3D_PROTON_TAG}/${CI_JOB_NAME}/${VKD3D_PROTON_S3_ARTIFACT}"
-if FOUND_ARTIFACT_URL="$(find_s3_project_artifact "${ARTIFACT_PATH}")"; then
-  echo "Found vkd3d-proton at: ${FOUND_ARTIFACT_URL}, skipping upload"
-else
-  echo "Uploaded vkd3d-proton not found, reuploading..."
-  tar --zstd -cf "$VKD3D_PROTON_S3_ARTIFACT" -C / "${VKD3D_PROTON_DST_DIR#/}" "${VKD3D_PROTON_WINE_DIR#/}"
-  ci-fairy s3cp --token-file "${S3_JWT_FILE}" "$VKD3D_PROTON_S3_ARTIFACT" \
-    "https://${S3_BASE_PATH}/${CI_PROJECT_PATH}/${ARTIFACT_PATH}"
-  rm "$VKD3D_PROTON_S3_ARTIFACT"
-fi
-
-rm -rf "$VKD3D_PROTON_SRC_DIR"
-
-section_end vkd3d-proton
diff --git a/.gitlab-ci/container/build-vulkan-validation.sh b/.gitlab-ci/container/build-vulkan-validation.sh
deleted file mode 100644
index 86411dc..0000000
--- a/.gitlab-ci/container/build-vulkan-validation.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_GL_TAG
-
-set -uex
-
-section_start vulkan-validation "Building Vulkan validation layers"
-
-VALIDATION_TAG="cb2acdf7f49053406770ae73cbb315229a9131eb"
-
-mkdir Vulkan-ValidationLayers
-pushd Vulkan-ValidationLayers
-git init
-git remote add origin https://github.com/KhronosGroup/Vulkan-ValidationLayers.git
-git fetch --depth 1 origin "$VALIDATION_TAG"
-git checkout FETCH_HEAD
-
-# 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
-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
-popd
-rm -rf Vulkan-ValidationLayers
-
-section_end vulkan-validation
diff --git a/.gitlab-ci/container/build-wayland.sh b/.gitlab-ci/container/build-wayland.sh
deleted file mode 100644
index b31d0f4..0000000
--- a/.gitlab-ci/container/build-wayland.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-
-set -uex
-
-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
-# FEDORA_X86_64_BUILD_TAG
-
-export LIBWAYLAND_VERSION="1.24.0"
-export WAYLAND_PROTOCOLS_VERSION="1.41"
-
-git clone https://gitlab.freedesktop.org/wayland/wayland
-cd wayland
-git checkout "$LIBWAYLAND_VERSION"
-
-# Build the native library and scanner first in case we're a cross build.
-# Note the lack of EXTRA_MESON_ARGS here.
-meson setup -Dtests=false -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true -Dscanner=true _build
-meson install -C _build
-
-# Now build cross libwayland using the native scanner
-meson setup -Dtests=false -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true -Dscanner=false _cross ${EXTRA_MESON_ARGS:-}
-meson install -C _cross
-cd ..
-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 install -C _build
-cd ..
-rm -rf wayland-protocols
-
-section_end wayland
diff --git a/.gitlab-ci/container/build-weston.sh b/.gitlab-ci/container/build-weston.sh
deleted file mode 100644
index 526795b..0000000
--- a/.gitlab-ci/container/build-weston.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-
-set -uex
-
-section_start weston "Building Weston"
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_BASE_TAG
-
-export WESTON_VERSION="14.0.1"
-
-git clone https://gitlab.freedesktop.org/wayland/weston
-cd weston
-git checkout "$WESTON_VERSION"
-patch -p1 < "$OLDPWD/.gitlab-ci/container/patches/weston-no-xwm.patch"
-meson setup \
-    -Dbackend-drm=false \
-    -Dbackend-drm-screencast-vaapi=false \
-    -Dbackend-headless=true \
-    -Dbackend-pipewire=false \
-    -Dbackend-rdp=false \
-    -Dscreenshare=false \
-    -Dbackend-vnc=false \
-    -Dbackend-wayland=false \
-    -Dbackend-x11=false \
-    -Dbackend-default=headless \
-    -Drenderer-gl=true \
-    -Dxwayland=true \
-    -Dsystemd=false \
-    -Dremoting=false \
-    -Dpipewire=false \
-    -Dshell-desktop=true \
-    -Dshell-fullscreen=false \
-    -Dshell-ivi=false \
-    -Dshell-kiosk=false \
-    -Dcolor-management-lcms=false \
-    -Dimage-jpeg=false \
-    -Dimage-webp=false \
-    -Dtools= \
-    -Ddemo-clients=false \
-    -Dsimple-clients= \
-    -Dresize-pool=false \
-    -Dwcap-decode=false \
-    -Dtests=false \
-    -Ddoc=false \
-    -Dno-xwm-decorations=true \
-    _build ${EXTRA_MESON_ARGS:-}
-meson install -C _build
-cd ..
-rm -rf weston
-
-section_end weston
diff --git a/.gitlab-ci/container/build-xwayland.sh b/.gitlab-ci/container/build-xwayland.sh
deleted file mode 100644
index d55f223..0000000
--- a/.gitlab-ci/container/build-xwayland.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-
-set -uex
-
-section_start xwayland "Building XWayland"
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_BASE_TAG
-#
-export XORGPROTO_VERSION="xorgproto-2024.1"
-export XWAYLAND_VERSION="xwayland-24.1.8"
-
-git clone https://gitlab.freedesktop.org/xorg/proto/xorgproto
-cd xorgproto
-git checkout "$XORGPROTO_VERSION"
-meson setup _build ${EXTRA_MESON_ARGS:-}
-meson install -C _build
-cd ..
-rm -rf xorgproto
-
-git clone https://gitlab.freedesktop.org/xorg/xserver
-cd xserver
-git checkout "$XWAYLAND_VERSION"
-meson setup _build ${EXTRA_MESON_ARGS:-}
-meson install -C _build
-cd ..
-rm -rf xserver
-
-section_end xwayland
diff --git a/.gitlab-ci/container/container_job_trampoline.sh b/.gitlab-ci/container/container_job_trampoline.sh
deleted file mode 100755
index becbc06..0000000
--- a/.gitlab-ci/container/container_job_trampoline.sh
+++ /dev/null
@@ -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"
diff --git a/.gitlab-ci/container/container_post_build.sh b/.gitlab-ci/container/container_post_build.sh
deleted file mode 100755
index 090879b..0000000
--- a/.gitlab-ci/container/container_post_build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-if test -f /etc/debian_version; then
-    apt-get autoremove -y --purge
-fi
-
-# Clean up any build cache
-rm -rf /root/.cache
-
-if test -x /usr/bin/ccache; then
-    ccache --show-stats
-fi
diff --git a/.gitlab-ci/container/container_pre_build.sh b/.gitlab-ci/container/container_pre_build.sh
deleted file mode 100755
index 7c5ac6a..0000000
--- a/.gitlab-ci/container/container_pre_build.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/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
-        CCACHE_PATH=/usr/lib/ccache
-    elif test -f /etc/alpine-release; then
-        CCACHE_PATH=/usr/lib/ccache/bin
-    else
-        CCACHE_PATH=/usr/lib64/ccache
-    fi
-
-    # Common setup among container builds before we get to building code.
-
-    export CCACHE_COMPILERCHECK=content
-    export CCACHE_COMPRESS=true
-    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"
-    export CXX="${CCACHE_PATH}/g++"
-
-    ccache --show-stats
-fi
-
-# Make a wrapper script for ninja to always include the -j flags
-{
-    echo '#!/bin/sh -x'
-    # shellcheck disable=SC2016
-    echo '/usr/bin/ninja -j${FDO_CI_CONCURRENT:-4} "$@"'
-} > /usr/local/bin/ninja
-chmod +x /usr/local/bin/ninja
-
-# Set MAKEFLAGS so that all make invocations in container builds include the
-# flags (doesn't apply to non-container builds, but we don't run make there)
-export MAKEFLAGS="-j${FDO_CI_CONCURRENT:-4}"
-
-# 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
diff --git a/.gitlab-ci/container/create-android-cross-file.sh b/.gitlab-ci/container/create-android-cross-file.sh
deleted file mode 100755
index ab685b9..0000000
--- a/.gitlab-ci/container/create-android-cross-file.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BUILD_TAG
-
-ndk=$1
-arch=$2
-cpu_family=$3
-cpu=$4
-cross_file="/cross_file-$arch.txt"
-sdk_version=$5
-
-# armv7 has the toolchain split between two names.
-arch2=${6:-$2}
-
-# Note that we disable C++ exceptions, because Mesa doesn't use exceptions,
-# and allowing it in code generation means we get unwind symbols that break
-# the libEGL and driver symbol tests.
-
-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']
-c_ld = 'lld'
-cpp_ld = 'lld'
-strip = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip'
-rust = ['rustc', '--target', '${arch2}']
-pkg-config = ['/usr/bin/pkgconf']
-
-[host_machine]
-system = 'android'
-cpu_family = '$cpu_family'
-cpu = '$cpu'
-endian = 'little'
-
-[properties]
-needs_exe_wrapper = true
-bindgen_clang_arguments = ['-target', '${arch2}', '--sysroot', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot']
-pkg_config_libdir = '/usr/local/lib/${arch2}/pkgconfig/:/${ndk}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/${arch2}/pkgconfig/'
-
-EOF
diff --git a/.gitlab-ci/container/create-android-ndk-pc.sh b/.gitlab-ci/container/create-android-ndk-pc.sh
deleted file mode 100644
index 69a9289..0000000
--- a/.gitlab-ci/container/create-android-ndk-pc.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC2086 # we want word splitting
-
-# Makes a .pc file in the Android NDK for meson to find its libraries.
-
-set -ex
-
-ndk="$1"
-pc="$2"
-cflags="$3"
-libs="$4"
-version="$5"
-sdk_version="$6"
-
-sysroot=$ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot
-
-for arch in \
-        x86_64-linux-android \
-        i686-linux-android \
-        aarch64-linux-android \
-        arm-linux-androideabi; do
-    pcdir=$sysroot/usr/lib/$arch/pkgconfig
-    mkdir -p $pcdir
-
-    cat >$pcdir/$pc <<EOF
-prefix=$sysroot
-exec_prefix=$sysroot
-libdir=$sysroot/usr/lib/$arch/$sdk_version
-sharedlibdir=$sysroot/usr/lib/$arch
-includedir=$sysroot/usr/include
-
-Name: zlib
-Description: zlib compression library
-Version: $version
-
-Requires:
-Libs: -L$sysroot/usr/lib/$arch/$sdk_version $libs
-Cflags: -I$sysroot/usr/include $cflags
-EOF
-done
diff --git a/.gitlab-ci/container/create-cross-file.sh b/.gitlab-ci/container/create-cross-file.sh
deleted file mode 100755
index 3c55920..0000000
--- a/.gitlab-ci/container/create-cross-file.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-arch=$1
-cross_file="/cross_file-$arch.txt"
-meson env2mfile --cross --debarch "$arch" -o "$cross_file"
-
-# Explicitly set ccache path for cross compilers
-sed -i "s|/usr/bin/\([^-]*\)-linux-gnu\([^-]*\)-g|/usr/lib/ccache/\\1-linux-gnu\\2-g|g" "$cross_file"
-
-# Rely on qemu-user being configured in binfmt_misc on the host
-# shellcheck disable=SC1003 # how this sed doesn't seems to work for me locally
-sed -i -e '/\[properties\]/a\' -e "needs_exe_wrapper = False" "$cross_file"
-
-# Add a line for rustc, which meson env2mfile is missing.
-cc=$(sed -n "s|^c\s*=\s*\[?'\(.*\)'\]?|\1|p" < "$cross_file")
-
-if [[ "$arch" = "arm64" ]]; then
-    rust_target=aarch64-unknown-linux-gnu
-elif [[ "$arch" = "armhf" ]]; then
-    rust_target=armv7-unknown-linux-gnueabihf
-elif [[ "$arch" = "i386" ]]; then
-    rust_target=i686-unknown-linux-gnu
-elif [[ "$arch" = "ppc64el" ]]; then
-    rust_target=powerpc64le-unknown-linux-gnu
-elif [[ "$arch" = "riscv64" ]]; then
-    rust_target=riscv64gc-unknown-linux-gnu
-elif [[ "$arch" = "s390x" ]]; then
-    rust_target=s390x-unknown-linux-gnu
-else
-    echo "Needs rustc target mapping"
-fi
-
-# shellcheck disable=SC1003 # how this sed doesn't seems to work for me locally
-sed -i -e '/\[binaries\]/a\' -e "rust = ['rustc', '--target=$rust_target', '-C', 'linker=$cc']" "$cross_file"
-
-# Set up cmake cross compile toolchain file for dEQP builds
-toolchain_file="/toolchain-$arch.cmake"
-if [[ "$arch" = "arm64" ]]; then
-    GCC_ARCH="aarch64-linux-gnu"
-    DE_CPU="DE_CPU_ARM_64"
-elif [[ "$arch" = "armhf" ]]; then
-    GCC_ARCH="arm-linux-gnueabihf"
-    DE_CPU="DE_CPU_ARM"
-fi
-
-if [[ -n "$GCC_ARCH" ]]; then
-    {
-        echo "set(CMAKE_SYSTEM_NAME Linux)";
-        echo "set(CMAKE_SYSTEM_PROCESSOR arm)";
-        echo "set(CMAKE_C_COMPILER /usr/lib/ccache/$GCC_ARCH-gcc)";
-        echo "set(CMAKE_CXX_COMPILER /usr/lib/ccache/$GCC_ARCH-g++)";
-        echo "set(CMAKE_CXX_FLAGS_INIT \"-Wno-psabi\")";  # makes ABI warnings quiet for ARMv7
-        echo "set(ENV{PKG_CONFIG} \"/usr/bin/$GCC_ARCH-pkgconf\")";
-        echo "set(DE_CPU $DE_CPU)";
-    } > "$toolchain_file"
-fi
diff --git a/.gitlab-ci/container/cross_build.sh b/.gitlab-ci/container/cross_build.sh
deleted file mode 100644
index 0554574..0000000
--- a/.gitlab-ci/container/cross_build.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/env bash
-# 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!}"
-
-# Ephemeral packages (installed for this script and removed again at the end)
-EPHEMERAL=(
-)
-
-DEPS=(
-    "crossbuild-essential-$arch"
-    "pkgconf:$arch"
-    "libasan8:$arch"
-    "libdrm-dev:$arch"
-    "libelf-dev:$arch"
-    "libexpat1-dev:$arch"
-    "libffi-dev:$arch"
-    "libpciaccess-dev:$arch"
-    "libstdc++6:$arch"
-    "libvulkan-dev:$arch"
-    "libwayland-client0:$arch"
-    "libwayland-cursor0:$arch"
-    "libwayland-dev:$arch"
-    "libwayland-egl1:$arch"
-    "libwayland-egl-backend-dev:$arch"
-    "libwayland-server0:$arch"
-    "libx11-dev:$arch"
-    "libx11-xcb-dev:$arch"
-    "libxcb-dri2-0-dev:$arch"
-    "libxcb-dri3-dev:$arch"
-    "libxcb-glx0-dev:$arch"
-    "libxcb-present-dev:$arch"
-    "libxcb-randr0-dev:$arch"
-    "libxcb-shm0-dev:$arch"
-    "libxcb-xfixes0-dev:$arch"
-    "libxdamage-dev:$arch"
-    "libxext-dev:$arch"
-    "libxrandr-dev:$arch"
-    "libxshmfence-dev:$arch"
-    "libxxf86vm-dev:$arch"
-)
-
-dpkg --add-architecture $arch
-
-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
-
-apt-get update
-
-apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
-    $EXTRA_LOCAL_PACKAGES
-
-if [[ $arch != "armhf" ]]; then
-    # We don't need clang-format for the crossbuilds, but the installed amd64
-    # package will conflict with libclang. Uninstall clang-format (and its
-    # problematic dependency) to fix.
-    apt-get remove -y "clang-format-${LLVM_VERSION}" "libclang-cpp${LLVM_VERSION}" \
-            "llvm-${LLVM_VERSION}-runtime" "llvm-${LLVM_VERSION}-linker-tools"
-
-    # llvm-*-tools:$arch conflicts with python3:amd64. Install dependencies only
-    # with apt-get, then force-install llvm-*-{dev,tools}:$arch with dpkg to get
-    # around this.
-    apt-get install -y --no-remove --no-install-recommends \
-            "libclang-cpp${LLVM_VERSION}:$arch" \
-            "libgcc-s1:$arch" \
-            "libtinfo-dev:$arch" \
-            "libz3-dev:$arch" \
-            "llvm-${LLVM_VERSION}:$arch" \
-            zlib1g
-fi
-
-. .gitlab-ci/container/create-cross-file.sh $arch
-
-
-. .gitlab-ci/container/container_pre_build.sh
-
-
-# dependencies where we want a specific version
-MULTIARCH_PATH=$(dpkg-architecture -A $arch -qDEB_TARGET_MULTIARCH)
-export EXTRA_MESON_ARGS="--cross-file=/cross_file-${arch}.txt -D libdir=lib/${MULTIARCH_PATH}"
-. .gitlab-ci/container/build-directx-headers.sh
-
-apt-get purge -y "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/container_post_build.sh
-
-# This needs to be done after container_post_build.sh, or apt-get breaks in there
-if [[ $arch != "armhf" ]]; then
-    apt-get download llvm-"${LLVM_VERSION}"-{dev,tools}:"$arch"
-    dpkg -i --force-depends llvm-"${LLVM_VERSION}"-*_"${arch}".deb
-    rm llvm-"${LLVM_VERSION}"-*_"${arch}".deb
-fi
diff --git a/.gitlab-ci/container/debian/android_build.sh b/.gitlab-ci/container/debian/android_build.sh
deleted file mode 100755
index 5b0bad0..0000000
--- a/.gitlab-ci/container/debian/android_build.sh
+++ /dev/null
@@ -1,127 +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_BUILD_TAG
-
-set -e
-
-. .gitlab-ci/setup-test-env.sh
-
-set -x
-
-EPHEMERAL=(
-    autoconf
-    rdfind
-    unzip
-)
-
-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}"
-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/*"
-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.
-rdfind -makehardlinks true -makeresultsfile false /${ndk}/
-# Drop some large tools we won't use in this build.
-find /${ndk}/ -type f \( -iname '*clang-check*' -o -iname '*clang-tidy*' -o -iname '*lldb*' \) -exec rm -f {} \;
-
-sh .gitlab-ci/container/create-android-ndk-pc.sh /$ndk zlib.pc "" "-lz" "1.2.3" $ANDROID_SDK_VERSION
-
-# Install android Rust targets
-rustup target add \
-    x86_64-linux-android \
-    i686-linux-android \
-    aarch64-linux-android \
-    armv7-linux-androideabi
-
-sh .gitlab-ci/container/create-android-cross-file.sh /$ndk x86_64-linux-android x86_64 x86_64 $ANDROID_SDK_VERSION
-sh .gitlab-ci/container/create-android-cross-file.sh /$ndk i686-linux-android x86 x86 $ANDROID_SDK_VERSION
-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 \
-        aarch64-linux-android \
-        arm-linux-androideabi ; do
-    EXTRA_MESON_ARGS="--cross-file=/cross_file-$arch.txt --libdir=lib/$arch -Dnouveau=disabled -Dintel=disabled" \
-    . .gitlab-ci/container/build-libdrm.sh
-done
-
-rm -rf $LIBDRM_VERSION
-
-export LIBELF_VERSION=libelf-0.8.13
-curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-  -O https://fossies.org/linux/misc/old/$LIBELF_VERSION.tar.gz
-
-# Not 100% sure who runs the mirror above so be extra careful
-if ! echo "4136d7b4c04df68b686570afa26988ac ${LIBELF_VERSION}.tar.gz" | md5sum -c -; then
-    echo "Checksum failed"
-    exit 1
-fi
-
-tar -xf ${LIBELF_VERSION}.tar.gz
-cd $LIBELF_VERSION
-
-# Work around a bug in the original configure not enabling __LIBELF64.
-autoreconf
-
-for arch in \
-        x86_64-linux-android \
-        i686-linux-android \
-        aarch64-linux-android \
-        arm-linux-androideabi ; do
-
-    ccarch=${arch}
-    if [ "${arch}" ==  'arm-linux-androideabi' ]
-    then
-       ccarch=armv7a-linux-androideabi
-    fi
-
-    export CC=/${ndk}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar
-    export CC=/${ndk}/toolchains/llvm/prebuilt/linux-x86_64/bin/${ccarch}${ANDROID_SDK_VERSION}-clang
-    export CXX=/${ndk}/toolchains/llvm/prebuilt/linux-x86_64/bin/${ccarch}${ANDROID_SDK_VERSION}-clang++
-    export LD=/${ndk}/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch}-ld
-    export RANLIB=/${ndk}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib
-
-    # The configure script doesn't know about android, but doesn't really use the host anyway it
-    # seems
-    ./configure --host=x86_64-linux-gnu  --disable-nls --disable-shared \
-                --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
-
-. .gitlab-ci/container/build-bindgen.sh
-
-apt-get purge -y "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/container_post_build.sh
diff --git a/.gitlab-ci/container/debian/arm32_test-base.sh b/.gitlab-ci/container/debian/arm32_test-base.sh
deleted file mode 100644
index 5ddc91c..0000000
--- a/.gitlab-ci/container/debian/arm32_test-base.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-DEBIAN_ARCH=armhf \
-. .gitlab-ci/container/debian/test-base.sh
diff --git a/.gitlab-ci/container/debian/arm32_test-gl.sh b/.gitlab-ci/container/debian/arm32_test-gl.sh
deleted file mode 100644
index a4242fb..0000000
--- a/.gitlab-ci/container/debian/arm32_test-gl.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-DEBIAN_ARCH="armhf" \
-. .gitlab-ci/container/debian/test-gl.sh
diff --git a/.gitlab-ci/container/debian/arm32_test-vk.sh b/.gitlab-ci/container/debian/arm32_test-vk.sh
deleted file mode 100644
index 4360c49..0000000
--- a/.gitlab-ci/container/debian/arm32_test-vk.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-DEBIAN_ARCH="armhf" \
-. .gitlab-ci/container/debian/test-vk.sh
diff --git a/.gitlab-ci/container/debian/arm64_build.sh b/.gitlab-ci/container/debian/arm64_build.sh
deleted file mode 100644
index 4f28284..0000000
--- a/.gitlab-ci/container/debian/arm64_build.sh
+++ /dev/null
@@ -1,124 +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_BUILD_TAG
-
-set -e
-
-. .gitlab-ci/setup-test-env.sh
-
-set -o xtrace
-
-: "${LLVM_VERSION:?llvm version not set}"
-
-apt-get -y install ca-certificates curl gnupg2
-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=(
-    libssl-dev
-)
-
-DEPS=(
-    apt-utils
-    android-libext4-utils
-    autoconf
-    automake
-    bc
-    bison
-    ccache
-    cmake
-    curl
-    "clang-${LLVM_VERSION}"
-    dpkg-dev
-    fastboot
-    file
-    flatbuffers-compiler
-    flex
-    g++
-    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
-    libxcb-dri2-0-dev
-    libxcb-dri3-dev
-    libxcb-glx0-dev
-    libxcb-present-dev
-    libxcb-randr0-dev
-    libxcb-shm0-dev
-    libxcb-xfixes0-dev
-    libxdamage-dev
-    libxext-dev
-    libxrandr-dev
-    libxshmfence-dev
-    libxtensor-dev
-    libxxf86vm-dev
-    libwayland-bin
-    libwayland-dev
-    libwayland-egl-backend-dev
-    "llvm-${LLVM_VERSION}-dev"
-    ninja-build
-    openssh-server
-    pkgconf
-    python3-mako
-    python3-pil
-    python3-pip
-    python3-pycparser
-    python3-requests
-    python3-setuptools
-    python3-venv
-    shellcheck
-    u-boot-tools
-    wayland-protocols
-    xz-utils
-    yamllint
-    zlib1g-dev
-    zstd
-)
-
-apt-get update
-
-apt-get -y install "${DEPS[@]}" "${EPHEMERAL[@]}"
-
-# Needed for ci-fairy s3cp
-pip3 install --break-system-packages "ci-fairy[s3] @ git+https://gitlab.freedesktop.org/freedesktop/ci-templates@$MESA_TEMPLATES_COMMIT"
-
-pip3 install --break-system-packages -r bin/ci/test/requirements.txt
-
-. .gitlab-ci/container/install-meson.sh
-
-arch=armhf
-
-. .gitlab-ci/container/cross_build.sh
-
-. .gitlab-ci/container/container_pre_build.sh
-
-. .gitlab-ci/container/build-mold.sh
-
-. .gitlab-ci/container/build-llvm-spirv.sh
-
-. .gitlab-ci/container/build-libclc.sh
-
-. .gitlab-ci/container/build-rust.sh build
-
-. .gitlab-ci/container/build-bindgen.sh
-
-apt-get purge -y "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/container_post_build.sh
diff --git a/.gitlab-ci/container/debian/arm64_test-android-tools.sh b/.gitlab-ci/container/debian/arm64_test-android-tools.sh
deleted file mode 100755
index 5c7916e..0000000
--- a/.gitlab-ci/container/debian/arm64_test-android-tools.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-ANDROID_ARCH=arm64 \
-BUILD_CONTAINER=true \
-TEST_CONTAINER=false \
-DEBIAN_ARCH=amd64 \
-. .gitlab-ci/container/debian/test-android.sh
diff --git a/.gitlab-ci/container/debian/arm64_test-android.sh b/.gitlab-ci/container/debian/arm64_test-android.sh
deleted file mode 100755
index da18b7c..0000000
--- a/.gitlab-ci/container/debian/arm64_test-android.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-ANDROID_ARCH=arm64 \
-BUILD_CONTAINER=false \
-TEST_CONTAINER=true \
-DEBIAN_ARCH=arm64 \
-. .gitlab-ci/container/debian/test-android.sh
diff --git a/.gitlab-ci/container/debian/arm64_test-base.sh b/.gitlab-ci/container/debian/arm64_test-base.sh
deleted file mode 100644
index 6cdafba..0000000
--- a/.gitlab-ci/container/debian/arm64_test-base.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-DEBIAN_ARCH=arm64 \
-. .gitlab-ci/container/debian/test-base.sh
diff --git a/.gitlab-ci/container/debian/arm64_test-gl.sh b/.gitlab-ci/container/debian/arm64_test-gl.sh
deleted file mode 100644
index e9fa3d3..0000000
--- a/.gitlab-ci/container/debian/arm64_test-gl.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-DEBIAN_ARCH="arm64" \
-. .gitlab-ci/container/debian/test-gl.sh
diff --git a/.gitlab-ci/container/debian/arm64_test-vk.sh b/.gitlab-ci/container/debian/arm64_test-vk.sh
deleted file mode 100644
index a994d85..0000000
--- a/.gitlab-ci/container/debian/arm64_test-vk.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-DEBIAN_ARCH="arm64" \
-. .gitlab-ci/container/debian/test-vk.sh
diff --git a/.gitlab-ci/container/debian/baremetal_arm32_test-gl.sh b/.gitlab-ci/container/debian/baremetal_arm32_test-gl.sh
deleted file mode 100644
index c0c7638..0000000
--- a/.gitlab-ci/container/debian/baremetal_arm32_test-gl.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-arch=armhf . .gitlab-ci/container/debian/baremetal_arm_test.sh
diff --git a/.gitlab-ci/container/debian/baremetal_arm64_test-gl.sh b/.gitlab-ci/container/debian/baremetal_arm64_test-gl.sh
deleted file mode 100644
index 7ae8139..0000000
--- a/.gitlab-ci/container/debian/baremetal_arm64_test-gl.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-arch=arm64 . .gitlab-ci/container/debian/baremetal_arm_test.sh
diff --git a/.gitlab-ci/container/debian/baremetal_arm64_test-vk.sh b/.gitlab-ci/container/debian/baremetal_arm64_test-vk.sh
deleted file mode 100644
index 7ae8139..0000000
--- a/.gitlab-ci/container/debian/baremetal_arm64_test-vk.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-arch=arm64 . .gitlab-ci/container/debian/baremetal_arm_test.sh
diff --git a/.gitlab-ci/container/debian/baremetal_arm_test.sh b/.gitlab-ci/container/debian/baremetal_arm_test.sh
deleted file mode 100644
index df45cfd..0000000
--- a/.gitlab-ci/container/debian/baremetal_arm_test.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2154 # arch is assigned in previous scripts
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_BASE_TAG
-
-set -e
-
-. .gitlab-ci/setup-test-env.sh
-
-set -o xtrace
-
-############### Install packages for baremetal testing
-DEPS=(
-    cpio
-    curl
-    netcat-openbsd
-    openssh-server
-    procps
-    python3-filelock
-    python3-fire
-    python3-minimal
-    python3-serial
-    rsync
-    snmp
-    zstd
-)
-
-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
-apt-get update
-
-apt-get install -y --no-remove "${DEPS[@]}"
-
-# setup SNMPv2 SMI MIB
-curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    https://raw.githubusercontent.com/net-snmp/net-snmp/master/mibs/SNMPv2-SMI.txt \
-    -o /usr/share/snmp/mibs/SNMPv2-SMI.txt
-
-. .gitlab-ci/container/baremetal_build.sh
diff --git a/.gitlab-ci/container/debian/gitlab-ci.yml b/.gitlab-ci/container/debian/gitlab-ci.yml
deleted file mode 100644
index c31d849..0000000
--- a/.gitlab-ci/container/debian/gitlab-ci.yml
+++ /dev/null
@@ -1,646 +0,0 @@
-# Build the CI Debian docker images.
-#
-# MESA_IMAGE_TAG is the tag of the docker image used by later stage jobs. If the
-# image doesn't exist yet, the container stage job generates it.
-#
-# In order to generate a new image, one should generally change the tag.
-# While removing the image from the registry would also work, that's not
-# recommended except for ephemeral images during development: Replacing
-# an image after a significant amount of time might pull in newer
-# versions of gcc/clang or other packages, which might break the build
-# with older commits using the same tag.
-#
-# After merging a change resulting in generating a new image to the
-# main repository, it's recommended to remove the image from the source
-# repository's container registry, so that the image from the main
-# repository's registry will be used there as well.
-
-.debian-container-version:
-  variables:
-    FDO_DISTRIBUTION_VERSION: trixie-slim
-
-.debian-container:
-  extends:
-    - .fdo.container-build@debian
-    - .container
-    - .debian-container-version
-
-# Debian based x86_64 build image base
-debian/x86_64_build-base:
-  extends:
-    - .debian-container
-  variables:
-    MESA_IMAGE_TAG: &debian-x86_64_build-base "${DEBIAN_BUILD_BASE_TAG}--${PKG_REPO_REV}"
-    LLVM_VERSION: &debian-x86_64-llvm 19
-
-.use-debian/x86_64_build-base:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64
-  extends:
-    - .fdo.container-build@debian
-    - .debian-container-version
-    - .use-base-image
-  variables:
-    MESA_BASE_IMAGE: "debian/x86_64_build-base"
-    MESA_BASE_TAG: *debian-x86_64_build-base
-    LLVM_VERSION: *debian-x86_64-llvm
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/x86_64_build-base
-      optional: true
-
-# Debian based x86_64 main build image
-debian/x86_64_build:
-  extends:
-    - .use-debian/x86_64_build-base
-  variables:
-    MESA_IMAGE_TAG: &debian-x86_64_build ${DEBIAN_BUILD_TAG}
-    LLVM_VERSION: *debian-x86_64-llvm
-
-.use-debian/x86_64_build:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64
-  extends:
-    - .set-image-base-tag
-  variables:
-    MESA_BASE_TAG: *debian-x86_64_build-base
-    MESA_IMAGE_PATH: "debian/x86_64_build"
-    MESA_IMAGE_TAG: *debian-x86_64_build
-    LLVM_VERSION: *debian-x86_64-llvm
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/x86_64_build
-      optional: true
-
-# Debian based x86_32 cross-build image
-debian/x86_32_build:
-  extends:
-    - .use-debian/x86_64_build-base
-  variables:
-    MESA_IMAGE_TAG: &debian-x86_32_build ${DEBIAN_BUILD_TAG}
-
-.use-debian/x86_32_build:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64
-  extends:
-    - .set-image-base-tag
-  variables:
-    MESA_BASE_TAG: *debian-x86_64_build-base
-    MESA_IMAGE_PATH: "debian/x86_32_build"
-    MESA_IMAGE_TAG: *debian-x86_32_build
-    LLVM_VERSION: *debian-x86_64-llvm
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/x86_32_build
-      optional: true
-
-# Debian based ppc64el cross-build image
-debian/ppc64el_build:
-  extends:
-    - .use-debian/x86_64_build-base
-  variables:
-    MESA_IMAGE_TAG: &debian-ppc64el_build ${DEBIAN_BUILD_TAG}
-    LLVM_VERSION: &debian-ppc64el-llvm 19
-
-.use-debian/ppc64el_build:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64
-  extends:
-    - .set-image-base-tag
-  variables:
-    MESA_BASE_TAG: *debian-x86_64_build-base
-    MESA_IMAGE_PATH: "debian/ppc64el_build"
-    MESA_IMAGE_TAG: *debian-ppc64el_build
-    LLVM_VERSION: *debian-ppc64el-llvm
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/ppc64el_build
-      optional: true
-
-# Debian based RISC-V 64 cross-build image
-debian/riscv64_build:
-  extends:
-    - .use-debian/x86_64_build-base
-  variables:
-    MESA_IMAGE_TAG: &debian-riscv64_build ${DEBIAN_BUILD_TAG}
-    LLVM_VERSION: &debian-riscv64-llvm 19
-
-.use-debian/riscv64_build:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64
-  extends:
-    - .set-image-base-tag
-  variables:
-    MESA_BASE_TAG: *debian-x86_64_build-base
-    MESA_IMAGE_PATH: "debian/riscv64_build"
-    MESA_IMAGE_TAG: *debian-riscv64_build
-    LLVM_VERSION: *debian-riscv64-llvm
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/riscv64_build
-      optional: true
-
-# Debian based s390x cross-build image
-debian/s390x_build:
-  extends:
-    - .use-debian/x86_64_build-base
-  variables:
-    MESA_IMAGE_TAG: &debian-s390x_build ${DEBIAN_BUILD_TAG}
-    LLVM_VERSION: &debian-s390x-llvm 19
-
-.use-debian/s390x_build:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64
-  extends:
-    - .set-image-base-tag
-  variables:
-    MESA_BASE_TAG: *debian-x86_64_build-base
-    MESA_IMAGE_PATH: "debian/s390x_build"
-    MESA_IMAGE_TAG: *debian-s390x_build
-    LLVM_VERSION: *debian-s390x-llvm
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/s390x_build
-      optional: true
-
-# Common Android variables
-.android-variables:
-  variables:
-    ANDROID_VERSION: 16
-    # Bump both DEBIAN_BUILD_TAG and DEBIAN_TEST_ANDROID_TAG when updating
-    # NDK and SDK versions.
-    ANDROID_NDK_VERSION: "r29"
-    ANDROID_SDK_VERSION: 35  # Android 16 would be 36, but NDK only supports up to 35
-    ANDROID_LLVM_VERSION: llvmorg-19.1.7
-    ANDROID_LLVM_ARTIFACT_NAME: android-x86_64-llvm-20250822
-    # This can be confusing: LLVM_VERSION refers to the host LLVM toolchain
-    # used (LLVM 19 in our Debian system), but ANDROID_LLVM_VERSION refers to
-    # the cross-compiling LLVM toolchain used to build for the Android system.
-    LLVM_VERSION: &debian-android-llvm 19
-    CUTTLEFISH_PROJECT_PATH: gfx-ci/android/aosp-manifest
-    CUTTLEFISH_BUILD_VERSION_TAGS: mesa-venus
-    CUTTLEFISH_BUILD_NUMBER: 20260402.001
-
-# Android NDK cross-build image
-debian/android_build:
-  extends:
-    - .android-variables
-    - .use-debian/x86_64_build-base
-  variables:
-    MESA_IMAGE_TAG: &debian-android_build ${DEBIAN_BUILD_TAG}
-
-.use-debian/android_build:
-  extends:
-    - .android-variables
-    - .set-image-base-tag
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64
-  variables:
-    MESA_BASE_TAG: *debian-x86_64_build-base
-    MESA_IMAGE_PATH: "debian/android_build"
-    MESA_IMAGE_TAG: *debian-android_build
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/android_build
-      optional: true
-
-# Debian based ARM build image
-debian/arm64_build:
-  extends:
-    - .fdo.container-build@debian
-    - .container
-    - .debian-container-version
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
-  variables:
-    MESA_IMAGE_TAG: &debian-arm64_build "${DEBIAN_BUILD_TAG}--${DEBIAN_BUILD_BASE_TAG}--${PKG_REPO_REV}"
-    LLVM_VERSION: &debian-arm64-llvm 19
-
-.use-debian/arm64_build:
-  extends:
-    - .set-image
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
-  variables:
-    MESA_IMAGE_PATH: "debian/arm64_build"
-    MESA_IMAGE_TAG: *debian-arm64_build
-    MESA_ARTIFACTS_TAG: *debian-arm64_build
-    LLVM_VERSION: *debian-arm64-llvm
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/arm64_build
-      optional: true
-
-
-# Debian based x86_64 test image base
-debian/x86_64_test-base:
-  extends:
-    - .debian-container
-    - .container-builds-base
-  variables:
-    MESA_IMAGE_TAG: &debian-x86_64_test-base "${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}"
-    LLVM_VERSION: *debian-x86_64-llvm
-
-.use-debian/x86_64_test-base:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64
-  extends:
-    - .fdo.container-build@debian
-    - .debian-container-version
-    - .use-base-image
-  variables:
-    MESA_BASE_IMAGE: "debian/x86_64_test-base"
-    MESA_BASE_TAG: *debian-x86_64_test-base
-    LLVM_VERSION: *debian-x86_64-llvm
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/x86_64_test-base
-      optional: true
-
-# Debian based ARMv7/armhf test image base
-debian/arm32_test-base:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
-  extends:
-    - .debian-container
-    - .container-builds-base
-  variables:
-    MESA_IMAGE_TAG: &debian-arm32_test-base "${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}"
-    LLVM_VERSION: *debian-arm64-llvm
-    FDO_DISTRIBUTION_PLATFORM: "linux/arm/v7"
-
-.use-debian/arm32_test-base:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
-  extends:
-    - .fdo.container-build@debian
-    - .debian-container-version
-    - .use-base-image
-  variables:
-    MESA_BASE_IMAGE: "debian/arm32_test-base"
-    MESA_BASE_TAG: *debian-arm32_test-base
-    LLVM_VERSION: *debian-arm64-llvm
-    FDO_DISTRIBUTION_PLATFORM: "linux/arm/v7"
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/arm32_test-base
-      optional: true
-
-# Debian based aarch64 test image base
-debian/arm64_test-base:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
-  extends:
-    - .debian-container
-    - .container-builds-base
-  variables:
-    MESA_IMAGE_TAG: &debian-arm64_test-base "${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}"
-    LLVM_VERSION: *debian-arm64-llvm
-
-.use-debian/arm64_test-base:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
-  extends:
-    - .fdo.container-build@debian
-    - .debian-container-version
-    - .use-base-image
-  variables:
-    MESA_BASE_IMAGE: "debian/arm64_test-base"
-    MESA_BASE_TAG: *debian-arm64_test-base
-    LLVM_VERSION: *debian-arm64-llvm
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/arm64_test-base
-      optional: true
-
-# Debian based x86_64 test image for GL
-debian/x86_64_test-gl:
-  extends:
-    - .use-debian/x86_64_test-base
-    - .container-builds-gl
-    - .export-container
-  variables:
-    MESA_IMAGE_TAG: &debian-x86_64_test-gl ${DEBIAN_TEST_GL_TAG}
-
-.use-debian/x86_64_test-gl:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64
-  extends:
-    - .set-image-base-tag
-  variables:
-    MESA_BASE_TAG: *debian-x86_64_test-base
-    MESA_IMAGE_PATH: "debian/x86_64_test-gl"
-    MESA_IMAGE_TAG: *debian-x86_64_test-gl
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/x86_64_test-gl
-      optional: true
-
-# Debian based x86_64 test image for VK
-debian/x86_64_test-vk:
-  extends:
-    - .use-debian/x86_64_test-base
-    - .container-builds-vk
-    - .export-container
-  variables:
-    MESA_IMAGE_TAG: &debian-x86_64_test-vk ${DEBIAN_TEST_VK_TAG}
-
-.use-debian/x86_64_test-vk:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64
-  extends:
-    - .set-image-base-tag
-  variables:
-    MESA_BASE_TAG: *debian-x86_64_test-base
-    MESA_IMAGE_PATH: "debian/x86_64_test-vk"
-    MESA_IMAGE_TAG: *debian-x86_64_test-vk
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/x86_64_test-vk
-      optional: true
-
-# Debian based x86_64 test image for Android
-debian/x86_64_test-android:
-  extends:
-    - .android-variables
-    - .use-debian/x86_64_test-base
-    - .container-builds-android
-    - .export-container
-  variables:
-    MESA_IMAGE_TAG: &debian-x86_64_test-android ${DEBIAN_TEST_ANDROID_TAG}
-
-.use-debian/x86_64_test-android:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64_KVM
-  extends:
-    - .android-variables
-    - .set-image-base-tag
-  variables:
-    MESA_BASE_TAG: *debian-x86_64_test-base
-    MESA_IMAGE_PATH: "debian/x86_64_test-android"
-    MESA_IMAGE_TAG: *debian-x86_64_test-android
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/x86_64_test-android
-      optional: true
-
-# Debian based x86_64 test image for video
-debian/x86_64_test-video:
-  extends:
-    - .use-debian/x86_64_test-base
-    - .container-builds-video
-    - .export-container
-  variables:
-    MESA_IMAGE_TAG: &debian-x86_64_test-video ${DEBIAN_TEST_VIDEO_TAG}
-
-.use-debian/x86_64_test-video:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64
-  extends:
-    - .set-image-base-tag
-  variables:
-    MESA_BASE_TAG: *debian-x86_64_test-base
-    MESA_IMAGE_PATH: "debian/x86_64_test-video"
-    MESA_IMAGE_TAG: *debian-x86_64_test-video
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/x86_64_test-video
-      optional: true
-
-# Debian based ARMv7/armhf test image for GL
-debian/arm32_test-gl:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
-  extends:
-    - .use-debian/arm32_test-base
-    - .container-builds-arm32
-    - .export-container
-  variables:
-    MESA_IMAGE_TAG: &debian-arm32_test-gl ${DEBIAN_TEST_GL_TAG}
-
-.use-debian/arm32_test-gl:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
-  extends:
-    - .set-image-base-tag
-  variables:
-    MESA_BASE_TAG: *debian-arm32_test-base
-    MESA_IMAGE_PATH: "debian/arm32_test-gl"
-    MESA_IMAGE_TAG: *debian-arm32_test-gl
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/arm32_test-gl
-      optional: true
-
-# Debian based ARMv7/armhf test image for VK
-debian/arm32_test-vk:
-  rules:
-    - when: never  # There are currently no arm32 VK jobs
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
-  extends:
-    - .use-debian/arm32_test-base
-    - .container-builds-arm32
-  variables:
-    MESA_IMAGE_TAG: &debian-arm32_test-vk ${DEBIAN_TEST_VK_TAG}
-
-.use-debian/arm32_test-vk:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
-  extends:
-    - .set-image-base-tag
-  variables:
-    MESA_BASE_TAG: *debian-arm32_test-base
-    MESA_IMAGE_PATH: "debian/arm32_test-vk"
-    MESA_IMAGE_TAG: *debian-arm32_test-vk
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/arm32_test-vk
-      optional: true
-
-# Debian based aarch64 test image for GL
-debian/arm64_test-gl:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
-  extends:
-    - .use-debian/arm64_test-base
-    - .container-builds-gl
-    - .export-container
-  variables:
-    MESA_IMAGE_TAG: &debian-arm64_test-gl ${DEBIAN_TEST_GL_TAG}
-
-.use-debian/arm64_test-gl:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
-  extends:
-    - .set-image-base-tag
-  variables:
-    MESA_BASE_TAG: *debian-arm64_test-base
-    MESA_IMAGE_PATH: "debian/arm64_test-gl"
-    MESA_IMAGE_TAG: *debian-arm64_test-gl
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/arm64_test-gl
-      optional: true
-
-# Debian based aarch64 test image for VK
-debian/arm64_test-vk:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
-  extends:
-    - .use-debian/arm64_test-base
-    - .container-builds-vk
-    - .export-container
-  variables:
-    MESA_IMAGE_TAG: &debian-arm64_test-vk ${DEBIAN_TEST_VK_TAG}
-
-.use-debian/arm64_test-vk:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
-  extends:
-    - .set-image-base-tag
-  variables:
-    MESA_BASE_TAG: *debian-arm64_test-base
-    MESA_IMAGE_PATH: "debian/arm64_test-vk"
-    MESA_IMAGE_TAG: *debian-arm64_test-vk
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/arm64_test-vk
-      optional: true
-
-# Debian-based x86_64 builder for Android test tools.
-# ANGLE, dEQP, and deqp-runner are built here since Google does not provide
-# an arm64 NDK. Artifacts are then copied into the arm64 test image.
-debian/arm64_test-android-tools:
-  extends:
-    - .android-variables
-    - .use-debian/x86_64_test-base  # NOT a mistake!
-    - .container-builds-android
-  variables:
-    MESA_IMAGE_TAG: &debian-arm64_test-android ${DEBIAN_TEST_ANDROID_TAG}
-
-# Debian based arm64 test image for Android
-debian/arm64_test-android:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
-  extends:
-    - .android-variables
-    - .use-debian/arm64_test-base
-    - .container-builds-android
-    - .export-container
-  variables:
-    MESA_IMAGE_TAG: *debian-arm64_test-android
-  needs:
-    - !reference [.use-debian/arm64_test-base, needs]
-    - job: debian/arm64_test-android-tools
-      optional: true
-
-.use-debian/arm64_test-android:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
-  extends:
-    - .android-variables
-    - .set-image-base-tag
-  variables:
-    MESA_BASE_TAG: *debian-arm64_test-base
-    MESA_IMAGE_PATH: "debian/arm64_test-android"
-    MESA_IMAGE_TAG: *debian-arm64_test-android
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/arm64_test-android
-      optional: true
-    - job: debian/arm64_test-android-tools
-      optional: true
-
-# x86_64 image with ARM64 & ARM32 kernel & rootfs for baremetal testing
-.debian/baremetal_arm_test:
-  extends:
-    - .fdo.container-build@debian
-    - .container
-    - .debian-container-version
-  variables:
-    FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
-    MESA_ARTIFACTS_TAG: *debian-arm64_build
-
-debian/baremetal_arm32_test-gl:
-  extends:
-    - .debian/baremetal_arm_test
-  needs:
-    - job: debian/arm32_test-gl
-      optional: true
-  variables:
-    MESA_IMAGE_TAG: &baremetal-arm32_test-gl "${DEBIAN_TEST_GL_TAG}--${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}"
-    LAVA_DISTRIBUTION_TAG: "debian/arm32_test-gl:${DEBIAN_TEST_GL_TAG}--${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}"
-
-debian/baremetal_arm64_test-gl:
-  extends:
-    - .debian/baremetal_arm_test
-  needs:
-    - job: debian/arm64_test-gl
-      optional: true
-  variables:
-    MESA_IMAGE_TAG: &baremetal-arm64_test-gl "${DEBIAN_TEST_GL_TAG}--${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}"
-    LAVA_DISTRIBUTION_TAG: "debian/arm64_test-gl:${DEBIAN_TEST_GL_TAG}--${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}"
-
-debian/baremetal_arm64_test-vk:
-  extends:
-    - .debian/baremetal_arm_test
-  needs:
-    - job: debian/arm64_test-vk
-      optional: true
-  variables:
-    MESA_IMAGE_TAG: &baremetal-arm64_test-vk "${DEBIAN_TEST_VK_TAG}--${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}"
-    LAVA_DISTRIBUTION_TAG: "debian/arm64_test-vk:${DEBIAN_TEST_VK_TAG}--${DEBIAN_TEST_BASE_TAG}--${PKG_REPO_REV}--${MESA_TEMPLATES_COMMIT}"
-
-.use-debian/baremetal_arm32_test-gl:
-  image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
-  variables:
-    MESA_IMAGE_PATH: "debian/baremetal_arm32_test-gl"
-    MESA_IMAGE_TAG: *baremetal-arm32_test-gl
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/baremetal_arm32_test-gl
-      optional: true
-
-.use-debian/baremetal_arm64_test-gl:
-  image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
-  variables:
-    MESA_IMAGE_PATH: "debian/baremetal_arm64_test-gl"
-    MESA_IMAGE_TAG: *baremetal-arm64_test-gl
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/baremetal_arm64_test-gl
-      optional: true
-
-.use-debian/baremetal_arm64_test-vk:
-  image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
-  variables:
-    MESA_IMAGE_PATH: "debian/baremetal_arm64_test-vk"
-    MESA_IMAGE_TAG: *baremetal-arm64_test-vk
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/baremetal_arm64_test-vk
-      optional: true
diff --git a/.gitlab-ci/container/debian/llvm-snapshot.gpg.key b/.gitlab-ci/container/debian/llvm-snapshot.gpg.key
deleted file mode 100644
index aa6b105..0000000
--- a/.gitlab-ci/container/debian/llvm-snapshot.gpg.key
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-mQINBFE9lCwBEADi0WUAApM/mgHJRU8lVkkw0CHsZNpqaQDNaHefD6Rw3S4LxNmM
-EZaOTkhP200XZM8lVdbfUW9xSjA3oPldc1HG26NjbqqCmWpdo2fb+r7VmU2dq3NM
-R18ZlKixiLDE6OUfaXWKamZsXb6ITTYmgTO6orQWYrnW6ckYHSeaAkW0wkDAryl2
-B5v8aoFnQ1rFiVEMo4NGzw4UX+MelF7rxaaregmKVTPiqCOSPJ1McC1dHFN533FY
-Wh/RVLKWo6npu+owtwYFQW+zyQhKzSIMvNujFRzhIxzxR9Gn87MoLAyfgKEzrbbT
-DhqqNXTxS4UMUKCQaO93TzetX/EBrRpJj+vP640yio80h4Dr5pAd7+LnKwgpTDk1
-G88bBXJAcPZnTSKu9I2c6KY4iRNbvRz4i+ZdwwZtdW4nSdl2792L7Sl7Nc44uLL/
-ZqkKDXEBF6lsX5XpABwyK89S/SbHOytXv9o4puv+65Ac5/UShspQTMSKGZgvDauU
-cs8kE1U9dPOqVNCYq9Nfwinkf6RxV1k1+gwtclxQuY7UpKXP0hNAXjAiA5KS5Crq
-7aaJg9q2F4bub0mNU6n7UI6vXguF2n4SEtzPRk6RP+4TiT3bZUsmr+1ktogyOJCc
-Ha8G5VdL+NBIYQthOcieYCBnTeIH7D3Sp6FYQTYtVbKFzmMK+36ERreL/wARAQAB
-tD1TeWx2ZXN0cmUgTGVkcnUgLSBEZWJpYW4gTExWTSBwYWNrYWdlcyA8c3lsdmVz
-dHJlQGRlYmlhbi5vcmc+iQI4BBMBAgAiBQJRPZQsAhsDBgsJCAcDAgYVCAIJCgsE
-FgIDAQIeAQIXgAAKCRAVz00Yr090Ibx+EADArS/hvkDF8juWMXxh17CgR0WZlHCC
-9CTBWkg5a0bNN/3bb97cPQt/vIKWjQtkQpav6/5JTVCSx2riL4FHYhH0iuo4iAPR
-udC7Cvg8g7bSPrKO6tenQZNvQm+tUmBHgFiMBJi92AjZ/Qn1Shg7p9ITivFxpLyX
-wpmnF1OKyI2Kof2rm4BFwfSWuf8Fvh7kDMRLHv+MlnK/7j/BNpKdozXxLcwoFBmn
-l0WjpAH3OFF7Pvm1LJdf1DjWKH0Dc3sc6zxtmBR/KHHg6kK4BGQNnFKujcP7TVdv
-gMYv84kun14pnwjZcqOtN3UJtcx22880DOQzinoMs3Q4w4o05oIF+sSgHViFpc3W
-R0v+RllnH05vKZo+LDzc83DQVrdwliV12eHxrMQ8UYg88zCbF/cHHnlzZWAJgftg
-hB08v1BKPgYRUzwJ6VdVqXYcZWEaUJmQAPuAALyZESw94hSo28FAn0/gzEc5uOYx
-K+xG/lFwgAGYNb3uGM5m0P6LVTfdg6vDwwOeTNIExVk3KVFXeSQef2ZMkhwA7wya
-KJptkb62wBHFE+o9TUdtMCY6qONxMMdwioRE5BYNwAsS1PnRD2+jtlI0DzvKHt7B
-MWd8hnoUKhMeZ9TNmo+8CpsAtXZcBho0zPGz/R8NlJhAWpdAZ1CmcPo83EW86Yq7
-BxQUKnNHcwj2ebkCDQRRPZQsARAA4jxYmbTHwmMjqSizlMJYNuGOpIidEdx9zQ5g
-zOr431/VfWq4S+VhMDhs15j9lyml0y4ok215VRFwrAREDg6UPMr7ajLmBQGau0Fc
-bvZJ90l4NjXp5p0NEE/qOb9UEHT7EGkEhaZ1ekkWFTWCgsy7rRXfZLxB6sk7pzLC
-DshyW3zjIakWAnpQ5j5obiDy708pReAuGB94NSyb1HoW/xGsGgvvCw4r0w3xPStw
-F1PhmScE6NTBIfLliea3pl8vhKPlCh54Hk7I8QGjo1ETlRP4Qll1ZxHJ8u25f/ta
-RES2Aw8Hi7j0EVcZ6MT9JWTI83yUcnUlZPZS2HyeWcUj+8nUC8W4N8An+aNps9l/
-21inIl2TbGo3Yn1JQLnA1YCoGwC34g8QZTJhElEQBN0X29ayWW6OdFx8MDvllbBV
-ymmKq2lK1U55mQTfDli7S3vfGz9Gp/oQwZ8bQpOeUkc5hbZszYwP4RX+68xDPfn+
-M9udl+qW9wu+LyePbW6HX90LmkhNkkY2ZzUPRPDHZANU5btaPXc2H7edX4y4maQa
-xenqD0lGh9LGz/mps4HEZtCI5CY8o0uCMF3lT0XfXhuLksr7Pxv57yue8LLTItOJ
-d9Hmzp9G97SRYYeqU+8lyNXtU2PdrLLq7QHkzrsloG78lCpQcalHGACJzrlUWVP/
-fN3Ht3kAEQEAAYkCHwQYAQIACQUCUT2ULAIbDAAKCRAVz00Yr090IbhWEADbr50X
-OEXMIMGRLe+YMjeMX9NG4jxs0jZaWHc/WrGR+CCSUb9r6aPXeLo+45949uEfdSsB
-pbaEdNWxF5Vr1CSjuO5siIlgDjmT655voXo67xVpEN4HhMrxugDJfCa6z97P0+ML
-PdDxim57uNqkam9XIq9hKQaurxMAECDPmlEXI4QT3eu5qw5/knMzDMZj4Vi6hovL
-wvvAeLHO/jsyfIdNmhBGU2RWCEZ9uo/MeerPHtRPfg74g+9PPfP6nyHD2Wes6yGd
-oVQwtPNAQD6Cj7EaA2xdZYLJ7/jW6yiPu98FFWP74FN2dlyEA2uVziLsfBrgpS4l
-tVOlrO2YzkkqUGrybzbLpj6eeHx+Cd7wcjI8CalsqtL6cG8cUEjtWQUHyTbQWAgG
-5VPEgIAVhJ6RTZ26i/G+4J8neKyRs4vz+57UGwY6zI4AB1ZcWGEE3Bf+CDEDgmnP
-LSwbnHefK9IljT9XU98PelSryUO/5UPw7leE0akXKB4DtekToO226px1VnGp3Bov
-1GBGvpHvL2WizEwdk+nfk8LtrLzej+9FtIcq3uIrYnsac47Pf7p0otcFeTJTjSq3
-krCaoG4Hx0zGQG2ZFpHrSrZTVy6lxvIdfi0beMgY6h78p6M9eYZHQHc02DjFkQXN
-bXb5c6gCHESH5PXwPU4jQEE7Ib9J6sbk7ZT2Mw==
-=j+4q
------END PGP PUBLIC KEY BLOCK-----
diff --git a/.gitlab-ci/container/debian/maybe-add-llvm-repo.sh b/.gitlab-ci/container/debian/maybe-add-llvm-repo.sh
deleted file mode 100644
index fb101ec..0000000
--- a/.gitlab-ci/container/debian/maybe-add-llvm-repo.sh
+++ /dev/null
@@ -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
-  trixie,19)
-    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
diff --git a/.gitlab-ci/container/debian/ppc64el_build.sh b/.gitlab-ci/container/debian/ppc64el_build.sh
deleted file mode 100644
index 23db25c..0000000
--- a/.gitlab-ci/container/debian/ppc64el_build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-arch=ppc64el
-
-. .gitlab-ci/container/cross_build.sh
diff --git a/.gitlab-ci/container/debian/riscv64_build.sh b/.gitlab-ci/container/debian/riscv64_build.sh
deleted file mode 100644
index fa8d23b..0000000
--- a/.gitlab-ci/container/debian/riscv64_build.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-. .gitlab-ci/setup-test-env.sh
-
-arch=riscv64
-
-# Ephemeral packages (installed for this script and removed again at the end)
-EPHEMERAL=(
-    libssl-dev
-)
-
-apt-get -y install "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/build-mold.sh
-
-apt-get purge -y "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/cross_build.sh
diff --git a/.gitlab-ci/container/debian/s390x_build.sh b/.gitlab-ci/container/debian/s390x_build.sh
deleted file mode 100644
index 07cc9c7..0000000
--- a/.gitlab-ci/container/debian/s390x_build.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-. .gitlab-ci/setup-test-env.sh
-
-arch=s390x
-
-# Ephemeral packages (installed for this script and removed again at the end)
-EPHEMERAL=(
-    libssl-dev
-)
-
-apt-get -y install "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/build-mold.sh
-
-apt-get purge -y "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/cross_build.sh
diff --git a/.gitlab-ci/container/debian/test-android.sh b/.gitlab-ci/container/debian/test-android.sh
deleted file mode 100755
index 8ecad16..0000000
--- a/.gitlab-ci/container/debian/test-android.sh
+++ /dev/null
@@ -1,250 +0,0 @@
-#!/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
-
-section_start debian_setup "Base Debian system setup"
-
-export DEBIAN_FRONTEND=noninteractive
-
-# Google provides Android NDK for x86_64 hosts only; there is no arm64-native NDK for Linux.
-# Thus, we must cross-compile arm64 test tools on x86_64 runners.
-
-# Container Variants Overview:
-# - x86_64_test-android: Comprehensive environment for x86_64 testing.
-# - arm64_test-android-tools: Used to cross-compile arm64 binaries (dEQP, ANGLE, etc)
-#   on x86_64 runners because the Android NDK only provides x86_64 host binaries.
-# - arm64_test-android: Fetches components built by the 'tools' container to run
-#   tests on arm64 devices where full builds are unsupported.
-#
-# | Component            | x86_64_test-android | arm64_test-android-tools | arm64_test-android |
-# | :------------------: | :-----------------: | :----------------------: | :----------------: |
-# | Runner arch          | x86_64              | x86_64                   | arm64              |
-# | Android NDK          | ✔                   | ✔                        |                    |
-# | ANGLE / dEQP         | ✔ (Built)           | ✔ (Built)                | ✔ (Downloaded)     |
-# | eglinfo / vulkaninfo | ✔                   |                          | ✔                  |
-# | Cuttlefish / CTS     | ✔ (Included)        |                          |   (LAVA overlay)   |
-# | Runtime Deps (AAPT)  | ✔                   |                          | ✔                  |
-#
-# | Logic Variable       | x86_64_test-android | arm64_test-android-tools | arm64_test-android |
-# | :------------------: | :-----------------: | :----------------------: | :----------------: |
-# | BUILD_CONTAINER      | ✔                   | ✔                        |                    |
-# | TEST_CONTAINER       | ✔                   |                          | ✔                  |
-
-if "${BUILD_CONTAINER}"; then
-  # Ephemeral packages (installed for this script and removed again at the end)
-  EPHEMERAL=(
-      binutils-aarch64-linux-gnu
-      build-essential:native
-      ccache
-      cmake
-      config-package-dev
-      debhelper-compat
-      dpkg-dev
-      ninja-build
-      unzip
-  )
-else
-  # We only need the build tools in build containers
-  EPHEMERAL=()
-fi
-
-if "${TEST_CONTAINER}"; then
-  # We only need the Cuttlefish runtime dependencies in test containers
-  DEPS=(
-      aapt
-      cuttlefish-base
-      cuttlefish-user
-      iproute2
-  )
-else
-  DEPS=()
-fi
-
-apt-get install -y --no-remove --no-install-recommends \
-      "${DEPS[@]}" "${EPHEMERAL[@]}"
-
-############### Building ...
-
-. .gitlab-ci/container/container_pre_build.sh
-
-section_end debian_setup
-
-if [ "${ANDROID_ARCH}" = "x86_64" ]; then
-  export RUST_TARGET=x86_64-linux-android
-  export ANDROID_ABI=x86_64
-  export ANGLE_ARCH=x64
-fi
-
-if [ "${ANDROID_ARCH}" = "arm64" ]; then
-  export RUST_TARGET=aarch64-linux-android
-  export ANDROID_ABI=arm64-v8a
-  export ANGLE_ARCH=arm64
-  export STRIP_CMD=aarch64-linux-gnu-strip
-fi
-
-############### Downloading Android tools
-
-section_start android-tools "Downloading Android tools"
-
-# Download pre-built Android utility binaries (eglinfo, vulkaninfo) for test environments
-if "${TEST_CONTAINER}"; then
-  mkdir /android-tools
-  pushd /android-tools
-
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    -o eglinfo "https://${S3_HOST}/${S3_ANDROID_BUCKET}/mesa/mesa/${DATA_STORAGE_PATH}/eglinfo-android-${ANDROID_ARCH}"
-  chmod +x eglinfo
-
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    -o vulkaninfo "https://${S3_HOST}/${S3_ANDROID_BUCKET}/mesa/mesa/${DATA_STORAGE_PATH}/vulkaninfo-android-${ANDROID_ARCH}"
-  chmod +x vulkaninfo
-
-  popd
-fi
-
-# Fetch cross-compiled test tools (ANGLE, dEQP) for the arm64 runtime.
-# These were built in the 'tools' container due to NDK host limitations.
-if ! "${BUILD_CONTAINER}"; then
-  curl-with-retry -O "https://${S3_BASE_PATH}/${CI_PROJECT_PATH}/${DEBIAN_TEST_ANDROID_TAG}/android-tools-arm64.tar.zst"
-  tar --zstd -xf android-tools-arm64.tar.zst -C /
-  rm android-tools-arm64.tar.zst
-fi
-
-section_end android-tools
-
-############### Downloading NDK for native builds for the guest ...
-
-# Skip NDK setup and builds for test-only runtimes
-if "${BUILD_CONTAINER}"; then
-  section_start android-ndk "Downloading Android NDK"
-
-  # Fetch the NDK and extract just the toolchain we want.
-  ndk="android-ndk-${ANDROID_NDK_VERSION}"
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    -o "$ndk.zip" "https://dl.google.com/android/repository/$ndk-linux.zip"
-  unzip -q -d / "$ndk.zip"
-    rm "$ndk.zip"
-
-  section_end android-ndk
-
-  ############### Build ANGLE
-
-  ANGLE_TARGET=android \
-  . .gitlab-ci/container/build-angle.sh
-
-  ############### Build dEQP runner
-
-  export ANDROID_NDK_HOME=/$ndk
-  . .gitlab-ci/container/build-rust.sh test
-  . .gitlab-ci/container/build-deqp-runner.sh
-
-  # Properly uninstall rustup including cargo and init scripts on shells
-  rustup self uninstall -y
-
-  ############### Build dEQP
-
-  DEQP_API=tools \
-  DEQP_TARGET="android" \
-  EXTRA_CMAKE_ARGS="-DDEQP_ANDROID_EXE=ON -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=${ANDROID_ABI} -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
-  . .gitlab-ci/container/build-deqp.sh
-
-  DEQP_API=GLES \
-  DEQP_TARGET="android" \
-  EXTRA_CMAKE_ARGS="-DDEQP_ANDROID_EXE=ON -DDEQP_ANDROID_EXE_LOGCAT=ON -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=${ANDROID_ABI} -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
-  . .gitlab-ci/container/build-deqp.sh
-
-  DEQP_API=VK \
-  DEQP_TARGET="android" \
-  EXTRA_CMAKE_ARGS="-DDEQP_ANDROID_EXE=ON -DDEQP_ANDROID_EXE_LOGCAT=ON -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=${ANDROID_ABI} -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
-  . .gitlab-ci/container/build-deqp.sh
-
-  rm -rf /VK-GL-CTS
-fi
-
-############### Downloading Cuttlefish resources ...
-
-# We only need to download the Cuttlefish image and host tools for the shared runners on x86_64, otherwise they are deployed as LAVA overlays
-if [ "${ANDROID_ARCH}" = "x86_64" ]; then
-  section_start cuttlefish "Downloading and setting up Cuttlefish"
-
-  mkdir /cuttlefish
-  pushd /cuttlefish
-
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    -O "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CUTTLEFISH_PROJECT_PATH}/aosp-${CUTTLEFISH_BUILD_VERSION_TAGS}.${CUTTLEFISH_BUILD_NUMBER}/aosp_cf_${ANDROID_ARCH}_only_phone-img-${CUTTLEFISH_BUILD_NUMBER}.tar.zst"
-
-  tar --zstd -xvf "aosp_cf_${ANDROID_ARCH}_only_phone-img-${CUTTLEFISH_BUILD_NUMBER}.tar.zst"
-  rm "aosp_cf_${ANDROID_ARCH}_only_phone-img-${CUTTLEFISH_BUILD_NUMBER}.tar.zst"
-
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    -O "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CUTTLEFISH_PROJECT_PATH}/aosp-${CUTTLEFISH_BUILD_VERSION_TAGS}.${CUTTLEFISH_BUILD_NUMBER}/cvd-host_package-${ANDROID_ARCH}.tar.zst"
-  tar --zst -xvf "cvd-host_package-${ANDROID_ARCH}.tar.zst"
-  rm "cvd-host_package-${ANDROID_ARCH}.tar.zst"
-
-  popd
-
-  section_end cuttlefish
-fi
-
-if "${TEST_CONTAINER}"; then
-  addgroup --system kvm
-  usermod -a -G kvm,cvdnetwork root
-fi
-
-############### Downloading Android CTS
-
-# We currently only have x86_64 CTS jobs
-if [ "${ANDROID_ARCH}" = "x86_64" ]; then
-. .gitlab-ci/container/build-android-cts.sh
-fi
-
-############### Packaging arm64 tools for S3 upload
-
-# Upload cross-compiled arm64 binaries to S3 for consumption by the test runtime container
-if ! "${TEST_CONTAINER}"; then
-  section_start android-tools-arm64 "Uploading Android tools"
-
-  TOOL_DIRS=(
-      /angle
-      /deqp-gles
-      /deqp-runner
-      /deqp-tools
-      /deqp-vk
-      /mesa-ci-build-tag
-  )
-
-  tar --zstd -cf android-tools-arm64.tar.zst "${TOOL_DIRS[@]}"
-
-  ci-fairy s3cp --token-file "${S3_JWT_FILE}" "android-tools-arm64.tar.zst" \
-    "https://${S3_BASE_PATH}/${CI_PROJECT_PATH}/${DEBIAN_TEST_ANDROID_TAG}/android-tools-arm64.tar.zst"
-
-  section_end android-tools-arm64
-fi
-
-############### Uninstall the build software
-
-section_switch debian_cleanup "Cleaning up base Debian system"
-
-if "${BUILD_CONTAINER}"; then
-  rm -rf "/${ndk:?}"
-fi
-
-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
diff --git a/.gitlab-ci/container/debian/test-base.sh b/.gitlab-ci/container/debian/test-base.sh
deleted file mode 100644
index c885d5b..0000000
--- a/.gitlab-ci/container/debian/test-base.sh
+++ /dev/null
@@ -1,254 +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_TEST_BASE_TAG
-
-set -e
-
-. .gitlab-ci/setup-test-env.sh
-
-set -o xtrace
-
-section_start debian_setup "Base Debian system setup"
-
-export DEBIAN_FRONTEND=noninteractive
-
-apt-get install -y curl ca-certificates gnupg2
-
-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
-    libcairo2-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
-    libinput-dev
-    libgles2-mesa-dev
-    liblz4-dev
-    libpciaccess-dev
-    libpixman-1-dev
-    libssl-dev
-    libtirpc-dev
-    libvulkan-dev
-    libudev-dev
-    libwaffle-dev
-    libx11-xcb-dev
-    libxcb-composite0-dev
-    libxcb-dri2-0-dev
-    libxcb-dri3-dev
-    libxcb-present-dev
-    libxfixes-dev
-    libxcb-ewmh-dev
-    libxcursor-dev
-    libxcvt-dev
-    libxext-dev
-    libxfont-dev
-    libxkbcommon-dev
-    libxkbfile-dev
-    libxrandr-dev
-    libxrender-dev
-    libxshmfence-dev
-    libzstd-dev
-    "llvm-${LLVM_VERSION}-dev"
-    make
-    meson
-    mesa-common-dev
-    patch
-    pkgconf
-    protobuf-compiler
-    python3-dev
-    python3-pip
-    python3-setuptools
-    python3-venv
-    python3-wheel
-    xz-utils
-)
-
-DEPS=(
-    apt-utils
-    clinfo
-    curl
-    dropbear
-    git
-    git-lfs
-    inetutils-syslogd
-    iptables
-    jq
-    kmod
-    libasan8
-    libcairo2
-    libcap2
-    libdrm2
-    libegl1
-    libepoxy0
-    libexpat1
-    libfdt1
-    libinput10
-    "libclang-common-${LLVM_VERSION}-dev"
-    "libclang-cpp${LLVM_VERSION}"
-    "libllvm${LLVM_VERSION}"
-    liblz4-1
-    libpixman-1-0
-    libpng16-16t64
-    libproc2-0
-    libpython3.13
-    libtirpc3t64
-    libubsan1
-    libvulkan1
-    libwayland-bin
-    libwayland-client0
-    libwayland-cursor0
-    libwayland-dev
-    libwayland-egl1
-    libwayland-server0
-    libxcb-composite0
-    libxcb-dri2-0
-    libxcb-ewmh2
-    libxcb-randr0
-    libxcb-shm0
-    libxcb-xfixes0
-    libxcursor1
-    libxcvt0
-    libxfont2
-    libxkbcommon0
-    libxrandr2
-    libxrender1
-    ntpsec-ntpdig
-    libxshmfence1
-    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
-    wayland-protocols
-    xinit
-    xserver-common
-    xserver-xorg-video-amdgpu
-    xserver-xorg-video-ati
-    xauth
-    zlib1g
-)
-
-HW_DEPS=(
-    netcat-openbsd
-    mount
-    python3-serial
-    tzdata
-    zstd
-)
-
-apt-get update
-apt-get dist-upgrade -y
-
-apt-get install --purge -y \
-      sysvinit-core libelogind0
-
-apt-get install -y --no-remove "${DEPS[@]}" "${HW_DEPS[@]}"
-
-apt-get install -y --no-install-recommends "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/container_pre_build.sh
-
-# Needed for ci-fairy s3cp
-pip3 install --break-system-packages "ci-fairy[s3] @ git+https://gitlab.freedesktop.org/freedesktop/ci-templates@$MESA_TEMPLATES_COMMIT"
-
-# Needed for manipulation with traces yaml files.
-pip3 install --break-system-packages yq
-
-section_end debian_setup
-
-############### Build ci-kdl
-
-. .gitlab-ci/container/build-kdl.sh
-
-############### 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 Weston
-
-. .gitlab-ci/container/build-weston.sh
-
-############### Build XWayland
-
-. .gitlab-ci/container/build-xwayland.sh
-
-############### Install Rust toolchain
-
-. .gitlab-ci/container/build-rust.sh test
-
-############### 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
-
-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
diff --git a/.gitlab-ci/container/debian/test-gl.sh b/.gitlab-ci/container/debian/test-gl.sh
deleted file mode 100644
index 7b4eb1e..0000000
--- a/.gitlab-ci/container/debian/test-gl.sh
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-
-set -e
-
-. .gitlab-ci/setup-test-env.sh
-
-set -o xtrace
-
-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
-    libfontconfig-dev
-    libgl-dev
-    libgles2-mesa-dev
-    libglu1-mesa-dev
-    libglx-dev
-    libpciaccess-dev
-    libpng-dev
-    libudev-dev
-    libwaffle-dev
-    libwayland-dev
-    libx11-xcb-dev
-    libxcb-dri2-0-dev
-    libxkbcommon-dev
-    libxrandr-dev
-    libxrender-dev
-    "llvm-${LLVM_VERSION}-dev"
-    "lld-${LLVM_VERSION}"
-    make
-    meson
-    ocl-icd-opencl-dev
-    patch
-    pkgconf
-    python-is-python3
-    xz-utils
-)
-
-DEPS=(
-    libfontconfig1
-    libglu1-mesa
-    libvulkan-dev
-)
-
-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" != "armhf" ]; 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 SKQP
-
-if [ "$DEBIAN_ARCH" != "armhf" ]; then
-  . .gitlab-ci/container/build-skqp.sh
-fi
-
-############### Uninstall the build software
-
-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
diff --git a/.gitlab-ci/container/debian/test-vk.sh b/.gitlab-ci/container/debian/test-vk.sh
deleted file mode 100644
index 4e3cbd6..0000000
--- a/.gitlab-ci/container/debian/test-vk.sh
+++ /dev/null
@@ -1,132 +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
-
-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-glx0-dev
-    libxcb-keysyms1-dev
-    libxkbcommon-dev
-    libxrandr-dev
-    libxrender-dev
-    libzstd-dev
-    meson
-    p7zip
-    patch
-    pkgconf
-    python3-dev
-    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 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
-
-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
diff --git a/.gitlab-ci/container/debian/winehq.gpg.key b/.gitlab-ci/container/debian/winehq.gpg.key
deleted file mode 100644
index a8cba23..0000000
--- a/.gitlab-ci/container/debian/winehq.gpg.key
+++ /dev/null
@@ -1,53 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQGNBFwOmrgBDAC9FZW3dFpew1hwDaqRfdQQ1ABcmOYu1NKZHwYjd+bGvcR2LRGe
-R5dfRqG1Uc/5r6CPCMvnWxFprymkqKEADn8eFn+aCnPx03HrhA+lNEbciPfTHylt
-NTTuRua7YpJIgEOjhXUbxXxnvF8fhUf5NJpJg6H6fPQARUW+5M//BlVgwn2jhzlW
-U+uwgeJthhiuTXkls9Yo3EoJzmkUih+ABZgvaiBpr7GZRw9GO1aucITct0YDNTVX
-KA6el78/udi5GZSCKT94yY9ArN4W6NiOFCLV7MU5d6qMjwGFhfg46NBv9nqpGinK
-3NDjqCevKouhtKl2J+nr3Ju3Spzuv6Iex7tsOqt+XdZCoY+8+dy3G5zbJwBYsMiS
-rTNF55PHtBH1S0QK5OoN2UR1ie/aURAyAFEMhTzvFB2B2v7C0IKIOmYMEG+DPMs9
-FQs/vZ1UnAQgWk02ZiPryoHfjFO80+XYMrdWN+RSo5q9ODClloaKXjqI/aWLGirm
-KXw2R8tz31go3NMAEQEAAbQnV2luZUhRIHBhY2thZ2VzIDx3aW5lLWRldmVsQHdp
-bmVocS5vcmc+iQHOBBMBCgA4AhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAFiEE
-1D9kAUU2nFHXht3qdvGiD/mHZy8FAlwOmyUACgkQdvGiD/mHZy/zkwv7B+nKFlDY
-Bzz/7j0gqIODbs5FRZRtuf/IuPP3vZdWlNfAW/VyaLtVLJCM/mmaf/O6/gJ+D+E9
-BBoSmHdHzBBOQHIj5IbRedynNcHT5qXsdBeU2ZPR50sdE+jmukvw3Wa5JijoDgUu
-LGLGtU48Z3JsBXQ54OlnTZXQ2SMFhRUa10JANXSJQ+QY2Wo2Pi2+MEAHcrd71A2S
-0mT2DQSSBQ92c6WPfUpOSBawd8P0ipT7rVFNLJh8HVQGyEWxPl8ecDEHoVfG2rdV
-D0ADbNLx9031UUwpUicO6vW/2Ec7c3VNG1cpOtyNTw/lEgvsXOh3GQs/DvFvMy/h
-QzaeF3Qq6cAPlKuxieJe4lLYFBTmCAT4iB1J8oeFs4G7ScfZH4+4NBe3VGoeCD/M
-Wl+qxntAroblxiFuqtPJg+NKZYWBzkptJNhnrBxcBnRinGZLw2k/GR/qPMgsR2L4
-cP+OUuka+R2gp9oDVTZTyMowz+ROIxnEijF50pkj2VBFRB02rfiMp7q6iQIzBBAB
-CgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlwOm3AACgkQzvrI6q8XUZ3KKg/+
-MD8CgvLiHEX90fXQ23RZQRm2J21w3gxdIen/N8yJVIbK7NIgYhgWfGWsGQedtM7D
-hMwUlDSRb4rWy9vrXBaiZoF3+nK9AcLvPChkZz28U59Jft6/l0gVrykey/ERU7EV
-w1Ie1eRu0tRSXsKvMZyQH8897iHZ7uqoJgyk8U8CvSW+V80yqLB2M8Tk8ECZq34f
-HqUIGs4Wo0UZh0vV4+dEQHBh1BYpmmWl+UPf7nzNwFWXu/EpjVhkExRqTnkEJ+Ai
-OxbtrRn6ETKzpV4DjyifqQF639bMIem7DRRf+mkcrAXetvWkUkE76e3E9KLvETCZ
-l4SBfgqSZs2vNngmpX6Qnoh883aFo5ZgVN3v6uTS+LgTwMt/XlnDQ7+Zw+ehCZ2R
-CO21Y9Kbw6ZEWls/8srZdCQ2LxnyeyQeIzsLnqT/waGjQj35i4exzYeWpojVDb3r
-tvvOALYGVlSYqZXIALTx2/tHXKLHyrn1C0VgHRnl+hwv7U49f7RvfQXpx47YQN/C
-PWrpbG69wlKuJptr+olbyoKAWfl+UzoO8vLMo5njWQNAoAwh1H8aFUVNyhtbkRuq
-l0kpy1Cmcq8uo6taK9lvYp8jak7eV8lHSSiGUKTAovNTwfZG2JboGV4/qLDUKvpa
-lPp2xVpF9MzA8VlXTOzLpSyIVxZnPTpL+xR5P9WQjMS5AY0EXA6auAEMAMReKL89
-0z0SL+/i/geB/agfG/k6AXiG2a9kVWeIjAqFwHKl9W/DTNvOqCDgAt51oiHGRRjt
-1Xm3XZD4p+GM1uZWn9qIFL49Gt5x94TqdrsKTVCJr0Kazn2mKQc7aja0zac+WtZG
-OFn7KbniuAcwtC780cyikfmmExLI1/Vjg+NiMlMtZfpK6FIW+ulPiDQPdzIhVppx
-w9/KlR2Fvh4TbzDsUqkFQSSAFdQ65BWgvzLpZHdKO/ILpDkThLbipjtvbBv/pHKM
-O/NFTNoYkJ3cNW/kfcynwV+4AcKwdRz2A3Mez+g5TKFYPZROIbayOo01yTMLfz2p
-jcqki/t4PACtwFOhkAs+MYPPyZDUkTFcEJQCPDstkAgmJWI3K2qELtDOLQyps3WY
-Mfp+mntOdc8bKjFTMcCEk1zcm14K4Oms+w6dw2UnYsX1FAYYhPm8HUYwE4kP8M+D
-9HGLMjLqqF/kanlCFZs5Avx3mDSAx6zS8vtNdGh+64oDNk4x4A2j8GTUuQARAQAB
-iQG8BBgBCgAmFiEE1D9kAUU2nFHXht3qdvGiD/mHZy8FAlwOmrgCGwwFCQPCZwAA
-CgkQdvGiD/mHZy9FnAwAgfUkxsO53Pm2iaHhtF4+BUc8MNJj64Jvm1tghr6PBRtM
-hpbvvN8SSOFwYIsS+2BMsJ2ldox4zMYhuvBcgNUlix0G0Z7h1MjftDdsLFi1DNv2
-J9dJ9LdpWdiZbyg4Sy7WakIZ/VvH1Znd89Imo7kCScRdXTjIw2yCkotE5lK7A6Ns
-NbVuoYEN+dbGioF4csYehnjTdojwF/19mHFxrXkdDZ/V6ZYFIFxEsxL8FEuyI4+o
-LC3DFSA4+QAFdkjGFXqFPlaEJxWt5d7wk0y+tt68v+ulkJ900BvR+OOMqQURwrAi
-iP3I28aRrMjZYwyqHl8i/qyIv+WRakoDKV+wWteR5DmRAPHmX2vnlPlCmY8ysR6J
-2jUAfuDFVu4/qzJe6vw5tmPJMdfvy0W5oogX6sEdin5M5w2b3WrN8nXZcjbWymqP
-6jCdl6eoCCkKNOIbr/MMSkd2KqAqDVM5cnnlQ7q+AXzwNpj3RGJVoBxbS0nn9JWY
-QNQrWh9rAcMIGT+b1le0
-=4lsa
------END PGP PUBLIC KEY BLOCK-----
diff --git a/.gitlab-ci/container/debian/x86_32_build.sh b/.gitlab-ci/container/debian/x86_32_build.sh
deleted file mode 100644
index f6030f6..0000000
--- a/.gitlab-ci/container/debian/x86_32_build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-arch=i386
-
-. .gitlab-ci/container/cross_build.sh
diff --git a/.gitlab-ci/container/debian/x86_64_build-base.sh b/.gitlab-ci/container/debian/x86_64_build-base.sh
deleted file mode 100644
index 0780501..0000000
--- a/.gitlab-ci/container/debian/x86_64_build-base.sh
+++ /dev/null
@@ -1,112 +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_BUILD_BASE_TAG
-
-set -e
-
-. .gitlab-ci/setup-test-env.sh
-
-set -o xtrace
-
-export DEBIAN_FRONTEND=noninteractive
-: "${LLVM_VERSION:?llvm version not set!}"
-
-apt-get install -y ca-certificates curl gnupg2
-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=(
-)
-
-DEPS=(
-    apt-utils
-    bison
-    ccache
-    curl
-    "clang-${LLVM_VERSION}"
-    "clang-format-${LLVM_VERSION}"
-    dpkg-cross
-    dpkg-dev
-    findutils
-    flex
-    flatbuffers-compiler
-    g++
-    cmake
-    gcc
-    git
-    glslang-tools
-    kmod
-    "libclang-${LLVM_VERSION}-dev"
-    "libclang-cpp${LLVM_VERSION}-dev"
-    "libclang-common-${LLVM_VERSION}-dev"
-    libelf-dev
-    libepoxy-dev
-    libexpat1-dev
-    libflatbuffers-dev
-    libgtk-3-dev
-    "libllvm${LLVM_VERSION}"
-    libpciaccess-dev
-    libunwind-dev
-    libva-dev
-    libvulkan-dev
-    libx11-dev
-    libx11-xcb-dev
-    libxext-dev
-    libxml2-utils
-    libxrandr-dev
-    libxrender-dev
-    libxshmfence-dev
-    libxtensor-dev
-    libxxf86vm-dev
-    libwayland-egl-backend-dev
-    "llvm-${LLVM_VERSION}-dev"
-    make
-    ninja-build
-    openssh-server
-    pkgconf
-    python3-mako
-    python3-pil
-    python3-pip
-    python3-ply
-    python3-pycparser
-    python3-requests
-    python3-setuptools
-    python3-yaml
-    qemu-user
-    valgrind
-    x11proto-dri2-dev
-    x11proto-gl-dev
-    x11proto-randr-dev
-    xz-utils
-    zlib1g-dev
-    zstd
-)
-
-apt-get update
-
-apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
-        $EXTRA_LOCAL_PACKAGES
-
-. .gitlab-ci/container/build-llvm-spirv.sh
-
-. .gitlab-ci/container/build-libclc.sh
-
-# Needed for ci-fairy s3cp
-pip3 install --break-system-packages "ci-fairy[s3] @ git+https://gitlab.freedesktop.org/freedesktop/ci-templates@$MESA_TEMPLATES_COMMIT"
-
-. .gitlab-ci/container/install-meson.sh
-
-. .gitlab-ci/container/build-rust.sh build
-
-############### Uninstall ephemeral packages
-
-apt-get purge -y "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/container_post_build.sh
diff --git a/.gitlab-ci/container/debian/x86_64_build.sh b/.gitlab-ci/container/debian/x86_64_build.sh
deleted file mode 100644
index aa71d4d..0000000
--- a/.gitlab-ci/container/debian/x86_64_build.sh
+++ /dev/null
@@ -1,93 +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_BUILD_TAG
-
-set -e
-
-. .gitlab-ci/setup-test-env.sh
-
-set -o xtrace
-
-export DEBIAN_FRONTEND=noninteractive
-: "${LLVM_VERSION:?llvm version not set!}"
-
-# Ephemeral packages (installed for this script and removed again at the end)
-EPHEMERAL=(
-    autoconf
-    automake
-    autotools-dev
-    bzip2
-    libtool
-    libssl-dev
-)
-
-DEPS=(
-    check
-    "clang-${LLVM_VERSION}"
-    libasan8
-    libarchive-dev
-    libdrm-dev
-    "libclang-cpp${LLVM_VERSION}-dev"
-    "libclang-rt-${LLVM_VERSION}-dev"
-    libgbm-dev
-    libglvnd-dev
-    liblua5.3-dev
-    libxcb-dri2-0-dev
-    libxcb-dri3-dev
-    libxcb-glx0-dev
-    libxcb-present-dev
-    libxcb-randr0-dev
-    libxcb-shm0-dev
-    libxcb-sync-dev
-    libxcb-xfixes0-dev
-    libxcb1-dev
-    libxml2-dev
-    libwayland-bin
-    libwayland-dev
-    libwayland-egl-backend-dev
-    "llvm-${LLVM_VERSION}-dev"
-    ocl-icd-opencl-dev
-    python3-pip
-    procps
-    spirv-tools
-    strace
-    time
-    wayland-protocols
-    zstd
-)
-
-apt-get update
-
-apt-get install -y --no-remove \
-      "${DEPS[@]}" "${EPHEMERAL[@]}"
-
-
-. .gitlab-ci/container/container_pre_build.sh
-
-# dependencies where we want a specific version
-export              XORG_RELEASES=https://xorg.freedesktop.org/releases/individual
-
-export         XORGMACROS_VERSION=util-macros-1.19.0
-
-. .gitlab-ci/container/build-mold.sh
-
-curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -O \
-  $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
-tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
-cd $XORGMACROS_VERSION; ./configure; make install; cd ..
-rm -rf $XORGMACROS_VERSION
-
-. .gitlab-ci/container/build-shader-db.sh
-
-. .gitlab-ci/container/build-directx-headers.sh
-
-. .gitlab-ci/container/build-bindgen.sh
-
-############### Uninstall the build software
-
-apt-get purge -y "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/container_post_build.sh
diff --git a/.gitlab-ci/container/debian/x86_64_test-android.sh b/.gitlab-ci/container/debian/x86_64_test-android.sh
deleted file mode 100755
index 188b901..0000000
--- a/.gitlab-ci/container/debian/x86_64_test-android.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-ANDROID_ARCH=x86_64 \
-BUILD_CONTAINER=true \
-TEST_CONTAINER=true \
-DEBIAN_ARCH=amd64 \
-. .gitlab-ci/container/debian/test-android.sh
diff --git a/.gitlab-ci/container/debian/x86_64_test-base.sh b/.gitlab-ci/container/debian/x86_64_test-base.sh
deleted file mode 100644
index 0fe7028..0000000
--- a/.gitlab-ci/container/debian/x86_64_test-base.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-DEBIAN_ARCH=amd64 \
-. .gitlab-ci/container/debian/test-base.sh
diff --git a/.gitlab-ci/container/debian/x86_64_test-gl.sh b/.gitlab-ci/container/debian/x86_64_test-gl.sh
deleted file mode 100644
index 1a75b96..0000000
--- a/.gitlab-ci/container/debian/x86_64_test-gl.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-DEBIAN_ARCH="amd64" \
-. .gitlab-ci/container/debian/test-gl.sh
diff --git a/.gitlab-ci/container/debian/x86_64_test-video.sh b/.gitlab-ci/container/debian/x86_64_test-video.sh
deleted file mode 100755
index 5877ec1..0000000
--- a/.gitlab-ci/container/debian/x86_64_test-video.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/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_VIDEO_TAG
-
-set -e
-
-. .gitlab-ci/setup-test-env.sh
-
-set -o xtrace
-
-section_start debian_setup "Base Debian system setup"
-
-export DEBIAN_FRONTEND=noninteractive
-
-apt-get install -y gstreamer1.0-vaapi  # This interferes with systemd deps, install separately
-
-# Ephemeral packages (installed for this script and removed again at the end)
-EPHEMERAL=(
-    g++
-    libdrm-dev
-    libva-dev
-    meson
-    pkgconf
-)
-
-DEPS=(
-    gstreamer1.0-plugins-bad
-    gstreamer1.0-plugins-base
-    gstreamer1.0-plugins-good
-    gstreamer1.0-plugins-ugly
-    gstreamer1.0-tools
-    libgstreamer1.0-0
-    libva-drm2
-    libva-wayland2
-    libva2
-)
-
-apt-get update
-
-apt-get install -y --no-remove --no-install-recommends \
-      "${DEPS[@]}" "${EPHEMERAL[@]}" "${EXTRA_LOCAL_PACKAGES:-}"
-
-. .gitlab-ci/container/container_pre_build.sh
-
-section_end debian_setup
-
-############### Build libva tests
-
-. .gitlab-ci/container/build-va-tools.sh
-
-############### Install Fluster
-
-. .gitlab-ci/container/build-fluster.sh
-
-############### Uninstall the build software
-
-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
diff --git a/.gitlab-ci/container/debian/x86_64_test-vk.sh b/.gitlab-ci/container/debian/x86_64_test-vk.sh
deleted file mode 100644
index 3ed166e..0000000
--- a/.gitlab-ci/container/debian/x86_64_test-vk.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-DEBIAN_ARCH="amd64" \
-. .gitlab-ci/container/debian/test-vk.sh
diff --git a/.gitlab-ci/container/fdo_cntr_export.sh b/.gitlab-ci/container/fdo_cntr_export.sh
deleted file mode 100644
index b0b04ad..0000000
--- a/.gitlab-ci/container/fdo_cntr_export.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env bash
-
-# This script exports the container image to a rootfs tarball and uploads it to
-# S3.
-#
-# Usage:
-#
-#   ./fdo_cntr_export.sh <container-image-url>
-#
-# The container image URL is the URL of the container image to export. It can be
-# a local path or a remote URL.
-
-# Example:
-# ./fdo_cntr_export.sh registry.freedesktop.org/mesa/mesa/debian/x86_64_test-android:tag
-
-# 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_VIDEO_TAG
-# DEBIAN_TEST_VK_TAG
-
-set -eux -o pipefail
-
-: "${CONTAINER:=$1}"
-IMAGE_URL="${CONTAINER}"
-readonly IMAGE_URL
-
-container=$(buildah from "$IMAGE_URL")
-readonly container
-readonly ROOTFSTAR=lava-rootfs.tar.zst
-touch "$ROOTFSTAR"
-
-buildah copy "$container" ".gitlab-ci/container/setup-rootfs.sh" /root/setup-rootfs.sh
-
-# Using --isolation chroot to ensure proper execution in CI/CD environments
-buildah run --isolation chroot "$container" -- /root/setup-rootfs.sh
-
-buildah_export() {
-    # Mount the volume
-    mountpoint=$(buildah mount "$1")
-
-    if [ ! -d "$mountpoint" ]; then
-        echo "Mount point not found: $mountpoint" >/dev/stderr
-        exit 1
-    fi
-
-    # These components will be provided via LAVA overlays,
-    # so remove them from the core rootfs
-    rm -rf "${mountpoint}/android-cts"
-    rm -rf "${mountpoint}/cuttlefish"
-    rm -rf "${mountpoint}/fluster/resources"
-    rm -rf "${mountpoint}/vkd3d-proton-tests"
-    rm -rf "${mountpoint}/vkd3d-proton-wine64"
-
-    # Compress to zstd
-    ZSTD_CLEVEL=10 tar -C "$mountpoint" -I zstd -cf "$2" .
-}
-
-# When hacking on it locally, the script might not be executed as root.
-# In CI it's always root.
-if (($(id -u) != 0)); then
-    # Run unshare for rootless envs
-    buildah unshare -- bash -c "$(declare -f buildah_export); buildah_export '$container' '$ROOTFSTAR'"
-else
-    # Run directly
-    buildah_export "$container" "$ROOTFSTAR"
-fi
-
-# Unmount the container
-buildah umount "$container"
-
-# Remove the container
-buildah rm "$container"
-
-# Upload the rootfs tarball to S3.
-# The URL format matches the registry format, making it easier to match this URL later.
-curl --fail --retry-connrefused --retry 4 --retry-delay 30 \
-  --header "Authorization: Bearer $(cat "${S3_JWT_FILE}")" \
-  -X PUT --form file=@"$ROOTFSTAR" \
-  "https://${S3_HOST}/${S3_KERNEL_BUCKET}/${CI_PROJECT_PATH}/${CI_JOB_NAME}:${FDO_DISTRIBUTION_TAG}"
diff --git a/.gitlab-ci/container/fedora/gitlab-ci.yml b/.gitlab-ci/container/fedora/gitlab-ci.yml
deleted file mode 100644
index f391139..0000000
--- a/.gitlab-ci/container/fedora/gitlab-ci.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-# Build the CI Fedora docker images.
-#
-# MESA_IMAGE_TAG is the tag of the docker image used by later stage jobs. If the
-# image doesn't exist yet, the container stage job generates it.
-#
-# In order to generate a new image, one should generally change the tag.
-# While removing the image from the registry would also work, that's not
-# recommended except for ephemeral images during development: Replacing
-# an image after a significant amount of time might pull in newer
-# versions of gcc/clang or other packages, which might break the build
-# with older commits using the same tag.
-#
-# After merging a change resulting in generating a new image to the
-# main repository, it's recommended to remove the image from the source
-# repository's container registry, so that the image from the main
-# repository's registry will be used there as well.
-
-# Fedora based x86_64 build image
-fedora/x86_64_build:
-  extends:
-    - .fdo.container-build@fedora
-    - .container
-  variables:
-    FDO_DISTRIBUTION_VERSION: 42
-    MESA_IMAGE_TAG: &fedora-x86_64_build ${FEDORA_X86_64_BUILD_TAG}
-    LLVM_VERSION: &fedora-x86_64-llvm 20
-
-.use-fedora/x86_64_build:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64
-  extends:
-    - .set-image
-  variables:
-    MESA_IMAGE_PATH: "fedora/x86_64_build"
-    MESA_IMAGE_TAG: *fedora-x86_64_build
-    LLVM_VERSION: *fedora-x86_64-llvm
-  needs:
-    - job: sanity
-      optional: true
-    - job: fedora/x86_64_build
-      optional: true
diff --git a/.gitlab-ci/container/fedora/x86_64_build.sh b/.gitlab-ci/container/fedora/x86_64_build.sh
deleted file mode 100644
index 83c1d29..0000000
--- a/.gitlab-ci/container/fedora/x86_64_build.sh
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC1091
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# FEDORA_X86_64_BUILD_TAG
-
-set -e
-
-. .gitlab-ci/setup-test-env.sh
-
-set -o xtrace
-
-
-EPHEMERAL=(
-        autoconf
-        automake
-        bzip2
-        cmake
-        git
-        libtool
-        "pkgconfig(epoxy)"
-        "pkgconfig(gbm)"
-        "pkgconfig(openssl)"
-        python3-pip
-        unzip
-        xz
-)
-
-DEPS=(
-    bison
-    ccache
-    clang-devel
-    flex
-    flatbuffers-compiler
-    gcc
-    gcc-c++
-    gettext
-    glslang
-    kernel-headers
-    libstdc++-static
-    llvm-devel
-    ninja-build
-    "pkgconfig(LLVMSPIRVLib)"
-    "pkgconfig(SPIRV-Tools)"
-    "pkgconfig(dri2proto)"
-    "pkgconfig(expat)"
-    "pkgconfig(flatbuffers)"
-    "pkgconfig(glproto)"
-    "pkgconfig(libclc)"
-    "pkgconfig(libelf)"
-    "pkgconfig(libglvnd)"
-    "pkgconfig(libva)"
-    "pkgconfig(pciaccess)"
-    "pkgconfig(vulkan)"
-    "pkgconfig(x11)"
-    "pkgconfig(x11-xcb)"
-    "pkgconfig(xcb)"
-    "pkgconfig(xcb-dri2)"
-    "pkgconfig(xcb-dri3)"
-    "pkgconfig(xcb-glx)"
-    "pkgconfig(xcb-present)"
-    "pkgconfig(xcb-randr)"
-    "pkgconfig(xcb-sync)"
-    "pkgconfig(xcb-xfixes)"
-    "pkgconfig(xdamage)"
-    "pkgconfig(xext)"
-    "pkgconfig(xfixes)"
-    "pkgconfig(xrandr)"
-    "pkgconfig(xshmfence)"
-    "pkgconfig(xtensor)"
-    "pkgconfig(xxf86vm)"
-    "pkgconfig(zlib)"
-    procps-ng
-    python-unversioned-command
-    python3-devel
-    python3-mako
-    python3-packaging
-    python3-ply
-    python3-pycparser
-    python3-yaml
-    spirv-tools-devel
-    spirv-llvm-translator-devel
-    vulkan-headers
-    which
-)
-
-dnf install -y --setopt=install_weak_deps=False "${DEPS[@]}" "${EPHEMERAL[@]}"
-
-
-. .gitlab-ci/container/container_pre_build.sh
-
-
-# dependencies where we want a specific version
-export              XORG_RELEASES=https://xorg.freedesktop.org/releases/individual
-
-export         XORGMACROS_VERSION=util-macros-1.19.0
-
-curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    -O $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
-tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
-cd $XORGMACROS_VERSION; ./configure; make install; cd ..
-rm -rf $XORGMACROS_VERSION
-
-. .gitlab-ci/container/install-meson.sh
-
-. .gitlab-ci/container/build-rust.sh build
-
-. .gitlab-ci/container/build-bindgen.sh
-
-. .gitlab-ci/container/build-mold.sh
-
-. .gitlab-ci/container/build-libdrm.sh
-
-. .gitlab-ci/container/build-wayland.sh
-
-
-############### Uninstall the build software
-
-dnf remove -y "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/container_post_build.sh
diff --git a/.gitlab-ci/container/gitlab-ci-inc.yml b/.gitlab-ci/container/gitlab-ci-inc.yml
deleted file mode 100644
index b11b058..0000000
--- a/.gitlab-ci/container/gitlab-ci-inc.yml
+++ /dev/null
@@ -1,111 +0,0 @@
-# Docker image tag helper templates
-
-.incorporate-templates-commit:
-  variables:
-    FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_TEMPLATES_COMMIT}"
-
-.incorporate-base-tag+templates-commit:
-  variables:
-    FDO_BASE_IMAGE: "${CI_REGISTRY_IMAGE}/${MESA_BASE_IMAGE}:${MESA_BASE_TAG}--${MESA_TEMPLATES_COMMIT}"
-    FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_BASE_TAG}--${MESA_TEMPLATES_COMMIT}"
-
-.set-image:
-  extends:
-    - .incorporate-templates-commit
-  variables:
-    MESA_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${FDO_DISTRIBUTION_TAG}"
-  image: "$MESA_IMAGE"
-
-.set-image-base-tag:
-  extends:
-    - .set-image
-    - .incorporate-base-tag+templates-commit
-
-.container:
-  stage: container
-  timeout: 1h
-  extends:
-    - .container-rules
-    - .incorporate-templates-commit
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64
-  before_script:
-    - !reference [default, before_script]
-    # Undoing the `eval "$S3_JWT_FILE_SCRIPT"` from the default before_script,
-    # because container_job_trampoline.sh and fdo_cntr_export.sh both need it.
-    - S3_JWT=$(cat "${S3_JWT_FILE}")
-    - export S3_JWT_FILE_SCRIPT="echo -n '${S3_JWT}' > '${S3_JWT_FILE}' && S3_JWT_FILE_SCRIPT= && unset CI_JOB_JWT S3_JWT"
-  variables:
-    FDO_REPO_SUFFIX: $CI_JOB_NAME
-    FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/container_job_trampoline.sh "${CI_JOB_NAME}"'
-    # no need to pull the whole repo to build the container image
-    GIT_STRATEGY: none
-    CI_BUILD_COMPONENTS: "$CI_BUILD_COMPONENTS_ANDROID_CTS $CI_BUILD_COMPONENTS_ANGLE $CI_BUILD_COMPONENTS_CROSVM $CI_BUILD_COMPONENTS_FLUSTER $CI_BUILD_COMPONENTS_PIGLIT $CI_BUILD_COMPONENTS_VKD3D_PROTON"
-
-.container-builds-angle:
-  variables:
-    ANGLE_TAG: "${CONDITIONAL_BUILD_ANGLE_TAG}"
-    CI_BUILD_COMPONENTS_ANGLE: angle
-
-.container-builds-crosvm:
-  variables:
-    CROSVM_TAG: "${CONDITIONAL_BUILD_CROSVM_TAG}"
-    CI_BUILD_COMPONENTS_CROSVM: crosvm
-
-.container-builds-fluster:
-  variables:
-    FLUSTER_TAG: "${CONDITIONAL_BUILD_FLUSTER_TAG}"
-    CI_BUILD_COMPONENTS_FLUSTER: fluster
-
-.container-builds-piglit:
-  variables:
-    PIGLIT_TAG: "${CONDITIONAL_BUILD_PIGLIT_TAG}"
-    CI_BUILD_COMPONENTS_PIGLIT: piglit
-
-.container-builds-vkd3d-proton:
-  variables:
-    VKD3D_PROTON_TAG: "${CONDITIONAL_BUILD_VKD3D_PROTON_TAG}"
-    CI_BUILD_COMPONENTS_VKD3D_PROTON: vkd3d-proton
-
-.container-builds-android-cts:
-  variables:
-    ANDROID_CTS_TAG: "${CONDITIONAL_BUILD_ANDROID_CTS_TAG}"
-    CI_BUILD_COMPONENTS_ANDROID_CTS: android-cts
-
-.container-builds-android:
-  extends:
-    - .container-builds-android-cts
-    - .container-builds-angle
-
-.container-builds-arm32:
-  extends:
-    - .container-builds-piglit
-
-.container-builds-base:
-  extends:
-    - .container-builds-crosvm
-
-.container-builds-gl:
-  extends:
-    - .container-builds-angle
-    - .container-builds-piglit
-
-.container-builds-video:
-  extends:
-    - .container-builds-fluster
-
-.container-builds-vk:
-  extends:
-    - .container-builds-piglit
-    - .container-builds-vkd3d-proton
-
-# Export the container rootfs and upload it to S3
-.export-container:
-  variables:
-    FDO_DISTRIBUTION_PACKAGES: zstd
-    FDO_DISTRIBUTION_POST_EXEC: 'bash .gitlab-ci/container/fdo_cntr_export.sh'
-
-.use-base-image:
-  extends:
-    - .container
-    - .incorporate-base-tag+templates-commit
diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
deleted file mode 100644
index 2416728..0000000
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Build the CI docker images.
-#
-# MESA_IMAGE_TAG is the tag of the docker image used by later stage jobs. If the
-# image doesn't exist yet, the container stage job generates it.
-#
-# In order to generate a new image, one should generally change the tag.
-# While removing the image from the registry would also work, that's not
-# recommended except for ephemeral images during development: Replacing
-# an image after a significant amount of time might pull in newer
-# versions of gcc/clang or other packages, which might break the build
-# with older commits using the same tag.
-#
-# After merging a change resulting in generating a new image to the
-# main repository, it's recommended to remove the image from the source
-# repository's container registry, so that the image from the main
-# repository's registry will be used there as well.
-
-include:
-  - local: '.gitlab-ci/container/gitlab-ci-inc.yml'
-  - local: '.gitlab-ci/container/*/gitlab-ci.yml'
diff --git a/.gitlab-ci/container/install-meson.sh b/.gitlab-ci/container/install-meson.sh
deleted file mode 100644
index 45a8370..0000000
--- a/.gitlab-ci/container/install-meson.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# ALPINE_X86_64_BUILD_TAG
-# DEBIAN_BUILD_BASE_TAG
-# FEDORA_X86_64_BUILD_TAG
-
-rm -f /usr/lib/python3.*/EXTERNALLY-MANAGED
-
-# We need at least 1.7.0 for proper rust binding generation
-pip3 install 'meson==1.7.0'
diff --git a/.gitlab-ci/container/install-wine-apitrace.sh b/.gitlab-ci/container/install-wine-apitrace.sh
deleted file mode 100644
index eb4f168..0000000
--- a/.gitlab-ci/container/install-wine-apitrace.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -ue
-
-APITRACE_VERSION="11.1"
-APITRACE_VERSION_DATE=""
-
-curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \
-  "https://github.com/apitrace/apitrace/releases/download/${APITRACE_VERSION}/apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64.7z"
-7zr x "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64.7z" \
-      "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64/bin/apitrace.exe" \
-      "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64/bin/d3dretrace.exe"
-mv "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64" /apitrace-msvc-win64
-rm "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64.7z"
-
-
diff --git a/.gitlab-ci/container/install-wine-dxvk.sh b/.gitlab-ci/container/install-wine-dxvk.sh
deleted file mode 100755
index 4785890..0000000
--- a/.gitlab-ci/container/install-wine-dxvk.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-set -ue
-
-overrideDll() {
-  if ! wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "$1" /d native /f; then
-    echo -e "Failed to add override for $1"
-    exit 1
-  fi
-}
-
-dxvk_install_release() {
-    local DXVK_VERSION=${1:?}
-
-    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-	-O "https://github.com/doitsujin/dxvk/releases/download/v${DXVK_VERSION}/dxvk-${DXVK_VERSION}.tar.gz"
-    tar xzpf dxvk-"${DXVK_VERSION}".tar.gz
-    cp "dxvk-${DXVK_VERSION}"/x64/*.dll "$WINEPREFIX/drive_c/windows/system32/"
-    overrideDll d3d9
-    overrideDll d3d10core
-    overrideDll d3d11
-    overrideDll dxgi
-    rm -rf "dxvk-${DXVK_VERSION}"
-    rm dxvk-"${DXVK_VERSION}".tar.gz
-}
-
-dxvk_install_release "2.1"
diff --git a/.gitlab-ci/container/patches/build-deqp-gl_Build-Don-t-build-Vulkan-utilities-for-GL-builds.patch b/.gitlab-ci/container/patches/build-deqp-gl_Build-Don-t-build-Vulkan-utilities-for-GL-builds.patch
deleted file mode 100644
index 2be1bc8..0000000
--- a/.gitlab-ci/container/patches/build-deqp-gl_Build-Don-t-build-Vulkan-utilities-for-GL-builds.patch
+++ /dev/null
@@ -1,392 +0,0 @@
-From ccdc2b9341c703507cba6017d2a494595335ffdc Mon Sep 17 00:00:00 2001
-From: Daniel Stone <daniels@collabora.com>
-Date: Wed, 29 Jan 2025 12:50:33 +0000
-Subject: [PATCH] Build: Don't build Vulkan utilities for GL builds
-
-Change-Id: Ie412f914bb6264ffbd502deea57d80cc11a9948e
-Signed-off-by: Daniel Stone <daniels@collabora.com>
----
- framework/platform/CMakeLists.txt             |   9 --
- .../platform/android/tcuAndroidPlatform.cpp   | 126 +-----------------
- .../platform/android/tcuAndroidPlatform.hpp   |  14 +-
- framework/platform/lnx/tcuLnxPlatform.cpp     |   9 +-
- .../surfaceless/tcuSurfacelessPlatform.cpp    |  54 --------
- 5 files changed, 3 insertions(+), 209 deletions(-)
-
-diff --git a/framework/platform/CMakeLists.txt b/framework/platform/CMakeLists.txt
-index ec1deb5c2..49fe412a7 100644
---- a/framework/platform/CMakeLists.txt
-+++ b/framework/platform/CMakeLists.txt
-@@ -15,8 +15,6 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS)
- 			win32/tcuWin32Window.hpp
- 			win32/tcuWin32EGLNativeDisplayFactory.hpp
- 			win32/tcuWin32EGLNativeDisplayFactory.cpp
--			win32/tcuWin32VulkanPlatform.hpp
--			win32/tcuWin32VulkanPlatform.cpp
- 			)
- 
- 	elseif ((DE_OS_IS_UNIX OR DE_OS_IS_OSX) AND (DEQP_USE_X11 OR DEQP_USE_WAYLAND OR DEQP_USE_HEADLESS))
-@@ -28,8 +26,6 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS)
- 			lnx/tcuLnxPlatform.hpp
- 			lnx/tcuLnxEglPlatform.hpp
- 			lnx/tcuLnxEglPlatform.cpp
--			lnx/tcuLnxVulkanPlatform.hpp
--			lnx/tcuLnxVulkanPlatform.cpp
- 		)
- 
- 		include_directories(lnx)
-@@ -164,8 +160,6 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS)
- 		set(TCUTIL_PLATFORM_SRCS
- 			osx/tcuOSXPlatform.cpp
- 			osx/tcuOSXPlatform.hpp
--			osx/tcuOSXVulkanPlatform.cpp
--			osx/tcuOSXVulkanPlatform.hpp
- 			osx/tcuOSXMetalView.mm
- 			osx/tcuOSXMetalView.hpp
- 			)
-@@ -191,9 +185,6 @@ if (DEQP_USE_WAYLAND)
- 	add_dependencies(tcutil-platform deqp-xdg-shell)
- endif()
- 
--# Add vkutil to the deps before tcutil so that it picks up the c++11 dependencies
--target_link_libraries(tcutil-platform vkutil)
--
- target_link_libraries(tcutil-platform tcutil ${TCUTIL_PLATFORM_LIBS})
- 
- # Always link to glutil as some platforms such as Win32 always support GL
-diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp
-index af56dabb8..6b0de6dba 100644
---- a/framework/platform/android/tcuAndroidPlatform.cpp
-+++ b/framework/platform/android/tcuAndroidPlatform.cpp
-@@ -31,7 +31,6 @@
- #include "eglwLibrary.hpp"
- #include "eglwEnums.hpp"
- #include "tcuFunctionLibrary.hpp"
--#include "vkWsiPlatform.hpp"
- 
- // Assume no call translation is needed
- #include <android/native_window.h>
-@@ -217,102 +216,6 @@ eglu::NativeDisplay *NativeDisplayFactory::createDisplay(const EGLAttrib *attrib
-     return new NativeDisplay();
- }
- 
--// Vulkan
--
--class VulkanLibrary : public vk::Library
--{
--public:
--    VulkanLibrary(const char *libraryPath)
--        : m_library(libraryPath != nullptr ? libraryPath : "libvulkan.so")
--        , m_driver(m_library)
--    {
--    }
--
--    const vk::PlatformInterface &getPlatformInterface(void) const
--    {
--        return m_driver;
--    }
--
--    const tcu::FunctionLibrary &getFunctionLibrary(void) const
--    {
--        return m_library;
--    }
--
--private:
--    const tcu::DynamicFunctionLibrary m_library;
--    const vk::PlatformDriver m_driver;
--};
--
--DE_STATIC_ASSERT(sizeof(vk::pt::AndroidNativeWindowPtr) == sizeof(ANativeWindow *));
--
--class VulkanWindow : public vk::wsi::AndroidWindowInterface
--{
--public:
--    VulkanWindow(tcu::Android::Window &window)
--        : vk::wsi::AndroidWindowInterface(vk::pt::AndroidNativeWindowPtr(window.getNativeWindow()))
--        , m_window(window)
--    {
--    }
--
--    void setVisible(bool visible)
--    {
--        DE_UNREF(visible);
--    }
--
--    void resize(const UVec2 &newSize)
--    {
--        DE_UNREF(newSize);
--    }
--
--    void setMinimized(bool minimized)
--    {
--        DE_UNREF(minimized);
--        TCU_THROW(NotSupportedError, "Minimized on Android is not implemented");
--    }
--
--    ~VulkanWindow(void)
--    {
--        m_window.release();
--    }
--
--private:
--    tcu::Android::Window &m_window;
--};
--
--class VulkanDisplay : public vk::wsi::Display
--{
--public:
--    VulkanDisplay(WindowRegistry &windowRegistry) : m_windowRegistry(windowRegistry)
--    {
--    }
--
--    vk::wsi::Window *createWindow(const Maybe<UVec2> &initialSize) const
--    {
--        Window *const window = m_windowRegistry.tryAcquireWindow();
--
--        if (window)
--        {
--            try
--            {
--                if (initialSize)
--                    window->setBuffersGeometry((int)initialSize->x(), (int)initialSize->y(), WINDOW_FORMAT_RGBA_8888);
--
--                return new VulkanWindow(*window);
--            }
--            catch (...)
--            {
--                window->release();
--                throw;
--            }
--        }
--        else
--            TCU_THROW(ResourceError, "Native window is not available");
--    }
--
--private:
--    WindowRegistry &m_windowRegistry;
--};
--
- static size_t getTotalSystemMemory(ANativeActivity *activity)
- {
-     const size_t MiB = (size_t)(1 << 20);
-@@ -341,8 +244,7 @@ static size_t getTotalSystemMemory(ANativeActivity *activity)
- // Platform
- 
- Platform::Platform(NativeActivity &activity)
--    : m_activity(activity)
--    , m_totalSystemMemory(getTotalSystemMemory(activity.getNativeActivity()))
-+    : m_totalSystemMemory(getTotalSystemMemory(activity.getNativeActivity()))
- {
-     m_nativeDisplayFactoryRegistry.registerFactory(new NativeDisplayFactory(m_windowRegistry));
-     m_contextFactoryRegistry.registerFactory(new eglu::GLContextFactory(m_nativeDisplayFactoryRegistry));
-@@ -358,16 +260,6 @@ bool Platform::processEvents(void)
-     return true;
- }
- 
--vk::Library *Platform::createLibrary(const char *libraryPath) const
--{
--    return new VulkanLibrary(libraryPath);
--}
--
--void Platform::describePlatform(std::ostream &dst) const
--{
--    tcu::Android::describePlatform(m_activity.getNativeActivity(), dst);
--}
--
- void Platform::getMemoryLimits(tcu::PlatformMemoryLimits &limits) const
- {
-     // Worst-case estimates
-@@ -401,22 +293,6 @@ void Platform::getMemoryLimits(tcu::PlatformMemoryLimits &limits) const
-     limits.devicePageTableHierarchyLevels    = 3;
- }
- 
--vk::wsi::Display *Platform::createWsiDisplay(vk::wsi::Type wsiType) const
--{
--    if (wsiType == vk::wsi::TYPE_ANDROID)
--        return new VulkanDisplay(const_cast<WindowRegistry &>(m_windowRegistry));
--    else
--        TCU_THROW(NotSupportedError, "WSI type not supported on Android");
--}
--
--bool Platform::hasDisplay(vk::wsi::Type wsiType) const
--{
--    if (wsiType == vk::wsi::TYPE_ANDROID)
--        return true;
--
--    return false;
--}
--
- } // namespace Android
- } // namespace tcu
- 
-diff --git a/framework/platform/android/tcuAndroidPlatform.hpp b/framework/platform/android/tcuAndroidPlatform.hpp
-index 32cc9068c..3c3f02d98 100644
---- a/framework/platform/android/tcuAndroidPlatform.hpp
-+++ b/framework/platform/android/tcuAndroidPlatform.hpp
-@@ -27,7 +27,6 @@
- #include "tcuPlatform.hpp"
- #include "egluPlatform.hpp"
- #include "gluPlatform.hpp"
--#include "vkPlatform.hpp"
- #include "tcuAndroidWindow.hpp"
- #include "tcuAndroidNativeActivity.hpp"
- 
-@@ -36,7 +35,7 @@ namespace tcu
- namespace Android
- {
- 
--class Platform : public tcu::Platform, private eglu::Platform, private glu::Platform, private vk::Platform
-+class Platform : public tcu::Platform, private eglu::Platform, private glu::Platform
- {
- public:
-     Platform(NativeActivity &activity);
-@@ -52,10 +51,6 @@ public:
-     {
-         return static_cast<const eglu::Platform &>(*this);
-     }
--    virtual const vk::Platform &getVulkanPlatform(void) const
--    {
--        return static_cast<const vk::Platform &>(*this);
--    }
-     virtual void getMemoryLimits(tcu::PlatformMemoryLimits &limits) const;
- 
-     WindowRegistry &getWindowRegistry(void)
-@@ -63,14 +58,7 @@ public:
-         return m_windowRegistry;
-     }
- 
--    // Vulkan Platform API
--    vk::Library *createLibrary(const char *libraryPath) const;
--    void describePlatform(std::ostream &dst) const;
--    vk::wsi::Display *createWsiDisplay(vk::wsi::Type wsiType) const;
--    bool hasDisplay(vk::wsi::Type wsiType) const;
--
- private:
--    NativeActivity &m_activity;
-     WindowRegistry m_windowRegistry;
-     const size_t m_totalSystemMemory;
- };
-diff --git a/framework/platform/lnx/tcuLnxPlatform.cpp b/framework/platform/lnx/tcuLnxPlatform.cpp
-index 8c0a3ef06..6b1a4985a 100644
---- a/framework/platform/lnx/tcuLnxPlatform.cpp
-+++ b/framework/platform/lnx/tcuLnxPlatform.cpp
-@@ -23,12 +23,10 @@
- 
- #include "tcuLnxPlatform.hpp"
- 
--#include "tcuLnxVulkanPlatform.hpp"
- #include "tcuLnxEglPlatform.hpp"
- 
- #include "deUniquePtr.hpp"
- #include "gluPlatform.hpp"
--#include "vkPlatform.hpp"
- 
- #if defined(DEQP_SUPPORT_X11)
- #include <X11/Xlib.h>
-@@ -64,10 +62,6 @@ public:
-         return !m_eventState.getQuitFlag();
-     }
- 
--    const vk::Platform &getVulkanPlatform(void) const
--    {
--        return m_vkPlatform;
--    }
-     const eglu::Platform &getEGLPlatform(void) const
-     {
-         return m_eglPlatform;
-@@ -79,12 +73,11 @@ public:
- 
- private:
-     EventState m_eventState;
--    VulkanPlatform m_vkPlatform;
-     egl::Platform m_eglPlatform;
-     LinuxGLPlatform m_glPlatform;
- };
- 
--LinuxPlatform::LinuxPlatform(void) : m_vkPlatform(m_eventState), m_eglPlatform(m_eventState)
-+LinuxPlatform::LinuxPlatform(void) : m_eglPlatform(m_eventState)
- {
- #if defined(DEQP_SUPPORT_GLX)
-     m_glPlatform.registerFactory(x11::glx::createContextFactory(m_eventState));
-diff --git a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
-index 585bfbbae..9f386b3ca 100644
---- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
-+++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
-@@ -43,7 +43,6 @@
- #include "tcuPixelFormat.hpp"
- #include "tcuPlatform.hpp"
- #include "tcuRenderTarget.hpp"
--#include "vkPlatform.hpp"
- 
- #include <EGL/egl.h>
- 
-@@ -99,52 +98,6 @@ namespace tcu
- namespace surfaceless
- {
- 
--class VulkanLibrary : public vk::Library
--{
--public:
--    VulkanLibrary(const char *libraryPath)
--        : m_library(libraryPath != nullptr ? libraryPath : DEQP_VULKAN_LIBRARY_PATH)
--        , m_driver(m_library)
--    {
--    }
--
--    const vk::PlatformInterface &getPlatformInterface(void) const
--    {
--        return m_driver;
--    }
--    const tcu::FunctionLibrary &getFunctionLibrary(void) const
--    {
--        return m_library;
--    }
--
--private:
--    const tcu::DynamicFunctionLibrary m_library;
--    const vk::PlatformDriver m_driver;
--};
--
--// Copied from tcuX11Platform.cpp
--class VulkanPlatform : public vk::Platform
--{
--public:
--    vk::Library *createLibrary(const char *libraryPath) const
--    {
--        return new VulkanLibrary(libraryPath);
--    }
--
--    void describePlatform(std::ostream &dst) const
--    {
--        utsname sysInfo;
--
--        deMemset(&sysInfo, 0, sizeof(sysInfo));
--
--        if (uname(&sysInfo) != 0)
--            throw std::runtime_error("uname() failed");
--
--        dst << "OS: " << sysInfo.sysname << " " << sysInfo.release << " " << sysInfo.version << "\n";
--        dst << "CPU: " << sysInfo.machine << "\n";
--    }
--};
--
- bool isEGLExtensionSupported(const eglw::Library &egl, eglw::EGLDisplay, const std::string &extName)
- {
-     const vector<string> exts = eglu::getClientExtensions(egl);
-@@ -191,13 +144,6 @@ public:
-     {
-         return *this;
-     }
--    const vk::Platform &getVulkanPlatform(void) const
--    {
--        return m_vkPlatform;
--    }
--
--private:
--    VulkanPlatform m_vkPlatform;
- };
- 
- class ContextFactory : public glu::ContextFactory
--- 
-2.45.2
-
diff --git a/.gitlab-ci/container/patches/build-perfetto-Fix-C-standard-library-build-errors-with-Debian-13.patch b/.gitlab-ci/container/patches/build-perfetto-Fix-C-standard-library-build-errors-with-Debian-13.patch
deleted file mode 100644
index 91a64ed..0000000
--- a/.gitlab-ci/container/patches/build-perfetto-Fix-C-standard-library-build-errors-with-Debian-13.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 7a5a9e5be4306637cd3a0ef0f770832f4b4cf4b4 Mon Sep 17 00:00:00 2001
-From: Laura Nao <laura.nao@collabora.com>
-Date: Wed, 12 Nov 2025 14:45:32 +0100
-Subject: [PATCH] Fix C++ standard library build errors with Debian 13
-
-Address missing <algorithm> and <optional> includes that caused build
-failures ("no member named 'find' in namespace 'std'" and
-"error: no template named 'optional' in namespace 'std'") when building
-with the native toolchain on Debian 13.
-
-This was fixed upstream in v48[1] and v49[2] respectively, so this patch
-can be dropped once Perfetto is updated to v48+.
-
-[1] https://github.com/google/perfetto/commit/d005c0123b2f929b918359a53ffe61d7ca2212a0
-[2] https://github.com/google/perfetto/commit/acc24608c84d2d2d8d684f40a110d0a6f4eddc51
-
-Signed-off-by: Laura Nao <laura.nao@collabora.com>
----
- src/profiling/common/producer_support.cc            | 1 +
- src/traced/probes/sys_stats/sys_stats_data_source.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/profiling/common/producer_support.cc b/src/profiling/common/producer_support.cc
-index 5303658..e9e193d 100644
---- a/src/profiling/common/producer_support.cc
-+++ b/src/profiling/common/producer_support.cc
-@@ -16,6 +16,7 @@
- 
- #include "src/profiling/common/producer_support.h"
- 
-+#include <algorithm>
- #include <optional>
- 
- #include "perfetto/ext/base/android_utils.h"
-diff --git a/src/traced/probes/sys_stats/sys_stats_data_source.h b/src/traced/probes/sys_stats/sys_stats_data_source.h
-index e09cd8a..7e4749b 100644
---- a/src/traced/probes/sys_stats/sys_stats_data_source.h
-+++ b/src/traced/probes/sys_stats/sys_stats_data_source.h
-@@ -21,6 +21,7 @@
- 
- #include <map>
- #include <memory>
-+#include <optional>
- #include <string>
- 
- #include "perfetto/ext/base/paged_memory.h"
--- 
-2.39.5
-
diff --git a/.gitlab-ci/container/patches/build-skqp_BUILD.gn.patch b/.gitlab-ci/container/patches/build-skqp_BUILD.gn.patch
deleted file mode 100644
index a1e82af..0000000
--- a/.gitlab-ci/container/patches/build-skqp_BUILD.gn.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/BUILD.gn b/BUILD.gn
-index d2b1407..7b60c90 100644
---- a/BUILD.gn
-+++ b/BUILD.gn
-@@ -144,7 +144,7 @@ config("skia_public") {
- 
- # Skia internal APIs, used by Skia itself and a few test tools.
- config("skia_private") {
--  visibility = [ ":*" ]
-+  visibility = [ "*" ]
- 
-   include_dirs = [
-     "include/private",
diff --git a/.gitlab-ci/container/patches/build-skqp_fetch_gn.patch b/.gitlab-ci/container/patches/build-skqp_fetch_gn.patch
deleted file mode 100644
index 545cf2a..0000000
--- a/.gitlab-ci/container/patches/build-skqp_fetch_gn.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/bin/fetch-gn b/bin/fetch-gn
-index d5e94a2..59c4591 100755
---- a/bin/fetch-gn
-+++ b/bin/fetch-gn
-@@ -5,39 +5,44 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
- 
--import hashlib
- import os
-+import platform
- import shutil
- import stat
- import sys
--import urllib2
-+import tempfile
-+import zipfile
-+
-+if sys.version_info[0] < 3:
-+  from urllib2 import urlopen
-+else:
-+  from urllib.request import urlopen
- 
- os.chdir(os.path.join(os.path.dirname(__file__), os.pardir))
- 
--dst = 'bin/gn.exe' if 'win32' in sys.platform else 'bin/gn'
-+gnzip = os.path.join(tempfile.mkdtemp(), 'gn.zip')
-+with open(gnzip, 'wb') as f:
-+  OS  = {'darwin': 'mac', 'linux': 'linux', 'linux2': 'linux', 'win32': 'windows'}[sys.platform]
-+  cpu = {'amd64': 'amd64', 'arm64': 'arm64', 'x86_64': 'amd64', 'aarch64': 'arm64'}[platform.machine().lower()]
- 
--sha1 = '2f27ff0b6118e5886df976da5effa6003d19d1ce' if 'linux'  in sys.platform else \
--       '9be792dd9010ce303a9c3a497a67bcc5ac8c7666' if 'darwin' in sys.platform else \
--       'eb69be2d984b4df60a8c21f598135991f0ad1742'  # Windows
-+  rev = 'd62642c920e6a0d1756316d225a90fd6faa9e21e'
-+  url = 'https://chrome-infra-packages.appspot.com/dl/gn/gn/{}-{}/+/git_revision:{}'.format(
-+          OS,cpu,rev)
-+  f.write(urlopen(url).read())
- 
--def sha1_of_file(path):
--  h = hashlib.sha1()
--  if os.path.isfile(path):
--    with open(path, 'rb') as f:
--      h.update(f.read())
--  return h.hexdigest()
-+gn = 'gn.exe' if 'win32' in sys.platform else 'gn'
-+with zipfile.ZipFile(gnzip, 'r') as f:
-+  f.extract(gn, 'bin')
- 
--if sha1_of_file(dst) != sha1:
--  with open(dst, 'wb') as f:
--    f.write(urllib2.urlopen('https://chromium-gn.storage-download.googleapis.com/' + sha1).read())
-+gn = os.path.join('bin', gn)
- 
--  os.chmod(dst, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR |
--                stat.S_IRGRP                | stat.S_IXGRP |
--                stat.S_IROTH                | stat.S_IXOTH )
-+os.chmod(gn, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR |
-+             stat.S_IRGRP                | stat.S_IXGRP |
-+             stat.S_IROTH                | stat.S_IXOTH )
- 
- # We'll also copy to a path that depot_tools' GN wrapper will expect to find the binary.
- copy_path = 'buildtools/linux64/gn' if 'linux'  in sys.platform else \
-             'buildtools/mac/gn'     if 'darwin' in sys.platform else \
-             'buildtools/win/gn.exe'
- if os.path.isdir(os.path.dirname(copy_path)):
--  shutil.copy(dst, copy_path)
-+  shutil.copy(gn, copy_path)
diff --git a/.gitlab-ci/container/patches/build-skqp_git-sync-deps.patch b/.gitlab-ci/container/patches/build-skqp_git-sync-deps.patch
deleted file mode 100644
index d088349..0000000
--- a/.gitlab-ci/container/patches/build-skqp_git-sync-deps.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-Patch based from diff with skia repository from commit
-013397884c73959dc07cb0a26ee742b1cdfbda8a
-
-Adds support for Python3, but removes the constraint of only SHA based refs in
-DEPS
-diff --git a/tools/git-sync-deps b/tools/git-sync-deps
-index c7379c0b5c..f63d4d9ccf 100755
---- a/tools/git-sync-deps
-+++ b/tools/git-sync-deps
-@@ -43,7 +43,7 @@ def git_executable():
-       A string suitable for passing to subprocess functions, or None.
-   """
-   envgit = os.environ.get('GIT_EXECUTABLE')
--  searchlist = ['git']
-+  searchlist = ['git', 'git.bat']
-   if envgit:
-     searchlist.insert(0, envgit)
-   with open(os.devnull, 'w') as devnull:
-@@ -94,21 +94,25 @@ def is_git_toplevel(git, directory):
-   try:
-     toplevel = subprocess.check_output(
-       [git, 'rev-parse', '--show-toplevel'], cwd=directory).strip()
--    return os.path.realpath(directory) == os.path.realpath(toplevel)
-+    return os.path.realpath(directory) == os.path.realpath(toplevel.decode())
-   except subprocess.CalledProcessError:
-     return False
- 
- 
--def status(directory, checkoutable):
--  def truncate(s, length):
-+def status(directory, commithash, change):
-+  def truncate_beginning(s, length):
-+    return s if len(s) <= length else '...' + s[-(length-3):]
-+  def truncate_end(s, length):
-     return s if len(s) <= length else s[:(length - 3)] + '...'
-+
-   dlen = 36
--  directory = truncate(directory, dlen)
--  checkoutable = truncate(checkoutable, 40)
--  sys.stdout.write('%-*s @ %s\n' % (dlen, directory, checkoutable))
-+  directory = truncate_beginning(directory, dlen)
-+  commithash = truncate_end(commithash, 40)
-+  symbol = '>' if change else '@'
-+  sys.stdout.write('%-*s %s %s\n' % (dlen, directory, symbol, commithash))
- 
- 
--def git_checkout_to_directory(git, repo, checkoutable, directory, verbose):
-+def git_checkout_to_directory(git, repo, commithash, directory, verbose):
-   """Checkout (and clone if needed) a Git repository.
- 
-   Args:
-@@ -117,8 +121,7 @@ def git_checkout_to_directory(git, repo, checkoutable, directory, verbose):
-     repo (string) the location of the repository, suitable
-          for passing to `git clone`.
- 
--    checkoutable (string) a tag, branch, or commit, suitable for
--                 passing to `git checkout`
-+    commithash (string) a commit, suitable for passing to `git checkout`
- 
-     directory (string) the path into which the repository
-               should be checked out.
-@@ -129,7 +132,12 @@ def git_checkout_to_directory(git, repo, checkoutable, directory, verbose):
-   """
-   if not os.path.isdir(directory):
-     subprocess.check_call(
--      [git, 'clone', '--quiet', repo, directory])
-+      [git, 'clone', '--quiet', '--no-checkout', repo, directory])
-+    subprocess.check_call([git, 'checkout', '--quiet', commithash],
-+                          cwd=directory)
-+    if verbose:
-+      status(directory, commithash, True)
-+    return
- 
-   if not is_git_toplevel(git, directory):
-     # if the directory exists, but isn't a git repo, you will modify
-@@ -145,11 +153,11 @@ def git_checkout_to_directory(git, repo, checkoutable, directory, verbose):
-   with open(os.devnull, 'w') as devnull:
-     # If this fails, we will fetch before trying again.  Don't spam user
-     # with error infomation.
--    if 0 == subprocess.call([git, 'checkout', '--quiet', checkoutable],
-+    if 0 == subprocess.call([git, 'checkout', '--quiet', commithash],
-                             cwd=directory, stderr=devnull):
-       # if this succeeds, skip slow `git fetch`.
-       if verbose:
--        status(directory, checkoutable)  # Success.
-+        status(directory, commithash, False)  # Success.
-       return
- 
-   # If the repo has changed, always force use of the correct repo.
-@@ -159,18 +167,24 @@ def git_checkout_to_directory(git, repo, checkoutable, directory, verbose):
- 
-   subprocess.check_call([git, 'fetch', '--quiet'], cwd=directory)
- 
--  subprocess.check_call([git, 'checkout', '--quiet', checkoutable], cwd=directory)
-+  subprocess.check_call([git, 'checkout', '--quiet', commithash], cwd=directory)
- 
-   if verbose:
--    status(directory, checkoutable)  # Success.
-+    status(directory, commithash, True)  # Success.
- 
- 
- def parse_file_to_dict(path):
-   dictionary = {}
--  execfile(path, dictionary)
-+  with open(path) as f:
-+    exec('def Var(x): return vars[x]\n' + f.read(), dictionary)
-   return dictionary
- 
- 
-+def is_sha1_sum(s):
-+  """SHA1 sums are 160 bits, encoded as lowercase hexadecimal."""
-+  return len(s) == 40 and all(c in '0123456789abcdef' for c in s)
-+
-+
- def git_sync_deps(deps_file_path, command_line_os_requests, verbose):
-   """Grab dependencies, with optional platform support.
- 
-@@ -204,19 +218,19 @@ def git_sync_deps(deps_file_path, command_line_os_requests, verbose):
-         raise Exception('%r is parent of %r' % (other_dir, directory))
-   list_of_arg_lists = []
-   for directory in sorted(dependencies):
--    if not isinstance(dependencies[directory], basestring):
-+    if not isinstance(dependencies[directory], str):
-       if verbose:
--        print 'Skipping "%s".' % directory
-+        sys.stdout.write( 'Skipping "%s".\n' % directory)
-       continue
-     if '@' in dependencies[directory]:
--      repo, checkoutable = dependencies[directory].split('@', 1)
-+      repo, commithash = dependencies[directory].split('@', 1)
-     else:
--      raise Exception("please specify commit or tag")
-+      raise Exception("please specify commit")
- 
-     relative_directory = os.path.join(deps_file_directory, directory)
- 
-     list_of_arg_lists.append(
--      (git, repo, checkoutable, relative_directory, verbose))
-+      (git, repo, commithash, relative_directory, verbose))
- 
-   multithread(git_checkout_to_directory, list_of_arg_lists)
- 
diff --git a/.gitlab-ci/container/patches/build-skqp_gl.patch b/.gitlab-ci/container/patches/build-skqp_gl.patch
deleted file mode 100644
index 7467ee4..0000000
--- a/.gitlab-ci/container/patches/build-skqp_gl.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/tools/skqp/src/skqp.cpp b/tools/skqp/src/skqp.cpp
-index 50ed9db01d..938217000d 100644
---- a/tools/skqp/src/skqp.cpp
-+++ b/tools/skqp/src/skqp.cpp
-@@ -448,7 +448,7 @@ inline void write(SkWStream* wStream, const T& text) {
- 
- void SkQP::makeReport() {
-     SkASSERT_RELEASE(fAssetManager);
--    int glesErrorCount = 0, vkErrorCount = 0, gles = 0, vk = 0;
-+    int glErrorCount = 0, glesErrorCount = 0, vkErrorCount = 0, gl = 0, gles = 0, vk = 0;
- 
-     if (!sk_isdir(fReportDirectory.c_str())) {
-         SkDebugf("Report destination does not exist: '%s'\n", fReportDirectory.c_str());
-@@ -460,6 +460,7 @@ void SkQP::makeReport() {
-     htmOut.writeText(kDocHead);
-     for (const SkQP::RenderResult& run : fRenderResults) {
-         switch (run.fBackend) {
-+            case SkQP::SkiaBackend::kGL: ++gl; break;
-             case SkQP::SkiaBackend::kGLES: ++gles; break;
-             case SkQP::SkiaBackend::kVulkan: ++vk; break;
-             default: break;
-@@ -477,15 +478,17 @@ void SkQP::makeReport() {
-         }
-         write(&htmOut, SkStringPrintf("  f(%s);\n", str.c_str()));
-         switch (run.fBackend) {
-+            case SkQP::SkiaBackend::kGL: ++glErrorCount; break;
-             case SkQP::SkiaBackend::kGLES: ++glesErrorCount; break;
-             case SkQP::SkiaBackend::kVulkan: ++vkErrorCount; break;
-             default: break;
-         }
-     }
-     htmOut.writeText(kDocMiddle);
--    write(&htmOut, SkStringPrintf("<p>gles errors: %d (of %d)</br>\n"
-+    write(&htmOut, SkStringPrintf("<p>gl errors: %d (of %d)</br>\n"
-+                                  "gles errors: %d (of %d)</br>\n"
-                                   "vk errors: %d (of %d)</p>\n",
--                                  glesErrorCount, gles, vkErrorCount, vk));
-+                                  glErrorCount, gl, glesErrorCount, gles, vkErrorCount, vk));
-     htmOut.writeText(kDocTail);
-     SkFILEWStream unitOut(SkOSPath::Join(fReportDirectory.c_str(), kUnitTestReportPath).c_str());
-     SkASSERT_RELEASE(unitOut.isValid());
diff --git a/.gitlab-ci/container/patches/build-skqp_include_cstdint.patch b/.gitlab-ci/container/patches/build-skqp_include_cstdint.patch
deleted file mode 100644
index 3c24b9b..0000000
--- a/.gitlab-ci/container/patches/build-skqp_include_cstdint.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/sksl/SkSLString.h b/src/sksl/SkSLString.h
-index b3e411e..257a1ed 100644
---- a/src/sksl/SkSLString.h
-+++ b/src/sksl/SkSLString.h
-@@ -8,6 +8,7 @@
- #ifndef SKSL_STRING
- #define SKSL_STRING
- 
-+#include <cstdint>
- #include <cstring>
- 
- #define SKSL_USE_STD_STRING
diff --git a/.gitlab-ci/container/patches/build-skqp_is_clang.py.patch b/.gitlab-ci/container/patches/build-skqp_is_clang.py.patch
deleted file mode 100644
index af6f6cf..0000000
--- a/.gitlab-ci/container/patches/build-skqp_is_clang.py.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn
-index 454334a..1797594 100644
---- a/gn/BUILDCONFIG.gn
-+++ b/gn/BUILDCONFIG.gn
-@@ -80,7 +80,7 @@ if (current_cpu == "") {
- is_clang = is_android || is_ios || is_mac ||
-            (cc == "clang" && cxx == "clang++") || clang_win != ""
- if (!is_clang && !is_win) {
--  is_clang = exec_script("gn/is_clang.py",
-+  is_clang = exec_script("//gn/is_clang.py",
-                          [
-                            cc,
-                            cxx,
diff --git a/.gitlab-ci/container/patches/build-skqp_nima.patch b/.gitlab-ci/container/patches/build-skqp_nima.patch
deleted file mode 100644
index a7ad032..0000000
--- a/.gitlab-ci/container/patches/build-skqp_nima.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Nima-Cpp is not available anymore inside googlesource, revert to github one
-Simulates `git revert 49233d2521054037ded7d760427c4a0dc1e11356`
-
-diff --git a/DEPS b/DEPS
-index 7e0b941..c88b064 100644
---- a/DEPS
-+++ b/DEPS
-@@ -33,8 +33,8 @@ deps = {
-   #"third_party/externals/v8"              : "https://chromium.googlesource.com/v8/v8.git@5f1ae66d5634e43563b2d25ea652dfb94c31a3b4",
-   "third_party/externals/wuffs"           : "https://skia.googlesource.com/external/github.com/google/wuffs.git@fda3c4c9863d9f9fcec58ae66508c4621fc71ea5",
-   "third_party/externals/zlib"            : "https://chromium.googlesource.com/chromium/src/third_party/zlib@47af7c547f8551bd25424e56354a2ae1e9062859",
--  "third_party/externals/Nima-Cpp"        : "https://skia.googlesource.com/external/github.com/2d-inc/Nima-Cpp.git@4bd02269d7d1d2e650950411325eafa15defb084",
--  "third_party/externals/Nima-Math-Cpp"   : "https://skia.googlesource.com/external/github.com/2d-inc/Nima-Math-Cpp.git@e0c12772093fa8860f55358274515b86885f0108",
-+  "third_party/externals/Nima-Cpp"        : "https://github.com/2d-inc/Nima-Cpp.git@4bd02269d7d1d2e650950411325eafa15defb084",
-+  "third_party/externals/Nima-Math-Cpp"   : "https://github.com/2d-inc/Nima-Math-Cpp.git@e0c12772093fa8860f55358274515b86885f0108",
- 
-   "../src": {
-     "url": "https://chromium.googlesource.com/chromium/src.git@ccf3465732e5d5363f0e44a8fac54550f62dd1d0",
diff --git a/.gitlab-ci/container/patches/weston-no-xwm.patch b/.gitlab-ci/container/patches/weston-no-xwm.patch
deleted file mode 100644
index a12057a..0000000
--- a/.gitlab-ci/container/patches/weston-no-xwm.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-diff --git a/libweston/meson.build b/libweston/meson.build
-index d1f126f232a489daa7f96135e353c88129135436..cf7ae7ea05c1479773c31b6786d3cd2a5ffbae02 100644
---- a/libweston/meson.build
-+++ b/libweston/meson.build
-@@ -101,6 +101,10 @@ if get_option('backend-vnc')
- 	deps_libweston += dep_pam
- endif
- 
-+if get_option('no-xwm-decorations')
-+	config_h.set('HAVE_NO_XWM_DECORATIONS', '1')
-+endif
-+
- lib_weston = shared_library(
- 	'weston-@0@'.format(libweston_major),
- 	srcs_libweston,
-diff --git a/meson_options.txt b/meson_options.txt
-index 0fbd42a9ff40669391b355ce68e13b84a28e7e4b..f5d8e64cdd9c9a86faf7ae37a9701efb52e553c3 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -214,3 +214,9 @@ option(
- 	value: false,
- 	description: 'Generate documentation'
- )
-+option(
-+	'no-xwm-decorations',
-+	type : 'boolean',
-+	value : false,
-+	description : 'Disable xwayland window manager decorations so cairo_xcb is unused.'
-+)
-diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c
-index d403675227432ceab81cf09ba2191d21570b8ebc..2d196da272ac153c83bdcd0c7e132712d83662c3 100644
---- a/xwayland/window-manager.c
-+++ b/xwayland/window-manager.c
-@@ -665,6 +665,12 @@ weston_wm_window_get_frame_size(struct weston_wm_window *window,
- {
- 	struct theme *t = window->wm->theme;
- 
-+#ifdef HAVE_NO_XWM_DECORATIONS
-+	*width = window->width;
-+	*height = window->height;
-+	return;
-+#endif
-+
- 	if (window->fullscreen) {
- 		*width = window->width;
- 		*height = window->height;
-@@ -683,6 +689,12 @@ weston_wm_window_get_child_position(struct weston_wm_window *window,
- {
- 	struct theme *t = window->wm->theme;
- 
-+#ifdef HAVE_NO_XWM_DECORATIONS
-+	*x = 0;
-+	*y = 0;
-+	return;
-+#endif
-+
- 	if (window->fullscreen) {
- 		*x = 0;
- 		*y = 0;
-@@ -1096,6 +1108,9 @@ weston_wm_window_set_net_frame_extents(struct weston_wm_window *window)
- 	uint32_t property[4];
- 	int top = 0, bottom = 0, left = 0, right = 0;
- 
-+	if (!window->frame)
-+		return;
-+
- 	if (!window->fullscreen)
- 		frame_decoration_sizes(window->frame, &top, &bottom, &left, &right);
- 
-@@ -1159,14 +1174,17 @@ weston_wm_window_create_frame(struct weston_wm_window *window)
- 	if (window->decorate & MWM_DECOR_MINIMIZE)
- 		buttons |= FRAME_BUTTON_MINIMIZE;
- 
-+	window->frame = NULL;
-+#ifndef HAVE_NO_XWM_DECORATIONS
- 	window->frame = frame_create(window->wm->theme,
- 				     window->width, window->height,
- 				     buttons, window->name, NULL);
- 
- 	if (!window->frame)
- 		return;
--
--	frame_resize_inside(window->frame, window->width, window->height);
-+#endif
-+	if (window->frame)
-+		frame_resize_inside(window->frame, window->width, window->height);
- 
- 	weston_wm_window_get_frame_size(window, &width, &height);
- 	weston_wm_window_get_child_position(window, &x, &y);
-@@ -1204,13 +1222,15 @@ weston_wm_window_create_frame(struct weston_wm_window *window)
- 	weston_wm_configure_window(wm, window->id,
- 				   XCB_CONFIG_WINDOW_BORDER_WIDTH, values);
- 
-+	window->cairo_surface = NULL;
-+#ifndef HAVE_NO_XWM_DECORATIONS
- 	window->cairo_surface =
- 		cairo_xcb_surface_create_with_xrender_format(wm->conn,
- 							     wm->screen,
- 							     window->frame_id,
- 							     &wm->format_rgba,
- 							     width, height);
--
-+#endif
- 	hash_table_insert(wm->window_hash, window->frame_id, window);
- 	weston_wm_window_send_configure_notify(window);
- }
-@@ -1369,6 +1389,9 @@ weston_wm_window_draw_decoration(struct weston_wm_window *window)
- 	int width, height;
- 	const char *how;
- 
-+#ifdef HAVE_NO_XWM_DECORATIONS
-+	return;
-+#endif
- 	weston_wm_window_get_frame_size(window, &width, &height);
- 
- 	cairo_xcb_surface_set_size(window->cairo_surface, width, height);
-@@ -1426,7 +1449,7 @@ weston_wm_window_set_pending_state(struct weston_wm_window *window)
- 					  window->height + 2);
- 	}
- 
--	if (window->decorate && !window->fullscreen) {
-+	if (window->decorate && !window->fullscreen && window->frame) {
- 		frame_input_rect(window->frame, &input_x, &input_y,
- 				 &input_w, &input_h);
- 	} else {
-@@ -2282,7 +2305,7 @@ weston_wm_handle_button(struct weston_wm *wm, xcb_generic_event_t *event)
- 		  "PRESS" : "RELEASE", button->detail);
- 
- 	if (!wm_lookup_window(wm, button->event, &window) ||
--	    !window->decorate)
-+	    !window->decorate || !window->frame)
- 		return;
- 
- 	if (button->detail != 1 && button->detail != 2)
-@@ -2380,7 +2403,7 @@ weston_wm_handle_motion(struct weston_wm *wm, xcb_generic_event_t *event)
- 	int cursor;
- 
- 	if (!wm_lookup_window(wm, motion->event, &window) ||
--	    !window->decorate)
-+	    !window->decorate || !window->frame)
- 		return;
- 
- 	location = frame_pointer_motion(window->frame, NULL,
-@@ -2401,7 +2424,7 @@ weston_wm_handle_enter(struct weston_wm *wm, xcb_generic_event_t *event)
- 	int cursor;
- 
- 	if (!wm_lookup_window(wm, enter->event, &window) ||
--	    !window->decorate)
-+	    !window->decorate || !window->frame)
- 		return;
- 
- 	location = frame_pointer_enter(window->frame, NULL,
-@@ -2420,7 +2443,7 @@ weston_wm_handle_leave(struct weston_wm *wm, xcb_generic_event_t *event)
- 	struct weston_wm_window *window;
- 
- 	if (!wm_lookup_window(wm, leave->event, &window) ||
--	    !window->decorate)
-+	    !window->decorate || !window->frame)
- 		return;
- 
- 	frame_pointer_leave(window->frame, NULL);
diff --git a/.gitlab-ci/container/setup-rootfs.sh b/.gitlab-ci/container/setup-rootfs.sh
deleted file mode 100755
index 0ba816b..0000000
--- a/.gitlab-ci/container/setup-rootfs.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC1091 # The relative paths in this file only become valid at runtime.
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_GL_TAG
-# DEBIAN_TEST_VIDEO_TAG
-# DEBIAN_TEST_VK_TAG
-
-set -eux -o pipefail
-
-passwd root -d
-chsh -s /bin/sh
-
-cat > /init <<EOF
-#!/bin/sh
-export PS1=lava-shell:
-exec sh
-EOF
-chmod +x  /init
-
-# Copy timezone file and remove tzdata package
-rm -rf /etc/localtime
-cp /usr/share/zoneinfo/Etc/UTC /etc/localtime
diff --git a/.gitlab-ci/container/setup-wine.sh b/.gitlab-ci/container/setup-wine.sh
deleted file mode 100755
index 4eb3f3a..0000000
--- a/.gitlab-ci/container/setup-wine.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-set -u
-
-section_start wine "Setting up Wine"
-
-export WINEPREFIX="$1"
-export WINEDEBUG="-all"
-
-# We don't want crash dialogs
-cat >crashdialog.reg <<EOF
-Windows Registry Editor Version 5.00
-
-[HKEY_CURRENT_USER\Software\Wine\WineDbg]
-"ShowCrashDialog"=dword:00000000
-
-EOF
-
-# Set the wine prefix and disable the crash dialog
-wine regedit crashdialog.reg
-rm crashdialog.reg
-
-# An immediate wine command may fail with: "${WINEPREFIX}: Not a
-# valid wine prefix."  and that is just spit because of checking
-# the existance of the system.reg file, which fails.  Just giving
-# it a bit more of time for it to be created solves the problem
-# ...
-while ! test -f  "${WINEPREFIX}/system.reg"; do sleep 1; done
-
-section_end wine
diff --git a/.gitlab-ci/container/strip-rootfs.sh b/.gitlab-ci/container/strip-rootfs.sh
deleted file mode 100644
index 70df62b..0000000
--- a/.gitlab-ci/container/strip-rootfs.sh
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/usr/bin/env bash
-# Strip the image to a small minimal system.
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_ANDROID_TAG
-# DEBIAN_TEST_GL_TAG
-# DEBIAN_TEST_VIDEO_TAG
-# DEBIAN_TEST_VK_TAG
-set -ex
-
-section_start strip-rootfs "Stripping rootfs"
-
-export DEBIAN_FRONTEND=noninteractive
-
-UNNEEDED_PACKAGES=(
-  libfdisk1 git
-  python3-dev python3-pip python3-setuptools python3-wheel
-)
-
-# Removing unused packages
-for PACKAGE in "${UNNEEDED_PACKAGES[@]}"
-do
-	if ! apt-get remove --purge --yes "${PACKAGE}"
-	then
-		echo "WARNING: ${PACKAGE} isn't installed"
-	fi
-done
-
-apt-get autoremove --yes || true
-
-UNNEEDED_PACKAGES=(
-  apt libapt-pkg6.0
-  ncurses-bin ncurses-base libncursesw6 libncurses6
-  perl-base libperl5.36 perl-modules-5.36
-  debconf libdebconfclient0
-  e2fsprogs e2fslibs libfdisk1
-  insserv
-  udev
-  init-system-helpers
-  cpio
-  libsemanage1 libsemanage-common
-  libsepol1
-  gpgv
-  hostname
-  adduser
-  debian-archive-keyring
-  libgl1-mesa-dri mesa-vulkan-drivers mesa-va-drivers mesa-vdpau-drivers i965-va-driver
-  intel-media-va-driver
-  gnupg2
-  qemu-user
-)
-
-# Removing unneeded packages
-for PACKAGE in "${UNNEEDED_PACKAGES[@]}"
-do
-	if ! dpkg --purge --force-remove-essential --force-depends "${PACKAGE}"
-	then
-		echo "WARNING: ${PACKAGE} isn't installed"
-	fi
-done
-
-# Show what's left package-wise before dropping dpkg itself
-COLUMNS=300 dpkg-query -W --showformat='${Installed-Size;10}\t${Package}\n' | sort -k1,1n
-
-# Drop dpkg
-dpkg --purge --force-remove-essential --force-depends dpkg
-
-# directories for a removal
-
-directories=(
-  /var/log/* # logs
-  /usr/share/doc/* # docs, i18n, etc.
-  /usr/share/locale/*
-  /usr/share/X11/locale/*
-  /usr/share/man
-  /usr/share/i18n/*
-  /usr/share/info/*
-  /usr/share/lintian/*
-  /usr/share/common-licenses/*
-  /usr/share/mime/*
-  /usr/share/bug
-  /lib/udev/hwdb.bin # udev hwdb not required on a stripped system
-  /lib/udev/hwdb.d/*
-  /usr/bin/iconv # gconv conversions && binaries
-  /usr/sbin/iconvconfig
-  /usr/lib/*/gconv/
-  /usr/sbin/update-usbids # libusb db
-  /usr/share/misc/usb.ids
-  /var/lib/usbutils/usb.ids
-  /root/.pip # pip cache
-  /root/.cache
-  /root/.cargo
-  /etc/apt # configuration archives of apt and dpkg
-  /etc/dpkg
-  /var/* # drop non-ostree directories
-  /srv
-  /share
-  /usr/share/ca-certificates # certificates are in /etc
-  /usr/share/bash-completion # completions
-  /usr/share/zsh/vendor-completions
-  /usr/share/gcc # gcc python helpers
-  /etc/inid.d # sysvinit leftovers
-  /etc/rc[0-6S].d
-  /etc/init
-  /usr/lib/lsb
-  /usr/lib/xtables # xtrables helpers
-  /usr/lib/locale/* # should we keep C locale?
-  /usr/sbin/*fdisk # partitioning
-  /usr/bin/localedef # local compiler
-  /usr/sbin/ldconfig* # only needed when adding libs
-  /usr/games
-  /usr/lib/*/security/pam_userdb.so # Remove pam module to authenticate against a DB
-  /usr/lib/*/libdb-5.3.so # libdb-5.3.so that is only used by this pam module ^
-  /usr/lib/*/libnss_hesiod* # remove NSS support for nis, nisplus and hesiod
-  /usr/lib/*/libnss_nis*
-  /usr/lib/*/wine # don't need Wine's implementation, using Proton instead
-  /usr/local/bin/mold
-  /usr/local/bin/bindgen
-  /usr/local/bin/cargo*
-  /usr/local/bin/clippy*
-  /usr/local/bin/rust*
-  /usr/local/bin/rls
-  /usr/lib/*/dri
-)
-
-for directory in "${directories[@]}"; do
-  rm -rf "$directory" || echo "Failed to remove $directory! Update scripts!"
-done
-
-files=(
-  '*systemd-resolve*' # systemd dns resolver
-  '*networkd*' # systemd network configuration
-  '*timesyncd*' # systemd ntp
-  'systemd-hwdb*' # systemd hw database
-  '*fuse*' # FUSE
-)
-
-for files in "${files[@]}"; do
-  find /usr /etc -name "$files" -prune -exec rm -r {} \;
-done
-
-# We purge apt and dpkg to save on space, which is great for runtime and
-# bandwidth use etc, but less great for cbuild which wants to run apt-get clean
-# when we're done. Install a stub which works for that and is apologetic for
-# anyone else.
-cat >/usr/bin/apt-get <<EOF
-#!/bin/bash
-
-if [ "\${1:-}" != "clean" ]; then
-    echo "Couldn't run '\$0 \$*', because apt has been cleaned from this container."
-    echo ""
-    echo "After .gitlab-ci/container/strip-rootfs.sh has run, you cannot install"
-    echo "new packages."
-    echo ""
-    echo "Sorry."
-    exit 1
-fi
-EOF
-
-chmod +x /usr/bin/apt-get
-ln -s /usr/bin/apt-get /usr/bin/apt
-
-section_end strip-rootfs
diff --git a/.gitlab-ci/container/windows/gitlab-ci.yml b/.gitlab-ci/container/windows/gitlab-ci.yml
deleted file mode 100644
index 4ee6e62..0000000
--- a/.gitlab-ci/container/windows/gitlab-ci.yml
+++ /dev/null
@@ -1,110 +0,0 @@
-# Native Windows docker builds
-#
-# Unlike the above Linux-based builds - including MinGW builds which
-# cross-compile for Windows - which use the freedesktop ci-templates, we
-# cannot use the same scheme here. As Windows lacks support for
-# Docker-in-Docker, and Podman does not run natively on Windows, we have
-# to open-code much of the same ourselves.
-#
-# This is achieved by first running in a native Windows shell instance
-# (host PowerShell) in the container stage to build and push the image,
-# then in the build stage by executing inside Docker.
-
-.windows-docker-msvc:
-  variables:
-    MESA_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}"
-    MESA_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MESA_IMAGE_PATH:${MESA_IMAGE_TAG}"
-  extends:
-    - .windows-docker-tags
-
-.windows_container_build:
-  inherit:
-    default: [retry]
-  extends:
-    - .container
-    - .windows-docker-msvc
-    - .windows-shell-tags
-  rules:
-    - !reference [.common-rules, rules]
-    - !reference [.microsoft-farm-container-rules, rules]
-    - !reference [.container-rules, rules]
-  variables:
-    GIT_STRATEGY: fetch  # we do actually need the full repository though
-    MESA_BASE_IMAGE: None
-  before_script: null  # remove .container before_script as it's unix-only
-  script:
-    - .\.gitlab-ci\windows\mesa_container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $MESA_IMAGE $MESA_UPSTREAM_IMAGE ${DOCKERFILE} ${MESA_BASE_IMAGE}
-
-windows_msvc:
-  inherit:
-    default: [retry]
-  extends:
-    - .windows_container_build
-  variables:
-    MESA_IMAGE_PATH: &windows_msvc_image_path "windows/x86_64_msvc"
-    MESA_IMAGE_TAG: ${WINDOWS_X64_MSVC_TAG}
-    DOCKERFILE: Dockerfile_msvc
-    MESA_BASE_IMAGE: "mcr.microsoft.com/windows/server:ltsc2022"
-
-windows_build_msvc:
-  inherit:
-    default: [retry]
-  extends:
-    - .windows_container_build
-  rules:
-    - !reference [.common-rules, rules]
-    - !reference [.microsoft-farm-rules, rules]
-    - !reference [.container-rules, rules]
-  variables:
-    MESA_IMAGE_PATH: &windows_build_image_path "windows/x86_64_build"
-    MESA_IMAGE_TAG: &windows_build_image_tag ${WINDOWS_X64_MSVC_TAG}--${WINDOWS_X64_BUILD_TAG}
-    DOCKERFILE: Dockerfile_build
-    MESA_BASE_IMAGE_PATH: *windows_msvc_image_path
-    MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_BASE_IMAGE_PATH}:${WINDOWS_X64_MSVC_TAG}"
-  timeout: 2h 30m  # LLVM takes ages
-  needs:
-    - job: windows_msvc
-      optional: true
-
-windows_test_msvc:
-  inherit:
-    default: [retry]
-  extends:
-    - .windows_container_build
-  rules:
-    - !reference [.common-rules, rules]
-    - !reference [.microsoft-farm-rules, rules]
-    - !reference [.container-rules, rules]
-  variables:
-    MESA_IMAGE_PATH: &windows_test_image_path "windows/x86_64_test"
-    MESA_IMAGE_TAG: &windows_test_image_tag ${WINDOWS_X64_MSVC_TAG}--${WINDOWS_X64_TEST_TAG}
-    DOCKERFILE: Dockerfile_test
-    MESA_BASE_IMAGE_PATH: *windows_msvc_image_path
-    MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_BASE_IMAGE_PATH}:${WINDOWS_X64_MSVC_TAG}"
-  timeout: 2h 30m
-  needs:
-    - job: windows_msvc
-      optional: true
-
-.use-windows_build_msvc:
-  inherit:
-    default: [retry]
-  extends: .windows-docker-msvc
-  image: "$MESA_IMAGE"
-  variables:
-    MESA_IMAGE_PATH: *windows_build_image_path
-    MESA_IMAGE_TAG: *windows_build_image_tag
-  needs:
-    - job: sanity
-      optional: true
-    - job: windows_build_msvc
-      optional: true
-
-.use-windows_test_msvc:
-  inherit:
-    default: [retry]
-  extends: .windows-docker-msvc
-  image: "$MESA_IMAGE"
-  variables:
-    MESA_IMAGE_PATH: *windows_test_image_path
-    MESA_IMAGE_TAG: *windows_test_image_tag
diff --git a/.gitlab-ci/create-llvm-meson-wrap-file.sh b/.gitlab-ci/create-llvm-meson-wrap-file.sh
deleted file mode 100755
index f586875..0000000
--- a/.gitlab-ci/create-llvm-meson-wrap-file.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-
-set -exu
-
-# Early check for required env variables, relies on `set -u`
-: "$ANDROID_LLVM_ARTIFACT_NAME"
-
-# if DEST_DIR is not set, assing an empty value, this prevents -u to fail
-: "${DEST_DIR:=}"
-
-# TODO, check if meson can do the download and wrap file generation for us.
-
-LLVM_INSTALL_PREFIX="${DEST_DIR}/${ANDROID_LLVM_ARTIFACT_NAME}"
-
-if [ ! -d "$LLVM_INSTALL_PREFIX" ]; then
-  echo "Cannot find an LLVM build in $LLVM_INSTALL_PREFIX" 1>&2
-  exit 1
-fi
-
-mkdir -p subprojects/llvm
-
-cat << EOF > subprojects/llvm/meson.build
-project('llvm', ['cpp'])
-
-cpp = meson.get_compiler('cpp')
-
-_deps = []
-_search = join_paths('$LLVM_INSTALL_PREFIX', 'lib')
-
-foreach d: ['libLLVMAggressiveInstCombine', 'libLLVMAnalysis', 'libLLVMAsmParser', 'libLLVMAsmPrinter', 'libLLVMBinaryFormat', 'libLLVMBitReader', 'libLLVMBitstreamReader', 'libLLVMBitWriter', 'libLLVMCFGuard', 'libLLVMCFIVerify', 'libLLVMCodeGen', 'libLLVMCodeGenTypes', 'libLLVMCore', 'libLLVMCoroutines', 'libLLVMCoverage', 'libLLVMDebugInfoBTF', 'libLLVMDebugInfoCodeView', 'libLLVMDebuginfod', 'libLLVMDebugInfoDWARF', 'libLLVMDebugInfoGSYM', 'libLLVMDebugInfoLogicalView', 'libLLVMDebugInfoMSF', 'libLLVMDebugInfoPDB', 'libLLVMDemangle', 'libLLVMDiff', 'libLLVMDlltoolDriver', 'libLLVMDWARFLinker', 'libLLVMDWARFLinkerClassic', 'libLLVMDWARFLinkerParallel', 'libLLVMDWP', 'libLLVMExecutionEngine', 'libLLVMExegesis', 'libLLVMExegesisX86', 'libLLVMExtensions', 'libLLVMFileCheck', 'libLLVMFrontendDriver', 'libLLVMFrontendHLSL', 'libLLVMFrontendOffloading', 'libLLVMFrontendOpenACC', 'libLLVMFrontendOpenMP', 'libLLVMFuzzerCLI', 'libLLVMFuzzMutate', 'libLLVMGlobalISel', 'libLLVMHipStdPar', 'libLLVMInstCombine', 'libLLVMInstrumentation', 'libLLVMInterfaceStub', 'libLLVMInterpreter', 'libLLVMipo', 'libLLVMIRPrinter', 'libLLVMIRReader', 'libLLVMJITLink', 'libLLVMLibDriver', 'libLLVMLineEditor', 'libLLVMLinker', 'libLLVMLTO', 'libLLVMMC', 'libLLVMMCA', 'libLLVMMCDisassembler', 'libLLVMMCJIT', 'libLLVMMCParser', 'libLLVMMIRParser', 'libLLVMObjCARCOpts', 'libLLVMObjCopy', 'libLLVMObject', 'libLLVMObjectYAML', 'libLLVMOption', 'libLLVMOrcDebugging', 'libLLVMOrcJIT', 'libLLVMOrcShared', 'libLLVMOrcTargetProcess', 'libLLVMPasses', 'libLLVMProfileData', 'libLLVMRemarks', 'libLLVMRuntimeDyld', 'libLLVMScalarOpts', 'libLLVMSelectionDAG', 'libLLVMSupport', 'libLLVMSymbolize', 'libLLVMTableGen', 'libLLVMTableGenCommon', 'libLLVMTarget', 'libLLVMTargetParser', 'libLLVMTextAPI', 'libLLVMTextAPIBinaryReader', 'libLLVMTransformUtils', 'libLLVMVectorize', 'libLLVMWindowsDriver', 'libLLVMWindowsManifest', 'libLLVMX86AsmParser', 'libLLVMX86CodeGen', 'libLLVMX86Desc', 'libLLVMX86Disassembler', 'libLLVMX86Info', 'libLLVMX86TargetMCA', 'libLLVMXRay']
-  _deps += cpp.find_library(d, dirs : _search)
-endforeach
-
-dep_llvm = declare_dependency(
-  include_directories : include_directories('$LLVM_INSTALL_PREFIX/include'),
-  dependencies : _deps,
-  version : '$(sed -n -e 's/^#define LLVM_VERSION_STRING "\([^"]*\)".*/\1/p' "${LLVM_INSTALL_PREFIX}/include/llvm/Config/llvm-config.h" )',
-)
-
-has_rtti = false
-irbuilder_h = files('$LLVM_INSTALL_PREFIX/include/llvm/IR/IRBuilder.h')
-EOF
diff --git a/.gitlab-ci/cross-xfail-ppc64el b/.gitlab-ci/cross-xfail-ppc64el
deleted file mode 100644
index e077aa1..0000000
--- a/.gitlab-ci/cross-xfail-ppc64el
+++ /dev/null
@@ -1 +0,0 @@
-lp_test_arit
diff --git a/.gitlab-ci/cross-xfail-s390x b/.gitlab-ci/cross-xfail-s390x
deleted file mode 100644
index 3c3c8ac..0000000
--- a/.gitlab-ci/cross-xfail-s390x
+++ /dev/null
@@ -1 +0,0 @@
-lp_test_format
diff --git a/.gitlab-ci/crosvm-init.sh b/.gitlab-ci/crosvm-init.sh
deleted file mode 100755
index c4446bf..0000000
--- a/.gitlab-ci/crosvm-init.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC1091 # The relative paths in this file only become valid at runtime.
-# shellcheck disable=SC2086 # we want word splitting
-set -e
-
-VSOCK_STDOUT=$1
-VSOCK_STDERR=$2
-VM_TEMP_DIR=$3
-
-mount -t proc none /proc
-mount -t sysfs none /sys
-mkdir -p /dev/pts
-mount -t devpts devpts /dev/pts
-mkdir /dev/shm
-mount -t tmpfs -o noexec,nodev,nosuid tmpfs /dev/shm
-mount -t tmpfs tmpfs /tmp
-
-. ${VM_TEMP_DIR}/crosvm-env.sh
-. ${VM_TEMP_DIR}/setup-test-env.sh
-
-# .gitlab-ci.yml script variable is using relative paths to install directory,
-# so change to that dir before running `crosvm-script`
-cd "${CI_PROJECT_DIR}"
-
-# The exception is the dEQP binary, as it needs to run from its own directory
-[ -z "${DEQP_BIN_DIR}" ] || cd "${DEQP_BIN_DIR}"
-
-# Use a FIFO to collect relevant error messages
-STDERR_FIFO=/tmp/crosvm-stderr.fifo
-mkfifo -m 600 ${STDERR_FIFO}
-
-dmesg --level crit,err,warn -w > ${STDERR_FIFO} &
-DMESG_PID=$!
-
-# Transfer the errors and crosvm-script output via a pair of virtio-vsocks
-socat -d -u pipe:${STDERR_FIFO} vsock-listen:${VSOCK_STDERR} &
-socat -d -U vsock-listen:${VSOCK_STDOUT} \
-    system:"stdbuf -eL bash ${VM_TEMP_DIR}/crosvm-script.sh 2> ${STDERR_FIFO}; echo \$? > ${VM_TEMP_DIR}/exit_code",nofork
-
-kill ${DMESG_PID}
-wait
-
-sync
-poweroff -d -n -f || true
-
-sleep 1   # Just in case init would exit before the kernel shuts down the VM
diff --git a/.gitlab-ci/crosvm-runner.sh b/.gitlab-ci/crosvm-runner.sh
deleted file mode 100755
index 0b3b514..0000000
--- a/.gitlab-ci/crosvm-runner.sh
+++ /dev/null
@@ -1,169 +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"
-
-set -ue
-
-if [ -z "$CROSVM_TAG" ]; then
-    echo "CROSVM_TAG must be set to the conditional build tag"
-    exit 1
-fi
-
-# Are we using the right crosvm version?
-ci_tag_test_time_check "CROSVM_TAG"
-
-# Instead of starting one dEQP instance per available CPU core, pour our
-# concurrency at llvmpipe threads instead. This is mostly useful for VirGL and
-# Venus, which serialise quite a bit at the host level. So instead of smashing
-# it with a pile of concurrent jobs which don't actually parallelise very well,
-# we use that concurrency for llvmpipe/lavapipe's render pipeline.
-if [ -n "${PARALLELISE_VIA_LP_THREADS:-}" ]; then
-    export LP_NUM_THREADS="${FDO_CI_CONCURRENT:-4}"
-    export FDO_CI_CONCURRENT=1
-fi
-
-# If run outside of a deqp-runner invoction (e.g. piglit trace replay), then act
-# the same as the first thread in its threadpool.
-THREAD=${DEQP_RUNNER_THREAD:-0}
-
-#
-# Helper to generate CIDs for virtio-vsock based communication with processes
-# running inside crosvm guests.
-#
-# A CID is a 32-bit Context Identifier to be assigned to a crosvm instance
-# and must be unique across the host system. For this purpose, let's take
-# the least significant 25 bits from CI_JOB_ID as a base and generate a 7-bit
-# prefix number to handle up to 128 concurrent crosvm instances per job runner.
-#
-# As a result, the following variables are set:
-#  - VSOCK_CID: the crosvm unique CID to be passed as a run argument
-#
-#  - VSOCK_STDOUT, VSOCK_STDERR: the port numbers the guest should accept
-#    vsock connections on in order to transfer output messages
-#
-#  - VM_TEMP_DIR: the temporary directory path used to pass additional
-#    context data towards the guest
-#
-set_vsock_context() {
-    [ -n "${CI_JOB_ID:-}" ] || {
-        echo "Missing or unset CI_JOB_ID env variable" >&2
-        exit 1
-    }
-
-    VM_TEMP_DIR="/tmp-vm.${THREAD}"
-    # Clear out any leftover files from a previous run.
-    rm -rf $VM_TEMP_DIR
-    mkdir $VM_TEMP_DIR || return 1
-
-    VSOCK_CID=$(((CI_JOB_ID & 0x1ffffff) | ((THREAD & 0x7f) << 25)))
-    VSOCK_STDOUT=5001
-    VSOCK_STDERR=5002
-
-    return 0
-}
-
-# The dEQP binary needs to run from the directory it's in
-if [ -n "${1##*.sh}" ] && [ -z "${1##*"deqp"*}" ]; then
-    DEQP_BIN_DIR=$(dirname "$1")
-    export DEQP_BIN_DIR
-fi
-
-VM_SOCKET=crosvm-${THREAD}.sock
-
-# Terminate any existing crosvm, if a previous invocation of this shell script
-# was terminated due to timeouts.  This "vm stop" may fail if the crosvm died
-# without cleaning itself up.
-if [ -e $VM_SOCKET ]; then
-   crosvm stop $VM_SOCKET || true
-   # Wait for socats from that invocation to drain
-   sleep 5
-   rm -rf $VM_SOCKET || true
-fi
-
-set_vsock_context || { echo "Could not generate crosvm vsock CID" >&2; exit 1; }
-
-# Securely pass the current variables to the crosvm environment
-section_start variables "Environment variables passed through to VM:"
-SCRIPTS_DIR=$(readlink -en "${0%/*}")
-filter_env_vars | tee ${VM_TEMP_DIR}/crosvm-env.sh
-cp ${SCRIPTS_DIR}/setup-test-env.sh ${VM_TEMP_DIR}/setup-test-env.sh
-section_end variables
-
-# Set the crosvm-script as the arguments of the current script
-{
-  echo "export SCRIPTS_DIR=${SCRIPTS_DIR}"
-  echo "export RESULTS_DIR=${RESULTS_DIR}"
-  echo ". ${VM_TEMP_DIR}/setup-test-env.sh"
-  echo "$@"
-} > ${VM_TEMP_DIR}/crosvm-script.sh
-
-# Setup networking
-/usr/sbin/iptables-legacy -w -t nat -A POSTROUTING -o eth0 -j MASQUERADE
-echo 1 > /proc/sys/net/ipv4/ip_forward
-
-# Start background processes to receive output from guest
-socat -u vsock-connect:${VSOCK_CID}:${VSOCK_STDERR},retry=200,interval=0.1 stderr &
-socat -u vsock-connect:${VSOCK_CID}:${VSOCK_STDOUT},retry=200,interval=0.1 stdout &
-
-# Prepare to start crosvm
-unset DISPLAY
-unset XDG_RUNTIME_DIR
-
-CROSVM_KERN_ARGS="quiet console=null root=my_root rw rootfstype=virtiofs ip=192.168.30.2::192.168.30.1:255.255.255.0:crosvm:eth0"
-CROSVM_KERN_ARGS="${CROSVM_KERN_ARGS} init=${SCRIPTS_DIR}/crosvm-init.sh -- ${VSOCK_STDOUT} ${VSOCK_STDERR} ${VM_TEMP_DIR}"
-
-[ "${CROSVM_GALLIUM_DRIVER:-}" = "llvmpipe" ] && \
-    CROSVM_LIBGL_ALWAYS_SOFTWARE=true || CROSVM_LIBGL_ALWAYS_SOFTWARE=false
-
-set +e
-
-if [ "${INSIDE_DEQP_RUNNER:-}" != "true" ]
-then
-  set -x
-fi
-
-section_start kernel "Downloading kernel image"
-if [ ! -f "/kernel/${KERNEL_IMAGE_NAME:-bzImage}" ]; then
-  mkdir -p /kernel
-  # shellcheck disable=SC2153
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 30 \
-    -o "/kernel/${KERNEL_IMAGE_NAME:-bzImage}" "${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH:-amd64}/${KERNEL_IMAGE_NAME:-bzImage}"
-fi
-section_end kernel
-
-# We aren't testing the host driver here, so we don't need to validate NIR on the host
-NIR_DEBUG="novalidate" \
-LIBGL_ALWAYS_SOFTWARE=${CROSVM_LIBGL_ALWAYS_SOFTWARE:-} \
-GALLIUM_DRIVER=${CROSVM_GALLIUM_DRIVER:-} \
-VK_DRIVER_FILES=$CI_PROJECT_DIR/install/share/vulkan/icd.d/${CROSVM_VK_DRIVER:-}_icd.x86_64.json \
-crosvm --no-syslog run \
-    --gpu "${CROSVM_GPU_ARGS:-}" --gpu-render-server "path=${VIRGL_RENDER_SERVER:-/usr/local/libexec/virgl_render_server}" \
-    -m "${CROSVM_MEMORY:-4096}" -c "${CROSVM_CPU:-2}" --disable-sandbox \
-    --shared-dir /:my_root:type=fs:writeback=true:timeout=60:cache=always \
-    --net "host-ip=192.168.30.1,netmask=255.255.255.0,mac=AA:BB:CC:00:00:12" \
-    -s $VM_SOCKET \
-    --cid ${VSOCK_CID} -p "${CROSVM_KERN_ARGS}" \
-    /kernel/${KERNEL_IMAGE_NAME:-bzImage} > ${VM_TEMP_DIR}/crosvm 2>&1
-
-section_start crosvm_results "Processing crosvm results"
-CROSVM_RET=$?
-
-[ ${CROSVM_RET} -eq 0 ] && {
-    # The actual return code is the crosvm guest script's exit code
-    CROSVM_RET=$(cat ${VM_TEMP_DIR}/exit_code 2>/dev/null)
-    # Force error when the guest script's exit code is not available
-    CROSVM_RET=${CROSVM_RET:-1}
-}
-
-# Show crosvm output on error to help with debugging
-[ ${CROSVM_RET} -eq 0 ] || {
-    { set +x; } 2>/dev/null
-    echo "Dumping crosvm output.." >&2
-    cat ${VM_TEMP_DIR}/crosvm >&2
-    set -x
-}
-section_end crosvm_results
-
-exit ${CROSVM_RET}
diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh
deleted file mode 100755
index 5bcf18c..0000000
--- a/.gitlab-ci/cuttlefish-runner.sh
+++ /dev/null
@@ -1,93 +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"
-
-set -uex
-
-section_start cuttlefish_setup "cuttlefish: setup"
-
-# Structured tagging check for angle
-if [ -n "${ANGLE_TAG:-}" ]; then
-    # Bail out if the ANGLE_TAG differs from what is offered in the system
-    ci_tag_test_time_check "ANGLE_TAG"
-fi
-
-export PATH=/cuttlefish/bin:$PATH
-export LD_LIBRARY_PATH=/cuttlefish/lib64:${CI_PROJECT_DIR}/install/lib:${LD_LIBRARY_PATH:-}
-
-# Pick up a vulkan driver
-ARCH=$(uname -m)
-export VK_DRIVER_FILES=${CI_PROJECT_DIR}/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json
-
-syslogd
-
-chown root:kvm /dev/kvm
-
-pushd /cuttlefish
-
-# Add a function to perform some tasks when exiting the script
-function my_atexit()
-{
-  section_switch cuttlefish_stop "cuttlefish: stop + storing logs"
-  set -x
-  set +e  # Be resilient and get logs even if stop_cvd fails
-
-  # shellcheck disable=SC2317
-  HOME=/cuttlefish stop_cvd -wait_for_launcher=40
-
-  # shellcheck disable=SC2317
-  cp /cuttlefish/cuttlefish/instances/cvd-1/logs/logcat $RESULTS_DIR
-  # shellcheck disable=SC2317
-  cp /cuttlefish/cuttlefish/instances/cvd-1/kernel.log $RESULTS_DIR
-  # shellcheck disable=SC2317
-  cp /cuttlefish/cuttlefish/instances/cvd-1/logs/launcher.log $RESULTS_DIR
-
-  set -e
-  set +x
-  section_end cuttlefish_stop
-}
-
-# stop cuttlefish if the script ends prematurely or is interrupted
-trap 'my_atexit' EXIT
-trap 'exit 2' HUP INT PIPE TERM
-
-ulimit -n 32768
-
-VSOCK_BASE=10000 # greater than all the default vsock ports
-VSOCK_CID=$((VSOCK_BASE + (CI_JOB_ID & 0xfff)))
-
-HOME=/cuttlefish timeout 5m launch_cvd \
-  -daemon \
-  -verbosity=INFO \
-  -file_verbosity=VERBOSE \
-  -vsock_guest_cid=$VSOCK_CID \
-  -enable_audio=false \
-  -enable_bootanimation=false \
-  -enable_minimal_mode=true \
-  -enable_modem_simulator=false \
-  -enable_wifi=false \
-  -guest_enforce_security=false \
-  -report_anonymous_usage_stats=no \
-  -gpu_mode="$CUTTLEFISH_GPU_MODE" \
-  -cpus=${FDO_CI_CONCURRENT:-4} \
-  -memory_mb ${CUTTLEFISH_MEMORY:-4096}
-
-sleep 1
-
-popd
-
-# download Android Mesa from S3
-curl-with-retry -O "${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${S3_ANDROID_ARTIFACT_NAME}.tar.zst"
-mkdir /mesa-android
-tar -C /mesa-android -xf ${S3_ANDROID_ARTIFACT_NAME}.tar.zst
-
-# shellcheck disable=SC2034 # used externally
-INSTALL="/mesa-android/install"
-
-# shellcheck disable=SC2034 # used externally
-ADB=adb
-
-# The script exits with the appropriate exit code
-. "$(dirname "$0")/android-runner.sh"
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
deleted file mode 100755
index d8f13f7..0000000
--- a/.gitlab-ci/deqp-runner.sh
+++ /dev/null
@@ -1,233 +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"
-
-section_start test_setup "deqp: preparing test setup"
-
-set -ex
-
-# Needed so configuration files can contain paths to files in /install
-ln -sf "$CI_PROJECT_DIR"/install /install
-
-if [ -z "$GPU_VERSION" ]; then
-   echo 'GPU_VERSION must be set to something like "llvmpipe" or "freedreno-a630" (the name used in .gitlab-ci/gpu-version-*.txt)'
-   exit 1
-fi
-
-INSTALL=$(realpath -s "$PWD"/install)
-
-# Set up the driver environment.
-export LD_LIBRARY_PATH="$INSTALL"/lib/:$LD_LIBRARY_PATH
-export EGL_PLATFORM=surfaceless
-ARCH=$(uname -m)
-export VK_DRIVER_FILES="$INSTALL"/share/vulkan/icd.d/"$VK_DRIVER"_icd."$ARCH".json
-export OCL_ICD_VENDORS="$INSTALL"/etc/OpenCL/vendors/
-
-if [ -n "${ANGLE_TAG:-}" ]; then
-  # Are we using the right ANGLE version?
-  ci_tag_test_time_check "ANGLE_TAG"
-  export LD_LIBRARY_PATH=/angle:$LD_LIBRARY_PATH
-fi
-
-if [ -n "${FLUSTER_TAG:-}" ]; then
-  # Are we using the right Fluster version?
-  ci_tag_test_time_check "FLUSTER_TAG"
-  export LIBVA_DRIVERS_PATH=$INSTALL/lib/dri/
-  # libva spams driver open info by default, and that happens per testcase.
-  export LIBVA_MESSAGING_LEVEL=1
-fi
-
-if [ -n "${PIGLIT_TAG:-}" ]; then
-  # Are we using the right Piglit version?
-  ci_tag_test_time_check "PIGLIT_TAG"
-elif [ -d "/piglit" ]; then
-  # The job does not inherit from .test-piglit, so we remove it.
-  # This makes sure that we can both do the right version checks when needed,
-  # and also optimise our dependencies so we don't pull unneeded stuff.
-  rm -r /piglit
-fi
-
-if [ -n "$VKD3D_PROTON_TAG" ]; then
-  # Are we using the right vkd3d-proton version?
-  ci_tag_test_time_check "VKD3D_PROTON_TAG"
-
-  # Set environment for Wine.
-  export WINEDEBUG="-all"
-  export WINEPREFIX="/vkd3d-proton-wine64"
-  export WINEESYNC=1
-fi
-
-
-# Ensure Mesa Shader Cache resides on tmpfs.
-SHADER_CACHE_HOME=${XDG_CACHE_HOME:-${HOME}/.cache}
-SHADER_CACHE_DIR=${MESA_SHADER_CACHE_DIR:-${SHADER_CACHE_HOME}/mesa_shader_cache}
-
-findmnt -n tmpfs ${SHADER_CACHE_HOME} || findmnt -n tmpfs ${SHADER_CACHE_DIR} || {
-    mkdir -p ${SHADER_CACHE_DIR}
-    mount -t tmpfs -o nosuid,nodev,size=2G,mode=1755 tmpfs ${SHADER_CACHE_DIR}
-}
-
-FILE_ARGS=""
-
-touch /fails.txt
-
-# There must be a single baseline expected fails list, this lets us cat together
-# xfails from multiple possible sources. Do we actually use this, though?
-cat_if_exists() {
-  prefix=$1
-  kind=$2
-  if [ -e "$INSTALL/$prefix-$kind.txt" ]; then
-    cat "$INSTALL/$prefix-$kind.txt" >> "/$kind.txt"
-  fi
-}
-
-add_if_exists() {
-  if [ -e "$INSTALL/$2" ]; then
-    FILE_ARGS="$FILE_ARGS $1 $INSTALL/$2"
-  fi
-}
-
-# remove duplicate values to avoid reading the same file multiple times
-for prefix in $({
-  echo "all"
-  echo "$DRIVER_NAME"
-  echo "$GPU_VERSION"
-} | sort -u); do
-  cat_if_exists "$prefix" fails
-  add_if_exists "--flakes" "$prefix-flakes.txt"
-  add_if_exists "--skips" "$prefix-skips.txt"
-  add_if_exists "--single-thread" "$prefix-single-thread.txt"
-done
-
-if [[ $CI_JOB_NAME != *full* ]]; then
-  FILE_ARGS="$FILE_ARGS --skips $INSTALL/all-slow-skips.txt"
-  add_if_exists "--skips" "$GPU_VERSION-slow-skips.txt"
-fi
-
-if [ -n "${ANGLE_TAG:-}" ]; then
-    FILE_ARGS="$FILE_ARGS --skips $INSTALL/angle-skips.txt"
-fi
-
-# Set the path to VK validation layer settings (in case it ends up getting loaded)
-# Note: If you change the format of this filename, look through the rest of the
-# tree for other places that need to be kept in sync (e.g.
-# src/gallium/drivers/zink/ci/gitlab-ci-inc.yml)
-export VK_LAYER_SETTINGS_PATH=$INSTALL/$GPU_VERSION-validation-settings.txt
-
-report_load() {
-    echo "System load: $(cut -d' ' -f1-3 < /proc/loadavg)"
-    echo "# of CPU cores: $(grep -c processor /proc/cpuinfo)"
-}
-
-if [ "$GALLIUM_DRIVER" = "virpipe" ]; then
-    # deqp is to use virpipe, and virgl_test_server llvmpipe
-    export GALLIUM_DRIVER="$GALLIUM_DRIVER"
-
-    VTEST_ARGS="--use-egl-surfaceless"
-    if [ "$VIRGL_HOST_API" = "GLES" ]; then
-        VTEST_ARGS="$VTEST_ARGS --use-gles"
-    fi
-
-    GALLIUM_DRIVER=llvmpipe \
-    virgl_test_server $VTEST_ARGS >$RESULTS_DIR/vtest-log.txt 2>&1 &
-
-    sleep 1
-fi
-
-uncollapsed_section_switch deqp "deqp: deqp-runner"
-
-# Print the detailed version with the list of backports and local patches
-{ set +x; } 2>/dev/null
-for api in vk-main vk gl gles; do
-  deqp_version_log=/deqp-$api/deqp-$api-version
-  if [ -r "$deqp_version_log" ]; then
-    cat "$deqp_version_log"
-  fi
-done
-set -x
-
-# If you change the format of the suite toml filenames or the
-# $GPU_VERSION-{fails,flakes,skips}.txt filenames, look through the rest
-# of the tree for other places that need to be kept in sync (e.g.
-# src/**/ci/gitlab-ci*.yml)
-set +e
-deqp-runner -V
-deqp-runner \
-    suite \
-    --suite $INSTALL/deqp-$DEQP_SUITE.toml \
-    --output $RESULTS_DIR \
-    --baseline /fails.txt \
-    $FILE_ARGS \
-    --testlog-to-xml /deqp-tools/testlog-to-xml \
-    --fraction-start ${CI_NODE_INDEX:-1} \
-    --fraction $((CI_NODE_TOTAL * ${DEQP_FRACTION:-1})) \
-    --jobs ${FDO_CI_CONCURRENT:-4} \
-    ${DEQP_RUNNER_MAX_FAILS:+--max-fails "$DEQP_RUNNER_MAX_FAILS"} \
-    ${DEQP_RUNNER_SHADER_CACHE_DIR:+--shader-cache-dir "$DEQP_RUNNER_SHADER_CACHE_DIR"} \
-    ${DEQP_FORCE_ASAN:+--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so --env ASAN_OPTIONS=malloc_fill_byte=1}; DEQP_EXITCODE=$?
-
-{ set +x; } 2>/dev/null
-
-set -e
-
-section_switch test_post_process "deqp: post-processing test results"
-set -x
-
-report_load
-
-# Remove all but the first 50 individual XML, test log and caselist
-# files uploaded as artifacts, to save fd.o space and avoid job log spam
-# when you break everything.
-# Note that each of these pattern gets to keep 50 files, but there is nothing
-# making sure the remaining 50 files of each correspond to the same tests.
-find $RESULTS_DIR -name \*.xml | \
-    sort -n |
-    sed -n '1,+49!p' | \
-    xargs rm -f
-find $RESULTS_DIR -name 'c*.r*.caselist.txt' | \
-    sort -n |
-    sed -n '1,+49!p' | \
-    xargs rm -f
-find $RESULTS_DIR -name 'c*.r*.log' | \
-    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
-
-deqp-runner junit \
-   --testsuite dEQP \
-   --results $RESULTS_DIR/failures.csv \
-   --output $RESULTS_DIR/junit.xml \
-   --limit 50 \
-   --template "See $ARTIFACTS_BASE_URL/results/{{testcase}}.xml"
-
-# Report the flakes to the IRC channel for monitoring (if configured):
-if [ -n "$FLAKES_CHANNEL" ]; then
-  python3 $INSTALL/report-flakes.py \
-         --host irc.oftc.net \
-         --port 6667 \
-         --results $RESULTS_DIR/results.csv \
-         --known-flakes $INSTALL/$GPU_VERSION-flakes.txt \
-         --channel "$FLAKES_CHANNEL" \
-         --runner "$CI_RUNNER_DESCRIPTION" \
-         --job "$CI_JOB_ID" \
-         --url "$CI_JOB_URL" \
-         --branch "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-$CI_COMMIT_BRANCH}" \
-         --branch-title "${CI_MERGE_REQUEST_TITLE:-$CI_COMMIT_TITLE}" || true
-fi
-
-# Compress results.csv to save on bandwidth during the upload of artifacts to
-# GitLab. This reduces the size in a VKCTS run from 135 to 7.6MB, and takes
-# 0.17s on a Ryzen 5950X (16 threads, 0.95s when limited to 1 thread).
-zstd --quiet --rm --threads ${FDO_CI_CONCURRENT:-0} -8 "$RESULTS_DIR/results.csv" -o "$RESULTS_DIR/results.csv.zst"
-
-set +x
-section_end test_post_process
-
-exit $DEQP_EXITCODE
diff --git a/.gitlab-ci/docs b/.gitlab-ci/docs
deleted file mode 120000
index af422db..0000000
--- a/.gitlab-ci/docs
+++ /dev/null
@@ -1 +0,0 @@
-../docs/ci
\ No newline at end of file
diff --git a/.gitlab-ci/download-git-cache.sh b/.gitlab-ci/download-git-cache.sh
deleted file mode 100644
index a414f76..0000000
--- a/.gitlab-ci/download-git-cache.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-
-set +e
-set -o xtrace
-
-# if we run this script outside of gitlab-ci for testing, ensure
-# we got meaningful variables
-CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(mktemp -d)/$CI_PROJECT_NAME}
-
-if [[ -e $CI_PROJECT_DIR/.git ]]
-then
-    echo "Repository already present, skip cache download"
-    exit
-fi
-
-TMP_DIR=$(mktemp -d)
-
-echo "$(date +"%F %T") Downloading archived master..."
-if ! curl --location --fail --retry-connrefused --retry 3 --retry-delay 10 \
-              --output "$TMP_DIR/$CI_PROJECT_NAME.tar.gz" \
-              "https://${S3_HOST}/${S3_GITCACHE_BUCKET}/${FDO_UPSTREAM_REPO}/$CI_PROJECT_NAME.tar.gz";
-then
-    echo "Repository cache not available"
-    exit
-fi
-
-set -e
-
-rm -rf "$CI_PROJECT_DIR"
-echo "$(date +"%F %T") Extracting tarball into '$CI_PROJECT_DIR'..."
-mkdir -p "$CI_PROJECT_DIR"
-tar xzf "$TMP_DIR/$CI_PROJECT_NAME.tar.gz" -C "$CI_PROJECT_DIR"
-rm -rf "$TMP_DIR"
-chmod a+w "$CI_PROJECT_DIR"
-
-echo "$(date +"%F %T") Git cache download done"
diff --git a/.gitlab-ci/farm-rules.yml b/.gitlab-ci/farm-rules.yml
deleted file mode 100644
index 761aff2..0000000
--- a/.gitlab-ci/farm-rules.yml
+++ /dev/null
@@ -1,404 +0,0 @@
-# The logic for each $FARM is as follows:
-#
-# If the disable file exists, we are disabling the farm, or it's already
-# disabled:
-#   - exists: [ .ci-farms-disabled/$FARM ]
-#     when: never
-#
-# Otherwise, changing the disable file means removing it, so we are
-# re-enabling the farm:
-#   - changes: [ .ci-farms-disabled/$FARM ]
-#     if: '$CI_PIPELINE_SOURCE != "schedule"'
-#     when: on_success
-# Note: the "manual" variant of each farm rules changes the above to `never`,
-# so that jobs meant to be manual don't run in re-enablement MRs. This is the
-# only difference between `.$FARM-farm-rules` and `.$FARM-farm-manual-rules`.
-#
-# If any other disable file is modified, we are disabling/re-enabling another
-# farm:
-#   - changes: [ .ci-farms-disabled/* ]
-#     if: '$CI_PIPELINE_SOURCE != "schedule"'
-#     when: never
-#
-# The `not schedule` condition is there to make sure scheduled pipelines
-# contains all the jobs, as `changes` conditions in scheduled pipelines are
-# always evaluated to `true`.
-#
-# The "fallback", if none of these rules match, is usually the list of files
-# that are used by a driver. See the various `.$DRIVER-rules` in the
-# corresponding `src/**/ci/gitlab-ci.yml`.
-
-# In case of issues with a farm, here are the people to contact:
-#   farm name        | ci infrastructure used           | admin(s)
-#   -----------------|----------------------------------|---------
-#   anholt           | (decommissioned)                 | @anholt
-#   austriancoder    | ci-tron                          | @austriancoder
-#   collabora        | lava                             | @daniels, @sergi
-#   igalia           | baremetal/poe-powered, ci-tron   | @jasuarez, @chema
-#   imagination      | ci-tron                          | @MTCoster
-#   lima             | lava                             | @enunes
-#   lumag            | ci-tron                          | @lumag
-#   microsoft        | custom                           | @jenatali, @alatiera
-#   ondracka         | ci-tron                          | @ondracka
-#   pengutronix      | lava                             | @hnez, @lynxeye
-#   valve-kws        | ci-tron                          | @mupuf, @eric
-#   valve-mupuf      | ci-tron                          | @mupuf, @eric
-#   vmware           | lava                             | @mombasa, @bhenden
-
-.microsoft-farm-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/microsoft ]  # 1. Is disabled, never run
-      when: never
-    - changes: [ .ci-farms-disabled/microsoft ]  # 2. Removed from disabled, run
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: on_success
-    - changes: [ .ci-farms-disabled/* ]  # 3. We touched other farms in MR, do not run
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    # 4. Fall-through (other rules or on_success)
-
-.microsoft-farm-manual-rules:
-  rules:
-    # Allow triggering jobs manually in other cases if any files affecting the
-    # pipeline were changed
-    - exists: [ .ci-farms-disabled/microsoft ]
-      when: never
-    - changes: [ .ci-farms-disabled/microsoft ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - !reference [.microsoft-farm-rules, rules]
-
-.microsoft-farm-container-rules:
-  rules:
-    # Allow triggering jobs manually in other cases if any files affecting the
-    # pipeline were changed
-    - exists: [ .ci-farms-disabled/microsoft ]
-      when: never
-    - changes: [ .ci-farms-disabled/microsoft ]
-      if: '$CI_PROJECT_NAMESPACE == "mesa" && $CI_COMMIT_BRANCH'
-      when: on_success
-    - changes: [ .ci-farms-disabled/microsoft ]
-      if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"'
-      when: on_success
-    - changes: [ .ci-farms-disabled/microsoft ]
-      if: '$CI_PROJECT_NAMESPACE == "mesa" && $GITLAB_USER_LOGIN != "marge-bot" && $CI_COMMIT_BRANCH'
-      when: on_success
-    - changes: [ .ci-farms-disabled/* ]
-      if: '$CI_PROJECT_NAMESPACE == "mesa" && $CI_COMMIT_BRANCH'
-      when: never
-    - changes: [ .ci-farms-disabled/* ]
-      if: '$GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"'
-      when: never
-    - changes: [ .ci-farms-disabled/* ]
-      if: '$CI_PROJECT_NAMESPACE == "mesa" && $GITLAB_USER_LOGIN != "marge-bot" && $CI_COMMIT_BRANCH'
-      when: never
-
-
-.collabora-farm-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/collabora ]
-      when: never
-    - if: '$CI_PIPELINE_SOURCE != "schedule"'
-      changes: [ .ci-farms-disabled/collabora ]
-      when: on_success
-    - if: '$CI_PIPELINE_SOURCE != "schedule"'
-      changes: [ .ci-farms-disabled/* ]
-      when: never
-
-.collabora-farm-manual-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/collabora ]
-      when: never
-    - if: '$CI_PIPELINE_SOURCE != "schedule"'
-      changes: [ .ci-farms-disabled/collabora ]
-      when: never
-    - !reference [.collabora-farm-rules, rules]
-
-
-.igalia-farm-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/igalia ]
-      when: never
-    - changes: [ .ci-farms-disabled/igalia ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: on_success
-    - changes: [ .ci-farms-disabled/* ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-
-.igalia-farm-manual-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/igalia ]
-      when: never
-    - changes: [ .ci-farms-disabled/igalia ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - !reference [.igalia-farm-rules, rules]
-
-
-.lima-farm-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/lima ]
-      when: never
-    - changes: [ .ci-farms-disabled/lima ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: on_success
-    - changes: [ .ci-farms-disabled/* ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-
-.lima-farm-manual-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/lima ]
-      when: never
-    - changes: [ .ci-farms-disabled/lima ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - !reference [.lima-farm-rules, rules]
-
-
-.anholt-farm-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/anholt ]
-      when: never
-    - changes: [ .ci-farms-disabled/anholt ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: on_success
-    - changes: [ .ci-farms-disabled/* ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-
-.anholt-farm-manual-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/anholt ]
-      when: never
-    - changes: [ .ci-farms-disabled/anholt ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - !reference [.anholt-farm-rules, rules]
-
-
-.valve-farm-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/valve-mupuf ]
-      if: '$RUNNER_FARM_LOCATION == "mupuf"'
-      when: never
-    - exists: [ .ci-farms-disabled/valve-kws ]
-      if: '$RUNNER_FARM_LOCATION == "keywords"'
-      when: never
-    - changes: [ .ci-farms-disabled/valve-mupuf ]
-      if: '$RUNNER_FARM_LOCATION == "mupuf" && $CI_PIPELINE_SOURCE != "schedule"'
-      when: on_success
-    - changes: [ .ci-farms-disabled/valve-kws ]
-      if: '$RUNNER_FARM_LOCATION == "keywords" && $CI_PIPELINE_SOURCE != "schedule"'
-      when: on_success
-    - changes: [ .ci-farms-disabled/* ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-
-.valve-farm-manual-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/valve-mupuf ]
-      if: '$RUNNER_FARM_LOCATION == "mupuf"'
-      when: never
-    - exists: [ .ci-farms-disabled/valve-kws ]
-      if: '$RUNNER_FARM_LOCATION == "keywords"'
-      when: never
-    - changes: [ .ci-farms-disabled/valve-mupuf ]
-      if: '$RUNNER_FARM_LOCATION == "mupuf" && $CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - changes: [ .ci-farms-disabled/valve-kws ]
-      if: '$RUNNER_FARM_LOCATION == "keywords" && $CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - !reference [.valve-farm-rules, rules]
-
-.austriancoder-farm-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/austriancoder ]
-      when: never
-    - changes: [ .ci-farms-disabled/austriancoder ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: on_success
-    - changes: [ .ci-farms-disabled/* ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-
-.austriancoder-farm-manual-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/austriancoder ]
-      when: never
-    - changes: [ .ci-farms-disabled/austriancoder ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - !reference [.austriancoder-farm-rules, rules]
-
-.vmware-farm-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/vmware ]
-      when: never
-    - changes: [ .ci-farms-disabled/vmware ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: on_success
-    - changes: [ .ci-farms-disabled/* ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-
-.vmware-farm-manual-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/vmware ]
-      when: never
-    - changes: [ .ci-farms-disabled/vmware ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - !reference [.vmware-farm-rules, rules]
-
-.ondracka-farm-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/ondracka ]
-      when: never
-    - changes: [ .ci-farms-disabled/ondracka ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: on_success
-    - changes: [ .ci-farms-disabled/* ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-
-.ondracka-farm-manual-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/ondracka ]
-      when: never
-    - changes: [ .ci-farms-disabled/ondracka ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - !reference [.ondracka-farm-rules, rules]
-
-
-.pengutronix-farm-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/pengutronix ]
-      when: never
-    - if: '$CI_PIPELINE_SOURCE != "schedule"'
-      changes: [ .ci-farms-disabled/pengutronix ]
-      when: on_success
-    - if: '$CI_PIPELINE_SOURCE != "schedule"'
-      changes: [ .ci-farms-disabled/* ]
-      when: never
-
-.pengutronix-farm-manual-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/pengutronix ]
-      when: never
-    - if: '$CI_PIPELINE_SOURCE != "schedule"'
-      changes: [ .ci-farms-disabled/pengutronix ]
-      when: never
-    - !reference [.pengutronix-farm-rules, rules]
-
-
-.lumag-farm-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/lumag ]
-      when: never
-    - changes: [ .ci-farms-disabled/lumag ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: on_success
-    - changes: [ .ci-farms-disabled/* ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-
-.lumag-farm-manual-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/lumag ]
-      when: never
-    - changes: [ .ci-farms-disabled/lumag ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - !reference [.lumag-farm-rules, rules]
-
-.imagination-farm-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/imagination ]
-      when: never
-    - changes: [ .ci-farms-disabled/imagination ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: on_success
-    - changes: [ .ci-farms-disabled/* ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-
-.imagination-farm-manual-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/imagination ]
-      when: never
-    - changes: [ .ci-farms-disabled/imagination ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - !reference [.imagination-farm-rules, rules]
-
-# Skip container & build jobs when disabling any farm, and run them if any
-# farm gets re-enabled.
-# Just like above, don't apply these rules in scheduled pipelines (see comment
-# on line 23).
-.disable-farm-rules:
-  rules:
-    # changes(disabled) + exists(disabled) = disabling the farm
-    # Note: this cannot be simplified into a single `.ci-farms-disabled/*` rule
-    # because if there are more than one disabled farm and we only re-enable
-    # one, the exits(.ci-farms-disabled/*) would match and what should be
-    # a farm re-enable pipeline will be detected as a farm disable pipeline.
-    - changes: [ .ci-farms-disabled/microsoft ]
-      exists: [ .ci-farms-disabled/microsoft ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - changes: [ .ci-farms-disabled/collabora ]
-      exists: [ .ci-farms-disabled/collabora ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - changes: [ .ci-farms-disabled/igalia ]
-      exists: [ .ci-farms-disabled/igalia ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - changes: [ .ci-farms-disabled/lima ]
-      exists: [ .ci-farms-disabled/lima ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - changes: [ .ci-farms-disabled/anholt ]
-      exists: [ .ci-farms-disabled/anholt ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - changes: [ .ci-farms-disabled/valve-mupuf ]
-      exists: [ .ci-farms-disabled/valve-mupuf ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - changes: [ .ci-farms-disabled/valve-kws ]
-      exists: [ .ci-farms-disabled/valve-kws ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - changes: [ .ci-farms-disabled/austriancoder ]
-      exists: [ .ci-farms-disabled/austriancoder ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - changes: [ .ci-farms-disabled/ondracka ]
-      exists: [ .ci-farms-disabled/ondracka ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - changes: [ .ci-farms-disabled/vmware ]
-      exists: [ .ci-farms-disabled/vmware ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - changes: [ .ci-farms-disabled/pengutronix ]
-      exists: [ .ci-farms-disabled/pengutronix ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - changes: [ .ci-farms-disabled/lumag ]
-      exists: [ .ci-farms-disabled/lumag ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - changes: [ .ci-farms-disabled/imagination ]
-      exists: [ .ci-farms-disabled/imagination ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    # Any other change to ci-farms/* means some farm is getting re-enabled.
-    # Run jobs in Marge pipelines (and let it fallback to manual otherwise)
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "marge-bot"'
-      changes: [ .ci-farms/* ]
-      when: on_success
diff --git a/.gitlab-ci/fossilize-runner.sh b/.gitlab-ci/fossilize-runner.sh
deleted file mode 100755
index af0182b..0000000
--- a/.gitlab-ci/fossilize-runner.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-if [ -z "$VK_DRIVER" ]; then
-   echo 'VK_DRIVER must be to something like "radeon" or "intel" for the test run'
-   exit 1
-fi
-
-INSTALL=$PWD/install
-
-# Set up the driver environment.
-export LD_LIBRARY_PATH="$INSTALL/lib/"
-export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
-
-# To store Fossilize logs on failure.
-RESULTS="$PWD/results"
-mkdir -p results
-
-"$INSTALL/fossils/fossils.sh" "$INSTALL/fossils.yml" "$RESULTS"
diff --git a/.gitlab-ci/fossils.yml b/.gitlab-ci/fossils.yml
deleted file mode 100644
index f33ed18..0000000
--- a/.gitlab-ci/fossils.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-fossils-db:
-  repo: "https://gitlab.freedesktop.org/hakzsam/fossils-db"
-  commit: "5626cedcb58bd95a7b79a9664651818aea92b21c"
-
-fossils:
-  - path: sascha-willems/database.foz
-  - path: parallel-rdp/small_subgroup.foz
-  - path: parallel-rdp/small_uber_subgroup.foz
-  - path: parallel-rdp/subgroup.foz
-  - path: parallel-rdp/uber_subgroup.foz
diff --git a/.gitlab-ci/fossils/fossils.sh b/.gitlab-ci/fossils/fossils.sh
deleted file mode 100755
index e50312d..0000000
--- a/.gitlab-ci/fossils/fossils.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-# shellcheck disable=SC2155
-
-FOSSILS_SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
-FOSSILS_YAML="$(readlink -f "$1")"
-FOSSILS_RESULTS="$2"
-
-clone_fossils_db()
-{
-    local repo="$1"
-    local commit="$2"
-    rm -rf fossils-db
-    git clone --no-checkout "$repo" fossils-db
-    (cd fossils-db || return; git reset "$commit" || git reset "origin/$commit")
-}
-
-query_fossils_yaml()
-{
-    python3 "$FOSSILS_SCRIPT_DIR/query_fossils_yaml.py" \
-        --file "$FOSSILS_YAML" "$@"
-}
-
-create_clean_git()
-{
-    rm -rf .clean_git
-    cp -R .git .clean_git
-}
-
-restore_clean_git()
-{
-    rm -rf .git
-    cp -R .clean_git .git
-}
-
-fetch_fossil()
-{
-    local fossil="${1//,/?}"
-    echo -n "[fetch_fossil] Fetching $1... "
-    local output=$(git lfs pull -I "$fossil" 2>&1)
-    local ret=0
-    if [[ $? -ne 0 || ! -f "$1" ]]; then
-        echo "ERROR"
-        echo "$output"
-        ret=1
-    else
-        echo "OK"
-    fi
-    restore_clean_git
-    return $ret
-}
-
-if [[ -n "$(query_fossils_yaml fossils_db_repo)" ]]; then
-    clone_fossils_db "$(query_fossils_yaml fossils_db_repo)" \
-                     "$(query_fossils_yaml fossils_db_commit)"
-    cd fossils-db || return
-else
-    echo "Warning: No fossils-db entry in $FOSSILS_YAML, assuming fossils-db is current directory"
-fi
-
-# During git operations various git objects get created which
-# may take up significant space. Store a clean .git instance,
-# which we restore after various git operations to keep our
-# storage consumption low.
-create_clean_git
-
-for fossil in $(query_fossils_yaml fossils)
-do
-    fetch_fossil "$fossil" || exit $?
-    if ! fossilize-replay --num-threads 4 $fossil 1>&2 2> $FOSSILS_RESULTS/fossil_replay.txt;
-    then
-        echo "Replay of $fossil failed"
-        grep "pipeline crashed or hung" $FOSSILS_RESULTS/fossil_replay.txt
-        exit 1
-    fi
-    rm $fossil
-done
-
-exit $ret
diff --git a/.gitlab-ci/fossils/query_fossils_yaml.py b/.gitlab-ci/fossils/query_fossils_yaml.py
deleted file mode 100644
index 42e4b8e..0000000
--- a/.gitlab-ci/fossils/query_fossils_yaml.py
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/python3
-
-# Copyright (c) 2019 Collabora Ltd
-# Copyright (c) 2020 Valve Corporation
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-#
-# SPDX-License-Identifier: MIT
-
-import argparse
-import yaml
-
-def cmd_fossils_db_repo(args):
-    with open(args.file, 'r') as f:
-        y = yaml.safe_load(f)
-    print(y['fossils-db']['repo'])
-
-def cmd_fossils_db_commit(args):
-    with open(args.file, 'r') as f:
-        y = yaml.safe_load(f)
-    print(y['fossils-db']['commit'])
-
-def cmd_fossils(args):
-    with open(args.file, 'r') as f:
-        y = yaml.safe_load(f)
-
-    fossils = list(y['fossils'])
-    if len(fossils) == 0:
-        return
-
-    print('\n'.join((t['path'] for t in fossils)))
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--file', required=True,
-                        help='the name of the yaml file')
-
-    subparsers = parser.add_subparsers(help='sub-command help')
-
-    parser_fossils_db_repo = subparsers.add_parser('fossils_db_repo')
-    parser_fossils_db_repo.set_defaults(func=cmd_fossils_db_repo)
-
-    parser_fossils_db_commit = subparsers.add_parser('fossils_db_commit')
-    parser_fossils_db_commit.set_defaults(func=cmd_fossils_db_commit)
-
-    parser_fossils = subparsers.add_parser('fossils')
-    parser_fossils.set_defaults(func=cmd_fossils)
-
-    args = parser.parse_args()
-    args.func(args)
-
-if __name__ == "__main__":
-    main()
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
deleted file mode 100644
index 4806f9d..0000000
--- a/.gitlab-ci/image-tags.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-# Keep the tags below under 20 chars each, as they end up combined into
-# docker image tags, and docker has a length limit of 128 chars total in tags.
-#
-# The word after the date doesn't need to be overly descriptive, it exists
-# purely to avoid the risk of two people updating an image tag on the same day
-# while working on different changes, so it doesn't matter whether that word
-# will make sense to someone else. Aim for "nobody else will pick that word
-# for their change".
-#
-# If you update a tag and you get an error like this:
-#     cannot parse input: "$image:$tag": invalid reference format
-# check the length of $tag; if it's > 128 chars you need to shorten your tag.
-
-include:
-  # Include the conditional build image tags used for structured tagging runtime checks that happens
-  # during both build and test jobs
-  # It can be auto-generated by bin/ci/update_tag.py script, so to keep the script's serde simple,
-  # let's keep the component tags in a separate file
-  - .gitlab-ci/conditional-build-image-tags.yml
-
-variables:
-  DEBIAN_BUILD_BASE_TAG: "20251016-riscv"
-  DEBIAN_BUILD_TAG: "20260309-D3D619"
-
-  DEBIAN_TEST_BASE_TAG: "20260201-deqp-runner"
-  DEBIAN_TEST_ANDROID_TAG: "20260415-vkcts"
-  DEBIAN_TEST_GL_TAG: "20260415-vkcts"
-  DEBIAN_TEST_VIDEO_TAG: "20250813-vector"
-  DEBIAN_TEST_VK_TAG: "20260415-vkcts"
-
-  ALPINE_X86_64_BUILD_TAG: "20251001-realninja"
-
-  FEDORA_X86_64_BUILD_TAG: "20260429-static261"
-
-  KERNEL_TAG: "v6.19-mesa-8a6f"
-  KERNEL_REPO: "gfx-ci/linux"
-  PKG_REPO_REV: "78fcf356"
-  FIRMWARE_TAG: "8fc31b97"
-  FIRMWARE_REPO: "gfx-ci/firmware"
-
-  WINDOWS_X64_MSVC_TAG: "20251120-bison"
-
-  WINDOWS_X64_BUILD_TAG: "20260309-D3D619"
-
-  WINDOWS_X64_TEST_TAG: "20260309-D3D619"
diff --git a/.gitlab-ci/lava/gitlab-ci.yml b/.gitlab-ci/lava/gitlab-ci.yml
deleted file mode 100644
index f3f9f8c..0000000
--- a/.gitlab-ci/lava/gitlab-ci.yml
+++ /dev/null
@@ -1,279 +0,0 @@
-variables:
-  LAVA_SSH_CLIENT_IMAGE: registry.freedesktop.org/gfx-ci/lava-job-submitter/alpine/x86_64_lava_ssh_client:20250908-lava-ssh
-
-
-.lava-test:
-  # LAVA relies on two main containers:
-  # 1. alpine/x86_64_lava-trigger - the container used on the GitLab CI runner
-  # 2. the test-* container (e.g. debian/arm64_test-vk), whose derived rootfs
-  #    is used on the DUT
-  # The following two containers are also used:
-  # 3. alpine/x86_64_lava_ssh_client - the slim SSH client container for jobs
-  #    that use SSH instead of UART as job output
-  # 4. lava/health-check-docker - the slim container used for fastboot
-  # Set image: directly instead of extending .set-image to avoid conflicts
-  # with MESA_IMAGE_PATH and FDO_DISTRIBUTION_TAG between the containers.
-  image: registry.freedesktop.org/gfx-ci/lava-job-submitter/alpine/x86_64_lava-trigger:20260302.0
-  # Cancel job if a newer commit is pushed to the same branch
-  interruptible: true
-  # The jobs themselves shouldn't actually run for an hour, of course.
-  # Jobs are picked up greedily by a GitLab CI runner which is deliberately
-  # overprovisioned compared to the number of available devices. They are
-  # submitted to the LAVA co-ordinator with a job priority which gives
-  # pre-merge priority over everyone else. User-submitted and nightly jobs
-  # can thus spend ages just waiting around in a queue to be run at some
-  # point as they get pre-empted by other things.
-  # Non-queue time has strict timeouts for each stage, e.g. for downloading
-  # the artifacts, booting the device, device setup, running the tests, etc,
-  # which is handled by LAVA itself.
-  # So the only reason we should see anyone bouncing off this timeout is due
-  # to a lack of available devices to run the jobs.
-  timeout: 1h
-  variables:
-    GIT_STRATEGY: none  # testing doesn't build anything from source
-    HWCI_TEST_SCRIPT: ./install/deqp-runner.sh
-    FDO_CI_CONCURRENT: 6  # should be replaced by per-machine definitions
-    # the dispatchers use this to cache data locally
-    LAVA_HTTP_CACHE_URI: "http://caching-proxy/cache/?uri="
-    LAVA_ROOTFS_PATH: "${MESA_IMAGE_PATH}:${FDO_DISTRIBUTION_TAG}/lava-rootfs.tar.zst"
-    # per-job build artifacts
-    JOB_RESULTS_PATH: "${JOB_ARTIFACTS_BASE}/results.tar.zst"
-    S3_ARTIFACT_NAME: "mesa-${ARCH}-default-debugoptimized"
-    S3_RESULTS_UPLOAD: "${JOB_ARTIFACTS_BASE}"
-    PIGLIT_NO_WINDOW: 1
-    VISIBILITY_GROUP: "Collabora+fdo"
-  # Override the default `before_script` since we don't need  to download
-  # setup-test-env.sh.
-  # The LAVA containers already include the necessary FDO CI bash helpers from
-  # ci-templates.
-  before_script:
-    - >
-      export SCRIPTS_DIR=$(mktemp -d) &&
-      curl -L -s --retry 4 -f --retry-all-errors --retry-delay 60 -O --output-dir "${SCRIPTS_DIR}" "${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/lava/lava-submit.sh"
-    - eval "$S3_JWT_FILE_SCRIPT"
-  script:
-    - . ${SCRIPTS_DIR}/lava-submit.sh
-  artifacts:
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
-    when: always
-    paths:
-      - results/
-    exclude:
-      - results/*.shader_cache
-    reports:
-      junit: results/junit.xml
-  tags:
-    - $RUNNER_TAG
-  after_script:
-    - curl -L --retry 4 -f --retry-connrefused --retry-delay 30 -s "https://${JOB_RESULTS_PATH}" | tar --warning=no-timestamp --zstd -x
-
-.lava-x86_64-test:
-  extends:
-    - .lava-test
-  variables:
-    ARCH: x86_64
-    DEBIAN_ARCH: amd64
-    KERNEL_IMAGE_NAME: bzImage
-    KERNEL_IMAGE_TYPE: "zimage"
-    BOOT_METHOD: u-boot
-
-.lava-x86_64-test-android:
-  extends:
-    - .use-debian/x86_64_test-android
-    - .lava-x86_64-test
-    - .android-variables
-  variables:
-    HWCI_ENABLE_X86_KVM: 1
-    HWCI_TEST_SCRIPT: install/cuttlefish-runner.sh
-    S3_ANDROID_ARTIFACT_NAME: mesa-x86_64-android-debug
-  needs:
-    - job: debian/x86_64_test-android
-      artifacts: false
-      optional: true
-    - job: debian-x86_64  # The generic Linux build for the host will be downloaded later
-      artifacts: false
-    - job: debian-android  # The Android build for the guest will be downloaded later and installed via adb
-      artifacts: false
-
-.lava-x86_64-test-gl:
-  extends:
-    - .use-debian/x86_64_test-gl
-    - .lava-x86_64-test
-  needs:
-    - job: debian/x86_64_test-gl
-      artifacts: false
-      optional: true
-    - job: debian-x86_64
-      artifacts: false
-
-.lava-x86_64-test-asan-gl:
-  extends:
-    - .use-debian/x86_64_test-gl
-    - .lava-x86_64-test
-  variables:
-    DEQP_FORCE_ASAN: 1
-    S3_ARTIFACT_NAME: mesa-x86_64-asan-debugoptimized
-  needs:
-    - job: debian/x86_64_test-gl
-      artifacts: false
-      optional: true
-    - job: debian-x86_64-asan
-      artifacts: false
-
-.lava-x86_64-test-video:
-  extends:
-    - .use-debian/x86_64_test-video
-    - .lava-x86_64-test
-  needs:
-    - job: debian/x86_64_test-video
-      artifacts: false
-      optional: true
-    - job: debian-x86_64
-      artifacts: false
-
-.lava-x86_64-test-vk:
-  extends:
-    - .use-debian/x86_64_test-vk
-    - .lava-x86_64-test
-  needs:
-    - job: debian/x86_64_test-vk
-      artifacts: false
-      optional: true
-    - job: debian-x86_64
-      artifacts: false
-
-.lava-x86_64-test-asan-vk:
-  extends:
-    - .use-debian/x86_64_test-vk
-    - .lava-x86_64-test
-  variables:
-    DEQP_FORCE_ASAN: 1
-    S3_ARTIFACT_NAME: mesa-x86_64-asan-debugoptimized
-  needs:
-    - job: debian/x86_64_test-vk
-      artifacts: false
-      optional: true
-    - job: debian-x86_64-asan
-      artifacts: false
-
-.lava-arm32-test:
-  extends:
-    - .lava-test
-  variables:
-    ARCH: arm32
-    DEBIAN_ARCH: armhf
-    KERNEL_IMAGE_NAME: zImage
-    KERNEL_IMAGE_TYPE: "zimage"
-    BOOT_METHOD: u-boot
-
-.lava-arm32-test-gl:
-  extends:
-    - .use-debian/arm32_test-gl
-    - .lava-arm32-test
-  needs:
-    - job: debian/arm32_test-gl
-      artifacts: false
-      optional: true
-    - job: debian-arm32
-      artifacts: false
-
-.lava-arm64-test:
-  extends:
-    - .lava-test
-  variables:
-    ARCH: arm64
-    DEBIAN_ARCH: arm64
-    KERNEL_IMAGE_NAME: Image
-    KERNEL_IMAGE_TYPE: "image"
-    BOOT_METHOD: u-boot
-
-.lava-arm64-test-android:
-  extends:
-    - .use-debian/arm64_test-android
-    - .lava-arm64-test
-    - .android-variables
-  variables:
-    HWCI_KERNEL_MODULES: vhost_vsock
-    HWCI_TEST_SCRIPT: install/cuttlefish-runner.sh
-    S3_ANDROID_ARTIFACT_NAME: mesa-arm64-android-debug
-  needs:
-    - job: debian/arm64_test-android
-      artifacts: false
-      optional: true
-    - job: debian-arm64  # The generic Linux build for the host will be downloaded later
-      artifacts: false
-    - job: debian-android  # The Android build for the guest will be downloaded later and installed via adb
-      artifacts: false
-
-.lava-arm64-test-gl:
-  extends:
-    - .use-debian/arm64_test-gl
-    - .lava-arm64-test
-  needs:
-    - job: debian/arm64_test-gl
-      artifacts: false
-      optional: true
-    - job: debian-arm64
-      artifacts: false
-
-.lava-arm64-test-asan-gl:
-  extends:
-    - .use-debian/arm64_test-gl
-    - .lava-arm64-test
-  variables:
-    DEQP_FORCE_ASAN: 1
-    S3_ARTIFACT_NAME: mesa-arm64-asan-debugoptimized
-  needs:
-    - job: debian/arm64_test-gl
-      artifacts: false
-      optional: true
-    - job: debian-arm64-asan
-      artifacts: false
-
-.lava-arm64-test-vk:
-  extends:
-    - .use-debian/arm64_test-vk
-    - .lava-arm64-test
-  needs:
-    - job: debian/arm64_test-vk
-      artifacts: false
-      optional: true
-    - job: debian-arm64
-      artifacts: false
-
-.lava-arm64-test-asan-vk:
-  extends:
-    - .use-debian/arm64_test-vk
-    - .lava-arm64-test
-  variables:
-    DEQP_FORCE_ASAN: 1
-    S3_ARTIFACT_NAME: mesa-arm64-asan-debugoptimized
-  needs:
-    - job: debian/arm64_test-vk
-      artifacts: false
-      optional: true
-    - job: debian-arm64-asan
-      artifacts: false
-
-.lava-piglit-traces:
-  extends:
-    - .piglit-traces-test
-  variables:
-    # until we overcome Infrastructure issues, give traces extra 5 min before timeout
-    DEVICE_HANGING_TIMEOUT_SEC: 600
-    PIGLIT_REPLAY_DEVICE_NAME: "gl-${GPU_VERSION}"
-
-.lava-x86_64-piglit-traces:
-  extends:
-    - .lava-x86_64-test-gl
-    - .lava-piglit-traces
-
-.lava-arm32-piglit-traces:
-  extends:
-    - .lava-arm32-test-gl
-    - .lava-piglit-traces
-
-.lava-arm64-piglit-traces:
-  extends:
-    - .lava-arm64-test-gl
-    - .lava-piglit-traces
diff --git a/.gitlab-ci/lava/lava-submit.sh b/.gitlab-ci/lava/lava-submit.sh
deleted file mode 100755
index 84d35c0..0000000
--- a/.gitlab-ci/lava/lava-submit.sh
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-# shellcheck disable=SC1091 # paths only become valid at runtime
-
-# shellcheck disable=SC1090
-source "${FDO_CI_BASH_HELPERS}"
-
-fdo_log_section_start_collapsed prepare_rootfs "Preparing root filesystem"
-
-set -ex
-
-# If we run in the fork (not from mesa or Marge-bot), reuse mainline kernel and rootfs, if exist.
-ROOTFS_URL="$(fdo_find_s3_path "$LAVA_ROOTFS_PATH")" ||
-{
-	set +x
-	fdo_log_section_error "Sorry, I couldn't find a viable built path for ${LAVA_ROOTFS_PATH} in either mainline or a fork." >&2
-	echo "" >&2
-	echo "If you're working on CI, this probably means that you're missing a dependency:" >&2
-	echo "this job ran ahead of the job which was supposed to upload that artifact." >&2
-	echo "" >&2
-	echo "If you aren't working on CI, please ping @mesa/ci-helpers to see if we can help." >&2
-	echo "" >&2
-	echo "This job is going to fail, because I can't find the resources I need. Sorry." >&2
-	set -x
-	exit 1
-}
-
-rm -rf results
-mkdir results
-
-fdo_filter_env_vars > dut-env-vars.sh
-# Set SCRIPTS_DIR to point to the Mesa install we download for the DUT
-echo "export SCRIPTS_DIR='$CI_PROJECT_DIR/install'" >> dut-env-vars.sh
-
-fdo_log_section_end prepare_rootfs
-
-# Prepare env vars for upload.
-fdo_log_section_start_collapsed variables "Environment variables passed through to device:"
-cat dut-env-vars.sh
-fdo_log_section_end variables
-
-fdo_log_section_start_collapsed lava_submit "Submitting job for scheduling"
-
-touch results/lava.log
-tail -f results/lava.log &
-# Ensure that we are printing the commands that are being executed,
-# making it easier to debug the job in case it fails.
-set -x
-
-# List of optional overlays
-LAVA_EXTRA_OVERLAYS=()
-if [ -n "${LAVA_FIRMWARE:-}" ]; then
-    for fw in $LAVA_FIRMWARE; do
-        LAVA_EXTRA_OVERLAYS+=(
-            - append-overlay
-              --name=linux-firmware
-              --url="https://${S3_BASE_PATH}/${FIRMWARE_REPO}/${fw}-${FIRMWARE_TAG}.tar"
-              --path="/"
-              --format=tar
-        )
-    done
-fi
-if [ -n "${HWCI_KERNEL_MODULES:-}" ]; then
-	LAVA_EXTRA_OVERLAYS+=(
-		- append-overlay
-		  --name=kernel-modules
-		  --url="${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/modules.tar"
-		  --path="/"
-		  --format=tar
-	)
-fi
-if [ -n "${ANDROID_CTS_TAG:-}" ]; then
-	LAVA_EXTRA_OVERLAYS+=(
-		- append-overlay
-		  --name=android-cts
-		  --url="$(fdo_find_s3_path "${DATA_STORAGE_PATH}/android-cts/${ANDROID_CTS_TAG}.tar.zst")"
-		  --path="/"
-		  --format=tar
-		  --compression=zstd
-	)
-fi
-if [ -n "${FLUSTER_TAG:-}" ]; then
-	LAVA_EXTRA_OVERLAYS+=(
-		- append-overlay
-		  --name=vkd3d-proton
-		  --url="$(fdo_find_s3_path "${DATA_STORAGE_PATH}/fluster/${FLUSTER_TAG}/vectors.tar.zst")"
-		  --path="/"
-		  --format=tar
-		  --compression=zstd
-	)
-fi
-if [ -n "${VKD3D_PROTON_TAG:-}" ]; then
-	LAVA_EXTRA_OVERLAYS+=(
-		- append-overlay
-		  --name=vkd3d-proton
-		  --url="$(fdo_find_s3_path "${DATA_STORAGE_PATH}/vkd3d-proton/${VKD3D_PROTON_TAG}/${MESA_IMAGE_PATH}/vkd3d-proton.tar.zst")"
-		  --path="/"
-		  --format=tar
-		  --compression=zstd
-	)
-fi
-if [ -n "${S3_ANDROID_ARTIFACT_NAME:-}" ]; then
-	LAVA_EXTRA_OVERLAYS+=(
-		- append-overlay
-		  --name=android-cf-image
-		  --url="https://${S3_BASE_PATH}/${CUTTLEFISH_PROJECT_PATH}/aosp-${CUTTLEFISH_BUILD_VERSION_TAGS}.${CUTTLEFISH_BUILD_NUMBER}/aosp_cf_${ARCH}_only_phone-img-${CUTTLEFISH_BUILD_NUMBER}.tar.zst"
-		  --path="/cuttlefish"
-		  --format=tar
-		  --compression=zstd
-		- append-overlay
-		  --name=android-cvd-host-package
-		  --url="https://${S3_BASE_PATH}/${CUTTLEFISH_PROJECT_PATH}/aosp-${CUTTLEFISH_BUILD_VERSION_TAGS}.${CUTTLEFISH_BUILD_NUMBER}/cvd-host_package-${ARCH}.tar.zst"
-		  --path="/cuttlefish"
-		  --format=tar
-		  --compression=zstd
-	)
-fi
-
-lava-job-submitter \
-	--farm "${FARM}" \
-	--device-type "${DEVICE_TYPE}" \
-	--boot-method "${BOOT_METHOD}" \
-	--job-timeout-min $((CI_JOB_TIMEOUT/60 - 5)) \
-	--dump-yaml \
-	--pipeline-info "$CI_JOB_NAME: $CI_PIPELINE_URL on $CI_COMMIT_REF_NAME ${CI_NODE_INDEX}/${CI_NODE_TOTAL}" \
-	--rootfs-url "${ROOTFS_URL}" \
-	--kernel-url-prefix "${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}" \
-	--dtb-filename "${DTB}" \
-	--env-file dut-env-vars.sh \
-	--jwt-file "${S3_JWT_FILE}" \
-	--kernel-image-name "${KERNEL_IMAGE_NAME}" \
-	--kernel-image-type "${KERNEL_IMAGE_TYPE}" \
-	--visibility-group "${VISIBILITY_GROUP}" \
-	--lava-tags "${LAVA_TAGS}" \
-	--mesa-job-name "$CI_JOB_NAME" \
-	--structured-log-file "results/lava_job_detail.json" \
-	--ssh-client-image "${LAVA_SSH_CLIENT_IMAGE}" \
-	--project-dir "${CI_PROJECT_DIR}" \
-	--project-name "${CI_PROJECT_NAME}" \
-	--starting-section lava_submit \
-	--job-submitted-at "${CI_JOB_STARTED_AT}" \
-	- append-overlay \
-		--name=mesa-build \
-		--url="https://${PIPELINE_ARTIFACTS_BASE}/${S3_ARTIFACT_NAME:?}.tar.zst" \
-		--compression=zstd \
-		--path="${CI_PROJECT_DIR}" \
-		--format=tar \
-	"${LAVA_EXTRA_OVERLAYS[@]}" \
-	- submit \
-	>> results/lava.log
diff --git a/.gitlab-ci/meson/build.sh b/.gitlab-ci/meson/build.sh
deleted file mode 100755
index 9abfa5c..0000000
--- a/.gitlab-ci/meson/build.sh
+++ /dev/null
@@ -1,237 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC1003 # works for us now...
-# shellcheck disable=SC2086 # we want word splitting
-# shellcheck disable=SC1091 # paths only become valid at runtime
-
-. "${SCRIPTS_DIR}/setup-test-env.sh"
-
-section_switch meson-cross-file "meson: cross file generate"
-
-set -e
-set -o xtrace
-
-comma_separated() {
-  local IFS=,
-  echo "$*"
-}
-
-no_werror() {
-  # shellcheck disable=SC2048
-  for i in $*; do
-    echo "-D${i}:werror=false "
-  done
-}
-
-CROSS_FILE=/cross_file-"$CROSS".txt
-
-export PATH=$PATH:$PWD/.gitlab-ci/build
-
-touch native.file
-printf > native.file "%s\n" \
-  "[binaries]"
-
-# We need to control the version of llvm-config we're using, so we'll
-# tweak the cross file or generate a native file to do so.
-if test -n "$LLVM_VERSION"; then
-    LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-    echo "llvm-config = '$(which "$LLVM_CONFIG")'" >> native.file
-    if [ -n "$CROSS" ]; then
-      sed -i -e '/\[binaries\]/a\' -e "llvm-config = '$(which "$LLVM_CONFIG")'" $CROSS_FILE
-    fi
-    $LLVM_CONFIG --version
-fi
-
-# Android manages the rust toolchain differently, ignore that case
-if [ "$CI_JOB_STAGE" = "build-for-tests" ] && [[ "$CI_JOB_NAME" != *android* ]]; then
-  rustup default "$(python3 -c 'import tomllib; print(tomllib.load(open("'"$CI_PROJECT_DIR"'/clippy.toml", "rb"))["msrv"])')"
-fi
-
-# cross-xfail-$CROSS, if it exists, contains a list of tests that are expected
-# to fail for the $CROSS configuration, one per line. you can then mark those
-# tests in their meson.build with:
-#
-# test(...,
-#      should_fail: meson.get_external_property('xfail', '').contains(t),
-#     )
-#
-# where t is the name of the test, and the '' is the string to search when
-# not cross-compiling (which is empty, because for amd64 everything is
-# expected to pass).
-if [ -n "$CROSS" ]; then
-    CROSS_XFAIL=.gitlab-ci/cross-xfail-"$CROSS"
-    if [ -s "$CROSS_XFAIL" ]; then
-        sed -i \
-            -e '/\[properties\]/a\' \
-            -e "xfail = '$(tr '\n' , < $CROSS_XFAIL)'" \
-            "$CROSS_FILE"
-    fi
-fi
-
-if [ -n "$HOST_BUILD_OPTIONS" ]; then
-    section_switch meson-host-configure "meson: host configure"
-
-    # Stash the PKG_CONFIG_LIBDIR so that we can use the base x86_64 image
-    # libraries.
-    tmp_pkg_config_libdir=$PKG_CONFIG_LIBDIR
-    unset PKG_CONFIG_LIBDIR
-
-    # Compile a host version for the few tools we need for a cross build (for
-    # now just intel-clc)
-    rm -rf _host_build
-    meson setup _host_build \
-          --native-file=native.file \
-          -D prefix=/usr \
-          -D libdir=lib \
-          ${HOST_BUILD_OPTIONS}
-
-    pushd _host_build
-
-    section_switch meson-host-build "meson: host build"
-
-    meson configure --no-pager
-    ninja
-    ninja install
-    popd
-
-    # Restore PKG_CONFIG_LIBDIR
-    if [ -n "$tmp_pkg_config_libdir" ]; then
-        export PKG_CONFIG_LIBDIR=$tmp_pkg_config_libdir
-    fi
-fi
-
-# Only use GNU time if available, not any shell built-in command
-case $CI_JOB_NAME in
-    # ASAN leak detection is incompatible with strace
-    *-asan*)
-        if test -f /usr/bin/time; then
-            MESON_TEST_ARGS+=--wrapper=$PWD/.gitlab-ci/meson/time.sh
-        fi
-        Xvfb :0 -screen 0 1024x768x16 &
-        export DISPLAY=:0.0
-        ;;
-    *)
-        if test -f /usr/bin/time -a -f /usr/bin/strace; then
-            MESON_TEST_ARGS+=--wrapper=$PWD/.gitlab-ci/meson/time-strace.sh
-        fi
-        ;;
-esac
-
-# LTO handling
-case $CI_PIPELINE_SOURCE in
-    schedule)
-      # run builds with LTO only for nightly
-      if [ "$CI_JOB_NAME" == "debian-ppc64el" ]; then
-	      # /tmp/ccWlDCPV.s: Assembler messages:
-	      # /tmp/ccWlDCPV.s:15250880: Error: operand out of range (0xfffffffffdd4e688 is not between 0xfffffffffe000000 and 0x1fffffc)
-	      LTO=false
-      # enable one by one for now
-      elif [ "$CI_JOB_NAME" == "fedora-release" ]; then
-	      LTO=false
-      else
-	      LTO=false
-      fi
-      ;;
-    *)
-      LTO=false
-      ;;
-esac
-
-if [ "$LTO" == "true" ]; then
-    MAX_LD=2
-else
-    MAX_LD=${FDO_CI_CONCURRENT:-4}
-fi
-
-# these are built as Meson subprojects; we want to use Meson's
-# --force-fallback-for to ensure that we build the subprojects from their wrap
-# files, and we also want to disable Werror on those, since we do not control
-# these projects and making them warning-free is not our goal.
-# shellcheck disable=2206
-meson_subprojects=(
-  perfetto
-  syn-2-rs
-  paste-1-rs
-  pest-2-rs
-  pest_derive-2-rs
-  pest_generator-2-rs
-  pest_meta-2-rs
-  roxmltree-0.20-rs
-  rustc-hash-2-rs
-  indexmap-2-rs
-  bitflags-2-rs
-  cfg-if-1-rs
-  equivalent-1-rs
-  errno-0.3-rs
-  hashbrown-0.14-rs
-  indexmap-2-rs
-  libc-0.2-rs
-  log-0.4-rs
-  once_cell-1-rs
-  proc-macro2-1-rs
-  quote-1-rs
-  remain-0.2-rs
-  rustix-1-rs
-  thiserror-2-rs
-  thiserror-impl-2-rs
-  ucd-trie-0.1-rs
-  unicode-ident-1-rs
-  zerocopy-derive-0.8-rs
-  ${FORCE_FALLBACK_FOR:-}
-)
-
-section_switch meson-configure "meson: configure"
-
-rm -rf _build
-# shellcheck disable=SC2046
-meson setup _build \
-      --native-file=native.file \
-      --wrap-mode=nofallback \
-      --force-fallback-for "$(comma_separated "${meson_subprojects[@]}")" \
-      $(no_werror "${meson_subprojects[@]}") \
-      ${CROSS+--cross "$CROSS_FILE"} \
-      -D prefix=$PWD/install \
-      -D libdir=lib \
-      -D buildtype=${BUILDTYPE:?} \
-      -D build-tests=${RUN_MESON_TESTS} \
-      -D c_args="$(echo -n $C_ARGS)" \
-      -D c_link_args="$(echo -n $C_LINK_ARGS) -Wl,--fatal-warnings" \
-      -D cpp_args="$(echo -n $CPP_ARGS)" \
-      -D cpp_link_args="$(echo -n $CPP_LINK_ARGS) -Wl,--fatal-warnings" \
-      -D enable-glcpp-tests=false \
-      -D libunwind=${UNWIND} \
-      ${DRI_LOADERS} \
-      ${GALLIUM_ST} \
-      -D gallium-drivers=${GALLIUM_DRIVERS:-[]} \
-      -D vulkan-drivers=${VULKAN_DRIVERS:-[]} \
-      -D video-codecs=all \
-      -D werror=true \
-      -D b_lto=${LTO} \
-      -D backend_max_links=${MAX_LD} \
-      ${EXTRA_OPTION}
-cd _build
-meson configure --no-pager
-
-uncollapsed_section_switch meson-build "meson: build"
-
-ninja
-
-if [ "${RUN_MESON_TESTS}" = "true" ]; then
-    uncollapsed_section_switch meson-test "meson: test"
-    LC_ALL=C.UTF-8 meson test --num-processes "${FDO_CI_CONCURRENT:-4}" --print-errorlogs ${MESON_TEST_ARGS}
-fi
-
-uncollapsed_section_switch meson-missingdeps "meson: check for missing dependencies"
-
-if ! missingdeps=$(ninja -t missingdeps); then
-  # phony rules are false positives
-  missingdeps=$(grep -vF '(generated by phony)' <<< "$missingdeps")
-  if grep -qE '^Missing dep:' <<< "$missingdeps"; then
-    echo "$missingdeps"
-    exit 1
-  fi
-fi
-
-section_switch meson-install "meson: install"
-ninja install
-cd ..
-section_end meson-install
diff --git a/.gitlab-ci/meson/time-strace.sh b/.gitlab-ci/meson/time-strace.sh
deleted file mode 100755
index 53bfd6a..0000000
--- a/.gitlab-ci/meson/time-strace.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-
-if [[ -z "$STRACEDIR" ]]; then
-    STRACEDIR=meson-logs/strace/$(for i in "$@"; do basename -z -- $i; echo -n _; done).$$
-fi
-
-mkdir -p $STRACEDIR
-
-# If the test times out, meson sends SIGTERM to this process.
-# Simply exec'ing "time" would result in no output from that in this case.
-# Instead, we need to run "time" in the background, catch the signals and
-# propagate them to the actual test process.
-
-/usr/bin/time -v strace -ff -tt -T -o $STRACEDIR/log "$@" &
-TIMEPID=$!
-STRACEPID=$(ps --ppid $TIMEPID -o pid=)
-TESTPID=$(ps --ppid $STRACEPID -o pid=)
-
-if test "x$TESTPID" != x; then
-    trap 'kill -TERM $TESTPID; wait $TIMEPID; exit $?' TERM
-fi
-
-wait $TIMEPID
-EXITCODE=$?
-
-# Only keep strace logs if the test timed out
-rm -rf $STRACEDIR &
-
-exit $EXITCODE
diff --git a/.gitlab-ci/meson/time.sh b/.gitlab-ci/meson/time.sh
deleted file mode 100755
index cde6bb7..0000000
--- a/.gitlab-ci/meson/time.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# If the test times out, meson sends SIGTERM to this process.
-# Simply exec'ing "time" would result in no output from that in this case.
-# Instead, we need to run "time" in the background, catch the signals and
-# propagate them to the actual test process.
-
-/usr/bin/time -v "$@" &
-TIMEPID=$!
-TESTPID=$(ps --ppid $TIMEPID -o pid=)
-
-if test "x$TESTPID" != x; then
-    trap 'kill -TERM $TESTPID; wait $TIMEPID; exit $?' TERM
-fi
-
-wait $TIMEPID
-exit $?
diff --git a/.gitlab-ci/piglit/disable-vs_in.diff b/.gitlab-ci/piglit/disable-vs_in.diff
deleted file mode 100644
index 5eba593..0000000
--- a/.gitlab-ci/piglit/disable-vs_in.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/generated_tests/CMakeLists.txt b/generated_tests/CMakeLists.txt
-index 738526546..6f89048cd 100644
---- a/generated_tests/CMakeLists.txt
-+++ b/generated_tests/CMakeLists.txt
-@@ -206,11 +206,6 @@ piglit_make_generated_tests(
-	templates/gen_variable_index_write_tests/vs.shader_test.mako
-	templates/gen_variable_index_write_tests/fs.shader_test.mako
-	templates/gen_variable_index_write_tests/helpers.mako)
--piglit_make_generated_tests(
--	vs_in_fp64.list
--	gen_vs_in_fp64.py
--	templates/gen_vs_in_fp64/columns.shader_test.mako
--	templates/gen_vs_in_fp64/regular.shader_test.mako)
- piglit_make_generated_tests(
-	shader_framebuffer_fetch_tests.list
-	gen_shader_framebuffer_fetch_tests.py)
-@@ -279,7 +274,6 @@ add_custom_target(gen-gl-tests
-			gen_extensions_defined.list
-			vp-tex.list
-			variable_index_write_tests.list
--			vs_in_fp64.list
-			gpu_shader4_tests.list
- )
-
-diff --git a/tests/sanity.py b/tests/sanity.py
-index 12f1614c9..9019087e2 100644
---- a/tests/sanity.py
-+++ b/tests/sanity.py
-@@ -100,7 +100,6 @@ shader_tests = (
-     'spec/arb_tessellation_shader/execution/barrier-patch.shader_test',
-     'spec/arb_tessellation_shader/execution/built-in-functions/tcs-any-bvec4-using-if.shader_test',
-     'spec/arb_tessellation_shader/execution/sanity.shader_test',
--    'spec/arb_vertex_attrib_64bit/execution/vs_in/vs-input-uint_uvec4-double_dmat3x4_array2-position.shader_test',
-     'spec/glsl-1.50/execution/geometry-basic.shader_test',
-     'spec/oes_viewport_array/viewport-gs-write-simple.shader_test',
- )
diff --git a/.gitlab-ci/piglit/piglit-traces.sh b/.gitlab-ci/piglit/piglit-traces.sh
deleted file mode 100755
index ff812cb..0000000
--- a/.gitlab-ci/piglit/piglit-traces.sh
+++ /dev/null
@@ -1,241 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2035 # FIXME glob
-# shellcheck disable=SC2086 # we want word splitting
-# shellcheck disable=SC1091 # paths only become valid at runtime
-
-. "${SCRIPTS_DIR}/setup-test-env.sh"
-
-section_start traces_prepare "traces: preparing test setup"
-
-set -ex
-
-# Our rootfs may not have "less", which apitrace uses during apitrace dump
-export PAGER=cat  # FIXME: export everywhere
-
-# Check we're using the version of Piglit we think we are
-ci_tag_test_time_check "PIGLIT_TAG"
-
-INSTALL=$(realpath -s "$PWD"/install)
-
-export PIGLIT_REPLAY_DESCRIPTION_FILE="$INSTALL/$PIGLIT_TRACES_FILE"
-
-# FIXME: guess why /usr/local/bin is not included in all runners PATH.
-# Needed because yq and ci-fairy are installed there.
-PATH="/usr/local/bin:$PATH"
-
-if [ "$PIGLIT_REPLAY_SUBCOMMAND" = "profile" ]; then
-    yq -iY 'del(.traces[][] | select(.label[]? == "no-perf"))' \
-      "$PIGLIT_REPLAY_DESCRIPTION_FILE"
-else
-    # keep the images for the later upload
-    export PIGLIT_REPLAY_EXTRA_ARGS="--keep-image ${PIGLIT_REPLAY_EXTRA_ARGS}"
-fi
-
-if [ -n "${LAVA_HTTP_CACHE_URI:-}" ]; then
-    export PIGLIT_REPLAY_EXTRA_ARGS="--download-caching-proxy-url=${LAVA_HTTP_CACHE_URI} ${PIGLIT_REPLAY_EXTRA_ARGS}"
-elif [ -n "${CI_TRON_JOB_HTTP_SERVER:-}" ]; then
-    export PIGLIT_REPLAY_EXTRA_ARGS="--download-caching-proxy-url=${CI_TRON_JOB_HTTP_SERVER}/caching_proxy/ ${PIGLIT_REPLAY_EXTRA_ARGS}"
-elif [ -n "${FDO_HTTP_CACHE_URI:-}" ]; then
-    # FIXME: remove when there is no baremetal traces job anymore.
-    export PIGLIT_REPLAY_EXTRA_ARGS="--download-caching-proxy-url=${FDO_HTTP_CACHE_URI} ${PIGLIT_REPLAY_EXTRA_ARGS}"
-fi
-
-# Set up the environment.
-# Modifiying here directly LD_LIBRARY_PATH may cause problems when
-# using a command wrapper. Hence, we will just set it when running the
-# command.
-export __LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/"
-if [ -n "${VK_DRIVER}" ]; then
-  ARCH=$(uname -m)
-  export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json"
-fi
-
-# Sanity check to ensure that our environment is sufficient to make our tests
-# run against the Mesa built by CI, rather than any installed distro version.
-MESA_VERSION=$(head -1 "$INSTALL/VERSION" | sed 's/\./\\./g')
-
-# wrapper to supress +x to avoid spamming the log
-quiet() {
-    set +x
-    "$@"
-    set -x
-}
-
-# Set environment for apitrace executable.
-export PATH="/apitrace/build:$PATH"
-
-echo "Version:"
-apitrace version 2>/dev/null || echo "apitrace not found (Linux)"
-
-SANITY_MESA_VERSION_CMD="wflinfo"
-
-HANG_DETECTION_CMD=""
-
-# Set up the platform windowing system.
-if [ "$EGL_PLATFORM" = "surfaceless" ]; then
-    # Use the surfaceless EGL platform.
-    export DISPLAY=
-    export WAFFLE_PLATFORM="surfaceless_egl"
-
-    SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD --platform surfaceless_egl --api gles2"
-
-    if [ "$GALLIUM_DRIVER" = "virpipe" ]; then
-    # piglit is to use virpipe, and virgl_test_server llvmpipe
-    export GALLIUM_DRIVER="$GALLIUM_DRIVER"
-
-    LD_LIBRARY_PATH="$__LD_LIBRARY_PATH" \
-    GALLIUM_DRIVER=llvmpipe \
-    VTEST_USE_EGL_SURFACELESS=1 \
-    VTEST_USE_GLES=1 \
-    virgl_test_server >"$RESULTS_DIR"/vtest-log.txt 2>&1 &
-
-    sleep 1
-    fi
-elif [ "$PIGLIT_PLATFORM" = "gbm" ]; then
-    SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD --platform gbm --api gl"
-elif [ "$PIGLIT_PLATFORM" = "mixed_glx_egl" ]; then
-    # It is assumed that you have already brought up your X server before
-    # calling this script.
-    SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD --platform glx --api gl"
-else
-    SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD --platform glx --api gl --profile core"
-    . /install/common/weston.sh --renderer=gl
-fi
-
-# If the job is parallel at the  gitlab job level, will take the corresponding
-# fraction of the caselist.
-if [ -n "$CI_NODE_INDEX" ]; then
-    USE_CASELIST=1
-fi
-
-# shellcheck disable=SC2317
-replay_s3_upload_images() {
-    find "$RESULTS_DIR/$__PREFIX" -type f -name "*.png" -printf "%P\n" \
-        | while read -r line; do
-
-        __TRACE="${line%-*-*}"
-        if grep -q "^$__PREFIX/$__TRACE: pass$" ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.orig"; then
-            if [ "x$CI_PROJECT_PATH" != "x$FDO_UPSTREAM_REPO" ]; then
-                continue
-            fi
-            __S3_PATH="$PIGLIT_REPLAY_REFERENCE_IMAGES_BASE"
-            __DESTINATION_FILE_PATH="${line##*-}"
-            if curl --fail -L -s -I "https://${__S3_PATH}/${__DESTINATION_FILE_PATH}" | grep -Eq "^content-type: (binary|application)\/octet-stream" 2>/dev/null; then
-                continue
-            fi
-        else
-            __S3_PATH="$JOB_ARTIFACTS_BASE"
-            __DESTINATION_FILE_PATH="$__S3_TRACES_PREFIX/${line##*-}"
-        fi
-
-        ci-fairy s3cp --token-file "${S3_JWT_FILE}" "$RESULTS_DIR/$__PREFIX/$line" \
-            "https://${__S3_PATH}/${__DESTINATION_FILE_PATH}"
-    done
-}
-
-SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD | tee /tmp/version.txt | grep \"Mesa $MESA_VERSION\(\s\|$\)\""
-
-if [ "${GIT_STRATEGY:-}" = none ]; then
-  cd $RESULTS_DIR && rm -rf ..?* .[!.]* *
-fi
-cd /piglit
-
-if [ -n "$USE_CASELIST" ]; then
-    PIGLIT_TESTS=$(printf "%s" "$PIGLIT_TESTS")
-    PIGLIT_GENTESTS="./piglit print-cmd $PIGLIT_TESTS replay --format \"{name}\" > /tmp/case-list.txt"
-    RUN_GENTESTS="export LD_LIBRARY_PATH=$__LD_LIBRARY_PATH; $PIGLIT_GENTESTS"
-
-    eval $RUN_GENTESTS
-
-    sed -ni $CI_NODE_INDEX~$CI_NODE_TOTAL"p" /tmp/case-list.txt
-
-    PIGLIT_TESTS="--test-list /tmp/case-list.txt"
-fi
-
-PIGLIT_OPTIONS=$(printf "%s" "$PIGLIT_OPTIONS")
-
-PIGLIT_TESTS=$(printf "%s" "$PIGLIT_TESTS")
-
-PIGLIT_CMD="./piglit run -l verbose --timeout 300 -j${FDO_CI_CONCURRENT:-4} $PIGLIT_OPTIONS $PIGLIT_TESTS replay "$(/usr/bin/printf "%q" "$RESULTS_DIR")
-
-RUN_CMD="export LD_LIBRARY_PATH=$__LD_LIBRARY_PATH; $SANITY_MESA_VERSION_CMD && $HANG_DETECTION_CMD $PIGLIT_CMD"
-
-# The replayer doesn't do any size or checksum verification for the traces in
-# the replayer db, so if we had to restart the system due to intermittent device
-# errors (or tried to cache replayer-db between runs, which would be nice to
-# have), you could get a corrupted local trace that would spuriously fail the
-# run.
-rm -rf replayer-db
-
-# ANGLE: download compiled ANGLE runtime and the compiled restricted traces (all-in-one package)
-if [ -n "$PIGLIT_REPLAY_ANGLE_ARCH" ]; then
-  FILE="angle-bin-${PIGLIT_REPLAY_ANGLE_ARCH}-${ANGLE_TRACE_FILES_TAG}.tar.zst"
-  curl --location --fail --retry-all-errors --retry 4 --retry-delay 60 \
-    --header "Authorization: Bearer $(cat "${S3_JWT_FILE}")" \
-    "https://s3.freedesktop.org/mesa-tracie-private/${FILE}" --output "${FILE}"
-  mkdir -p replayer-db/angle
-  tar --zstd -xf ${FILE} -C replayer-db/angle/
-fi
-
-PIGLIT_RESULTS="${PIGLIT_RESULTS:-replay}"
-RESULTSFILE="$RESULTS_DIR/$PIGLIT_RESULTS.txt"
-mkdir -p .gitlab-ci/piglit
-
-uncollapsed_section_switch traces "traces: run traces"
-
-if ! eval $RUN_CMD;
-then
-    error "Found $(cat /tmp/version.txt), expected $MESA_VERSION"
-fi
-
-
-./piglit summary aggregate "$RESULTS_DIR" -o junit.xml
-
-{ set +x; } 2>/dev/null
-./piglit summary console "$RESULTS_DIR"/results.json.bz2 \
-    | tee ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.orig" \
-    | head -n -1 | grep -v ": pass" \
-    | sed '/^summary:/Q' \
-    > $RESULTSFILE
-
-if [ -s $RESULTSFILE ]; then
-	error "Failures in traces:"
-	cat $RESULTSFILE
-	echo "Review the image changes and get the new checksums at: ${ARTIFACTS_BASE_URL}/results/summary/problems.html"
-	echo "If the new traces look correct to you, you can update the checksums"
-	echo "locally by running:"
-	echo "    ./bin/ci/update_traces_checksum.sh"
-	echo "and resubmit this merge request."
-fi
-
-section_switch test_post_process "traces: post-processing test results"
-
-__PREFIX="trace/$PIGLIT_REPLAY_DEVICE_NAME"
-__S3_PATH="$PIGLIT_REPLAY_ARTIFACTS_BASE_URL"
-__S3_TRACES_PREFIX="traces"
-
-set -x
-
-if [ "$PIGLIT_REPLAY_SUBCOMMAND" != "profile" ]; then
-    quiet replay_s3_upload_images
-fi
-
-
-if [ ! -s $RESULTSFILE ]; then
-    rm -rf "${RESULTS_DIR:?}/${__PREFIX}"
-    { set +x; } 2>/dev/null
-    section_end test_post_process
-    exit 0
-fi
-
-./piglit summary html --exclude-details=pass \
-"$RESULTS_DIR"/summary "$RESULTS_DIR"/results.json.bz2
-
-find "$RESULTS_DIR"/summary -type f -name "*.html" -print0 \
-        | xargs -0 sed -i 's%<img src="file://'"${RESULTS}"'.*-\([0-9a-f]*\)\.png%<img src="https://'"${JOB_ARTIFACTS_BASE}"'/traces/\1.png%g'
-find "$RESULTS_DIR"/summary -type f -name "*.html" -print0 \
-        | xargs -0 sed -i 's%<img src="file://%<img src="https://'"${PIGLIT_REPLAY_REFERENCE_IMAGES_BASE}"'/%g'
-
-section_end test_post_process
-
-exit 1
diff --git a/.gitlab-ci/prepare-artifacts.sh b/.gitlab-ci/prepare-artifacts.sh
deleted file mode 100755
index f17d253..0000000
--- a/.gitlab-ci/prepare-artifacts.sh
+++ /dev/null
@@ -1,90 +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"
-
-section_switch prepare-artifacts "artifacts: prepare"
-
-set -e
-set -o xtrace
-
-CROSS_FILE=/cross_file-"$CROSS".txt
-
-if [ -d install/bin ]; then
-  # Keep pps-producer binary for tests that need it.
-  # Remove all other binaries to save space.
-  find install/bin -type f -not -name 'pps-producer' -delete
-fi
-
-# Delete unused includes from artifacts to save space.
-rm -rf install/include
-rm -f install/lib/*.a
-
-# Strip the drivers and binaries in the artifacts to cut 80% of the artifacts size.
-if [ -n "$CROSS" ]; then
-    STRIP=$(sed -n -E "s/strip\s*=\s*\[?'(.*)'\]?/\1/p" "$CROSS_FILE")
-    if [ -z "$STRIP" ]; then
-        echo "Failed to find strip command in cross file"
-        exit 1
-    fi
-else
-    STRIP="strip"
-fi
-if [ -z "$ARTIFACTS_DEBUG_SYMBOLS" ]; then
-    find install -type f -executable -exec $STRIP --strip-debug {} \;
-fi
-
-git_sha=$(git rev-parse --short=10 HEAD)
-echo "$(cat VERSION) (git-$git_sha)" > install/VERSION
-
-# Test runs don't pull down the git tree, so put the dEQP helper
-# script and associated bits there.
-for f in \
-  .gitlab-ci/bare-metal \
-  .gitlab-ci/common \
-  .gitlab-ci/piglit \
-  .gitlab-ci/fossils.yml \
-  .gitlab-ci/fossils \
-  .gitlab-ci/crosvm-init.sh \
-  .gitlab-ci/*.txt \
-  .gitlab-ci/report-flakes.py \
-  .gitlab-ci/setup-test-env.sh \
-  .gitlab-ci/*-runner.sh \
-  .gitlab-ci/bin/structured_logger.py \
-  .gitlab-ci/bin/custom_logger.py \
-; do
-  cp -Rp "$f" install/
-done
-
-mapfile -t duplicate_files < <(
-  find src/ -path '*/ci/*' \
-    \( \
-      -name '*.txt' \
-      -o -name '*.toml' \
-      -o -name '*traces*.yml' \
-    \) \
-    -exec basename -a {} + | sort | uniq -d
-)
-if [ ${#duplicate_files[@]} -gt 0 ]; then
-  echo 'Several files with the same name in various ci/ folders:'
-  printf -- '  %s\n' "${duplicate_files[@]}"
-  exit 1
-fi
-
-find src/ -path '*/ci/*' \
-  \( \
-    -name '*.txt' \
-    -o -name '*.toml' \
-    -o -name '*traces*.yml' \
-  \) \
-  -exec cp -p {} install/ \;
-
-if [ -n "$S3_ARTIFACT_NAME" ]; then
-    # Pass needed files to the test stage
-    S3_ARTIFACT_TAR="$S3_ARTIFACT_NAME.tar.zst"
-    tar -c install | zstd --quiet --threads ${FDO_CI_CONCURRENT:-0} -o ${S3_ARTIFACT_TAR}
-    ci-fairy s3cp --token-file "${S3_JWT_FILE}" ${S3_ARTIFACT_TAR} https://${PIPELINE_ARTIFACTS_BASE}/${S3_ARTIFACT_TAR}
-fi
-
-section_end prepare-artifacts
diff --git a/.gitlab-ci/report-flakes.py b/.gitlab-ci/report-flakes.py
deleted file mode 100644
index 6aada5b..0000000
--- a/.gitlab-ci/report-flakes.py
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright © 2021 Google LLC
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-import argparse
-import io
-import re
-import socket
-import time
-
-
-class Connection:
-    def __init__(self, host, port, verbose):
-        self.s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.s.connect((host, port))
-        self.s.setblocking(0)
-        self.verbose = verbose
-
-    def send_line(self, line):
-        if self.verbose:
-            print(f"IRC: sending {line}")
-        self.s.sendall((line + '\n').encode())
-
-    def wait(self, secs):
-        for i in range(secs):
-            if self.verbose:
-                while True:
-                    try:
-                        data = self.s.recv(1024)
-                    except io.BlockingIOError:
-                        break
-                    if data == "":
-                        break
-                    for line in data.decode().split('\n'):
-                        print(f"IRC: received {line}")
-            time.sleep(1)
-
-    def quit(self):
-        self.send_line("QUIT")
-        self.s.shutdown(socket.SHUT_WR)
-        self.s.close()
-
-
-def read_flakes(results):
-    flakes = []
-    csv = re.compile("(.*),(.*),(.*)")
-    for line in open(results, 'r').readlines():
-        match = csv.match(line)
-        if match.group(2) == "Flake":
-            flakes.append(match.group(1))
-    return flakes
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--host', type=str,
-                        help='IRC server hostname', required=True)
-    parser.add_argument('--port', type=int,
-                        help='IRC server port', required=True)
-    parser.add_argument('--results', type=str,
-                        help='results.csv file from deqp-runner or piglit-runner', required=True)
-    parser.add_argument('--known-flakes', type=str,
-                        help='*-flakes.txt file passed to deqp-runner or piglit-runner', required=True)
-    parser.add_argument('--channel', type=str,
-                        help='Known flakes report channel', required=True)
-    parser.add_argument('--url', type=str,
-                        help='$CI_JOB_URL', required=True)
-    parser.add_argument('--runner', type=str,
-                        help='$CI_RUNNER_DESCRIPTION', required=True)
-    parser.add_argument('--branch', type=str,
-                        help='optional branch name')
-    parser.add_argument('--branch-title', type=str,
-                        help='optional branch title')
-    parser.add_argument('--job', type=str,
-                        help='$CI_JOB_ID', required=True)
-    parser.add_argument('--verbose', "-v", action="store_true",
-                        help='log IRC interactions')
-    args = parser.parse_args()
-
-    flakes = read_flakes(args.results)
-    if not flakes:
-        exit(0)
-
-    known_flakes = []
-    for line in open(args.known_flakes).readlines():
-        line = line.strip()
-        if not line or line.startswith("#"):
-            continue
-        known_flakes.append(re.compile(line))
-
-    irc = Connection(args.host, args.port, args.verbose)
-
-    # The nick needs to be something unique so that multiple runners
-    # connecting at the same time don't race for one nick and get blocked.
-    # freenode has a 16-char limit on nicks (9 is the IETF standard, but
-    # various servers extend that).  So, trim off the common prefixes of the
-    # runner name, and append the job ID so that software runners with more
-    # than one concurrent job (think swrast) don't collide.  For freedreno,
-    # that gives us a nick as long as db410c-N-JJJJJJJJ, and it'll be a while
-    # before we make it to 9-digit jobs (we're at 7 so far).
-    nick = args.runner
-    nick = nick.replace('mesa-', '')
-    nick += f'-{args.job}'
-    irc.send_line(f"NICK {nick}")
-    irc.send_line(f"USER {nick} unused unused: Gitlab CI Notifier")
-    irc.wait(10)
-    irc.send_line(f"JOIN {args.channel}")
-    irc.wait(1)
-
-    branchinfo = ""
-    if args.branch:
-        branchinfo = f" on branch {args.branch} ({args.branch_title})"
-    irc.send_line(
-        f"PRIVMSG {args.channel} :Flakes detected in job {args.url} on {args.runner}{branchinfo}:")
-
-    for flake in flakes:
-        status = "NEW "
-        for known in known_flakes:
-            if known.match(flake):
-                status = ""
-                break
-
-        irc.send_line(f"PRIVMSG {args.channel} :{status}{flake}")
-
-    irc.send_line(
-        f"PRIVMSG {args.channel} :See {args.url}/artifacts/browse/results/")
-
-    irc.quit()
-
-
-if __name__ == '__main__':
-    main()
diff --git a/.gitlab-ci/run-pytest.sh b/.gitlab-ci/run-pytest.sh
deleted file mode 100755
index 100bbdb..0000000
--- a/.gitlab-ci/run-pytest.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
-# © Collabora Limited
-# Author: Guilherme Gallo <guilherme.gallo@collabora.com>
-
-# This script runs unit/integration tests for CI tools
-# shellcheck disable=SC1091 # The relative paths in this file only become valid at runtime.
-# shellcheck disable=SC2086 # quoting PYTEST_VERBOSE makes us pass an empty path
-
-set -eu
-
-PYTHON_BIN="python3.13"
-
-if [ -z "${SCRIPTS_DIR:-}" ]; then
-    SCRIPTS_DIR="$(dirname "${0}")"
-fi
-
-if [ -z "${CI_JOB_STARTED_AT:-}" ]; then
-    CI_JOB_STARTED_AT=$(date -u +%Y-%m-%dT%H:%M:%SZ) # isoformat
-fi
-
-source "${SCRIPTS_DIR}/setup-test-env.sh"
-
-if [ -z "${CI_PROJECT_DIR:-}" ]; then
-    CI_PROJECT_DIR="$(dirname "${0}")/../"
-fi
-
-# If running outside of the debian/arm64_build container,
-# run in a virtual environment for isolation
-# e.g. USE_VENV=true ./.gitlab-ci/run-pytest.sh
-if [ "${USE_VENV:-}" == true ]; then
-    echo "Setting up virtual environment for local testing."
-    MESA_PYTEST_VENV="${CI_PROJECT_DIR}/.venv-pytest"
-    ${PYTHON_BIN} -m venv "${MESA_PYTEST_VENV}"
-    source "${MESA_PYTEST_VENV}"/bin/activate
-    ${PYTHON_BIN} -m pip install --break-system-packages -r "${CI_PROJECT_DIR}/bin/ci/test/requirements.txt"
-fi
-
-SCRIPT_TEST_DIR=${CI_PROJECT_DIR}/bin/ci
-
-uncollapsed_section_start pytest "Running pytest"
-
-PYTHONPATH="${SCRIPT_TEST_DIR}:${PYTHONPATH:-}" ${PYTHON_BIN} -m \
-    pytest "${SCRIPT_TEST_DIR}" \
-            -W ignore::DeprecationWarning \
-            --junitxml=artifacts/ci_scripts_report.xml \
-            -m 'not slow' \
-	    ${PYTEST_VERBOSE:-}
-
-section_end pytest
-
-section_start flake8 "flake8"
-${PYTHON_BIN} -m flake8 \
---config "${CI_PROJECT_DIR}/.gitlab-ci/.flake8" \
-"${SCRIPT_TEST_DIR}"
-section_end flake8
diff --git a/.gitlab-ci/run-shader-db.sh b/.gitlab-ci/run-shader-db.sh
deleted file mode 100755
index 738df0d..0000000
--- a/.gitlab-ci/run-shader-db.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC1091 # paths only become valid at runtime
-
-set -e
-
-. "${SCRIPTS_DIR}/setup-test-env.sh"
-
-ARTIFACTSDIR=$(pwd)/shader-db
-mkdir -p "$ARTIFACTSDIR"
-export DRM_SHIM_DEBUG=true
-
-LIBDIR=$(pwd)/install/lib
-export LD_LIBRARY_PATH=$LIBDIR
-
-cd /usr/local/shader-db
-
-for driver in freedreno lima v3d vc4; do
-    section_start shader-db-${driver} "Running shader-db for $driver"
-    env LD_PRELOAD="$LIBDIR/lib${driver}_noop_drm_shim.so" \
-        ./run -j"${FDO_CI_CONCURRENT:-4}" ./shaders \
-            > "$ARTIFACTSDIR/${driver}-shader-db.txt"
-    section_end shader-db-${driver}
-done
-
-# Run shader-db over a number of supported platforms for crocus/iris
-for platform in hsw bdw skl mtl lnl ptl; do
-    section_start "shader-db-intel-${platform}" "Running shader-db for intel - ${platform}"
-    env LD_PRELOAD="$LIBDIR/libintel_noop_drm_shim.so" \
-        INTEL_STUB_GPU_PLATFORM="${platform}" \
-        ./run -j"${FDO_CI_CONCURRENT:-4}" ./shaders \
-            > "$ARTIFACTSDIR/intel-${platform}-shader-db.txt"
-    section_end "shader-db-intel-${platform}"
-done
-
-# Run shader-db over a number of supported chipsets for nouveau
-for chipset in 40 a3 c0 e4 f0 134 162; do
-    section_start shader-db-nouveau-${chipset} "Running shader-db for nouveau - ${chipset}"
-    env LD_PRELOAD="$LIBDIR/libnouveau_noop_drm_shim.so" \
-        NOUVEAU_CHIPSET=${chipset} \
-        ./run -j"${FDO_CI_CONCURRENT:-4}" ./shaders \
-            > "$ARTIFACTSDIR/nouveau-${chipset}-shader-db.txt"
-    section_end shader-db-nouveau-${chipset}
-done
-
-# Run shader-db for r300 (RV370 and RV515)
-for chipset in 0x5460 0x7140; do
-    section_start shader-db-r300-${chipset} "Running shader-db for r300 - ${chipset}"
-    env LD_PRELOAD="$LIBDIR/libradeon_noop_drm_shim.so" \
-        RADEON_GPU_ID=${chipset} \
-        ./run -j"${FDO_CI_CONCURRENT:-4}" -o r300 ./shaders \
-            > "$ARTIFACTSDIR/r300-${chipset}-shader-db.txt"
-    section_end shader-db-r300-${chipset}
-done
-
-# Run shader-db for radeonsi
-for device in pitcairn bonaire navi21 navi31 gfx1150 gfx1201; do
-    section_start shader-db-radeonsi-${device} "Running shader-db for radeonsi - ${device}"
-    env LD_PRELOAD="$LIBDIR/libamdgpu_noop_drm_shim.so" \
-        RADEON_GPU_ID=${device} \
-        ./run -j"${FDO_CI_CONCURRENT:-4}" -o radeonsi ./shaders \
-            > "$ARTIFACTSDIR/radeonsi-${device}-shader-db.txt"
-    section_end shader-db-radeonsi-${device}
-done
diff --git a/.gitlab-ci/run-shellcheck.sh b/.gitlab-ci/run-shellcheck.sh
deleted file mode 100755
index 76dea93..0000000
--- a/.gitlab-ci/run-shellcheck.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-SCRIPTS_DIR="$(realpath "$(dirname "$0")")"
-
-is_bash() {
-    [[ $1 == *.sh ]] && return 0
-    [[ $1 == */bash-completion/* ]] && return 0
-    [[ $(file -b --mime-type "$1") == text/x-shellscript ]] && return 0
-    return 1
-}
-
-anyfailed=0
-
-while IFS= read -r -d $'' file; do
-    if is_bash "$file" ; then
-        if ! shellcheck "$file"; then
-            anyfailed=1
-        fi
-    fi
-done < <(find "$SCRIPTS_DIR" -type f \! -path "./.git/*" -print0)
-
-exit "$anyfailed"
diff --git a/.gitlab-ci/run-yamllint.sh b/.gitlab-ci/run-yamllint.sh
deleted file mode 100755
index 2825083..0000000
--- a/.gitlab-ci/run-yamllint.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-# Run yamllint against all traces files.
-find . -name '*traces*yml' -print0 | xargs -0 yamllint -d "{rules: {line-length: {max: 1000}}}"
diff --git a/.gitlab-ci/setup-test-env.sh b/.gitlab-ci/setup-test-env.sh
deleted file mode 100755
index aac2b0e..0000000
--- a/.gitlab-ci/setup-test-env.sh
+++ /dev/null
@@ -1,382 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2048
-# shellcheck disable=SC2086 # we want word splitting
-# shellcheck disable=SC2155 # mktemp usually not failing
-
-shopt -s expand_aliases
-
-function _x_store_state {
-    if [[ "$-" == *"x"* ]]; then
-      previous_state_x=1
-    else
-      previous_state_x=0
-    fi
-}
-_x_store_state
-alias x_store_state='{ _x_store_state; } >/dev/null 2>/dev/null'
-
-function _x_off {
-    x_store_state
-    set +x
-}
-alias x_off='{ _x_off; } >/dev/null 2>/dev/null'
-
-function _x_restore {
-  [ $previous_state_x -eq 0 ] || set -x
-}
-alias x_restore='{ _x_restore; } >/dev/null 2>/dev/null'
-
-function _error_msg() (
-    x_off
-    RED="\e[0;31m"
-    ENDCOLOR="\e[0m"
-    echo -e "${RED}$*${ENDCOLOR}"
-)
-
-# Some date binaries (like the BusyBox one) use -D instead of -d for date parsing.
-# This fallback handles both cases: try GNU coreutils-style first, then fallback to BusyBox if it fails.
-# The BusyBox fallback needs '|| true' because it returns an error status even when it outputs the time.
-export JOB_START_S=$(
-  date -u +"%s" -d "$CI_JOB_STARTED_AT" 2>/dev/null ||
-  { date -u +"%s" -D "%Y-%m-%dT%H:%M:%SZ" "$CI_JOB_STARTED_AT" 2>/dev/null || true; }
-)
-
-function get_job_seconds {
-    DATE_S=$(date -u +"%s")
-    echo $((DATE_S-JOB_START_S))
-}
-
-function get_current_minsec {
-    CURR_TIME=$(get_job_seconds)
-    printf "%02d:%02d" $((CURR_TIME/60)) $((CURR_TIME%60))
-}
-
-function _build_section_start {
-    local section_params=$1
-    shift
-    local section_name=$1
-    CURRENT_SECTION=$section_name
-    shift
-    CYAN="\e[0;36m"
-    ENDCOLOR="\e[0m"
-
-    CURR_MINSEC=$(get_current_minsec)
-    echo -e "\n\e[0Ksection_start:$(date +%s):$section_name$section_params\r\e[0K${CYAN}[${CURR_MINSEC}] $*${ENDCOLOR}\n"
-    x_restore
-}
-alias build_section_start="x_off; _build_section_start"
-
-function _section_start {
-    build_section_start "[collapsed=true]" $*
-    x_restore
-}
-alias section_start="x_off; _section_start"
-
-function _uncollapsed_section_start {
-    build_section_start "" $*
-    x_restore
-}
-alias uncollapsed_section_start="x_off; _uncollapsed_section_start"
-
-function _build_section_end {
-    echo -e "\e[0Ksection_end:$(date +%s):$1\r\e[0K"
-    CURRENT_SECTION=""
-    x_restore
-}
-alias build_section_end="x_off; _build_section_end"
-
-function _section_end {
-    build_section_end $*
-    x_restore
-}
-alias section_end="x_off; _section_end"
-
-function _section_switch {
-    if [ -n "${CURRENT_SECTION:-}" ]
-    then
-        build_section_end $CURRENT_SECTION
-        x_off
-    fi
-    build_section_start "[collapsed=true]" $*
-    x_restore
-}
-alias section_switch="x_off; _section_switch"
-
-function _uncollapsed_section_switch {
-    if [ -n "${CURRENT_SECTION:-}" ]
-    then
-        build_section_end $CURRENT_SECTION
-        x_off
-    fi
-    build_section_start "" $*
-    x_restore
-}
-alias uncollapsed_section_switch="x_off; _uncollapsed_section_switch"
-
-export -f _x_store_state
-export -f _x_off
-export -f _x_restore
-export -f get_current_minsec
-export -f _build_section_start
-export -f _section_start
-export -f _build_section_end
-export -f _section_end
-export -f _section_switch
-export -f _uncollapsed_section_switch
-export -f _error_msg
-
-# Freedesktop requirement (needed for Wayland)
-[ -n "${XDG_RUNTIME_DIR:-}" ] || export XDG_RUNTIME_DIR="$(mktemp --tmpdir -d xdg-runtime-XXXXXX)"
-
-if [ -z "${RESULTS_DIR:-}" ]; then
-	export RESULTS_DIR="${PWD%/}/results"
-	if [ "${GIT_STRATEGY:-}" = none ]; then
-		rm -rf "${RESULTS_DIR}"
-	fi
-fi
-mkdir -p "${RESULTS_DIR}"
-
-function error {
-    # we force the following to be not in a section
-    if [ -n "${CURRENT_SECTION:-}" ]; then
-      section_end $CURRENT_SECTION
-      x_off
-    fi
-
-    CURR_MINSEC=$(get_current_minsec)
-    echo -e "\n"
-    _error_msg "[$CURR_MINSEC] ERROR: $*"
-    x_restore
-}
-
-function trap_err {
-    x_off
-    error ${CURRENT_SECTION:-'unknown-section'}: ret code: $*
-}
-
-# ------ Structured tagging
-export _CI_TAG_CHECK_DIR="/mesa-ci-build-tag"
-
-_ci_tag_from_name_to_var() {
-    # Transforms MY_COMPONENT_TAG to my-component
-    echo "${1%_TAG}" | tr '[:upper:]' '[:lower:]' | tr '_' '-'
-}
-
-_ci_tag_check() (
-    x_off
-    _declared_name="${1}"
-    declare -n _declared="${_declared_name}"
-    _calculated="${2}"
-    local component_lower=$(_ci_tag_from_name_to_var "${_declared_name}")
-
-    if [ -z "${_declared:-}" ]; then
-        # Close the section
-        error "Fatal error"
-        _error_msg "Structured tag is not set: ${_declared_name}"
-        _error_msg ""
-        echo "If you are adding a new component, please run:"
-        echo "bin/ci/update_tag.py --include ${component_lower}"
-        echo "This will automatically update the YAML file for you."
-        echo "Or manually edit .gitlab-ci/conditional-build-image-tags.yml to add the new"
-        echo "component."
-        error ""
-        exit 2
-    fi
-
-    if [ "${_declared}" != "${_calculated}" ]; then
-        # Close the section
-        error "Fatal error"
-        _error_msg "Mismatch in declared and calculated tags:"
-        _error_msg "    ${_declared_name} from the YAML is \"${_declared}\""
-        _error_msg "    ... but I think it should be \"${_calculated}\""
-        _error_msg ""
-        echo "Usually this happens when you change what you want to be built without also"
-        echo "changing the YAML declaration. For example, you've bumped SKQP to version"
-        echo "1.2.3, but you still have 'SKQP_VER: 1.2.2' in"
-        echo ".gitlab-ci/conditional-build-image-tags.yml."
-        echo ""
-        echo "If you meant to change the component I'm talking about, please change the"
-        echo "tag and resubmit. You can also run:"
-        echo "bin/ci/update_tag.py --include ${component_lower}"
-        echo "to update the tag automatically."
-        echo ""
-        echo "If you didn't mean to change the component, please ping @mesa/ci-helpers and we"
-        echo "can help you figure out what's gone wrong."
-        echo ""
-        echo "But for now, I've got to fail this build. Sorry."
-        exit 2
-    fi
-    x_restore
-)
-
-_ci_tag_check_build() {
-    x_off
-    if [ -n "${NEW_TAG_DRY_RUN:-}" ]; then
-        echo "${2}"
-        exit 0
-    fi
-
-    _ci_tag_check "${1}" "${2}"
-
-    if [ -n "${CI_NOT_BUILDING_ANYTHING:-}" ]; then
-        exit 0
-    fi
-    x_restore
-}
-
-get_tag_file() {
-    x_off
-    # If no tag name is provided, return the directory
-    echo "${_CI_TAG_CHECK_DIR}/${1:-}"
-    x_restore
-}
-
-_ci_tag_write() (
-    set +x
-    local tag_name="${1}"
-    local tag_value="${2}"
-
-    mkdir -p "${_CI_TAG_CHECK_DIR}"
-    echo -n "${tag_value}" > "$(get_tag_file "${tag_name}")"
-)
-
-_ci_calculate_tag() {
-    x_off
-    # the args are files that can affect the build output
-    mapfile -t extra_files < <(printf '%s\n' "$@")
-    (
-        for extra_file in "${extra_files[@]}"; do
-            if [ ! -f "${extra_file}" ]; then
-                error "File '${extra_file}' does not exist"
-                exit 1
-            fi
-            cat "${extra_file}"
-        done
-    ) | md5sum | cut -d' ' -f1
-    x_restore
-}
-
-ci_tag_build_time_check() {
-    # Get the caller script and hash its contents plus the extra files
-    x_off
-    local tag_name="${1}"
-    local build_script_file="build-$(_ci_tag_from_name_to_var "${tag_name}").sh"
-    local build_script=".gitlab-ci/container/${build_script_file}"
-    shift
-    # now $@ has the extra files
-    local calculated_tag=$(_ci_calculate_tag "${build_script}" "$@")
-
-    _ci_tag_check_build "${tag_name}" "${calculated_tag}"
-    _ci_tag_write "${tag_name}" "${calculated_tag}"
-    x_restore
-}
-
-ci_tag_test_time_check() {
-    x_off
-    local tag_file=$(get_tag_file "${1}")
-    if [ ! -f "${tag_file}" ]; then
-        _error_msg "Structured tag file ${tag_file} does not exist"
-        _error_msg "Please run the ci_tag_build_time_check first and rebuild the image/rootfs"
-        exit 2
-    fi
-    _ci_tag_check "${1}" "$(cat "${tag_file}")"
-    x_restore
-}
-
-# Export all functions
-export -f _ci_calculate_tag
-export -f _ci_tag_check
-export -f _ci_tag_check_build
-export -f _ci_tag_from_name_to_var
-export -f _ci_tag_write
-export -f ci_tag_build_time_check
-export -f ci_tag_test_time_check
-export -f get_tag_file
-
-# Structured tagging ------
-
-curl-with-retry() {
-    curl --fail --location --retry-connrefused --retry 4 --retry-delay 15 "$@"
-}
-export -f curl-with-retry
-
-function find_s3_project_artifact() {
-    x_off
-    local artifact_path="$1"
-
-    for project in "${FDO_UPSTREAM_REPO}" "${CI_PROJECT_PATH}"; do
-        local full_path="${FDO_HTTP_CACHE_URI:-}${S3_BASE_PATH}/${project}/${artifact_path}"
-        if curl-with-retry -s --head "https://${full_path}" >/dev/null; then
-            echo "https://${full_path}"
-            x_restore
-            return 0
-        fi
-    done
-
-    x_restore
-    return 1
-}
-export -f find_s3_project_artifact
-
-export -f error
-export -f trap_err
-
-function filter_env_vars() {
-    x_off
-    if [[ -n "${S3_JWT:-}" ]]; then
-        echo >&2 "Fatal: S3_JWT is set. This should have been cleared at this point."
-        return 1
-    fi
-
-    local exclude_vars=(
-        # GitLab tokens/passwords
-        CI_JOB_TOKEN
-        CI_DEPLOY_USER
-        CI_DEPLOY_PASSWORD
-        CI_DEPENDENCY_PROXY_PASSWORD
-        CI_REGISTRY_PASSWORD
-        CI_REPOSITORY_URL
-
-        # Too long and unnecessary GitLab variables
-        CI_COMMIT_DESCRIPTION
-        CI_COMMIT_MESSAGE
-        CI_MERGE_REQUEST_DESCRIPTION
-
-        # Shell-managed variables
-        _
-        HOME
-        HOSTNAME
-        OLDPWD
-        PATH
-        PWD
-        TERM
-        XDG_RUNTIME_DIR
-    )
-
-    env -0 | sort -z | while IFS= read -r -d '' line; do
-        [[ "$line" == *=* ]] || continue
-        local varname="${line%%=*}"
-
-        # Skip certain Mesa-specific variables
-        if echo "$varname" | grep -qxE "$CI_EXCLUDE_ENV_VAR_REGEX"; then
-            echo >&2 "${FUNCNAME[0]}: $varname is not passed to the DUT as it matches the pattern in CI_EXCLUDE_ENV_VAR_REGEX"
-            continue
-        fi
-        # Skip excluded or invalid names
-        if printf '%s\n' "${exclude_vars[@]}" | grep -qxF "$varname"; then
-            echo >&2 "${FUNCNAME[0]}: $varname is not passed to the DUT as it is a variable listed for exclusion in ${FUNCNAME[0]}"
-            continue
-        fi
-        # Skip shell function exports
-        if [[ "$varname" == BASH_FUNC_* ]] || [[ ! "$varname" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then
-            continue
-        fi
-
-        echo "${!varname@A}"
-    done
-    x_restore
-}
-export -f filter_env_vars
-
-set -E
-trap 'trap_err $?' ERR
diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
deleted file mode 100644
index ce82d61..0000000
--- a/.gitlab-ci/test-source-dep.yml
+++ /dev/null
@@ -1,245 +0,0 @@
-# This file list source dependencies to avoid creating/running jobs
-# those outcome cannot be changed by the modifications from a branch.
-
-# Rule to filter for only scheduled pipelines.
-.scheduled_pipeline-rules:
-  rules:
-    - if: &is-scheduled-pipeline '$CI_PIPELINE_SOURCE == "schedule"'
-      when: on_success
-
-# Override of the `default: retry:` settings, which automatically retries jobs
-# if one of the tests result didn't match its expectation; this override
-# disables that, but keeps the auto-retry for infrastructure failures.
-.no-auto-retry:
-  retry:
-    max: 1
-    # Don't retry on script_failure, job_execution_timeout, runner_unsupported,
-    # stale_schedule, archived_failure, or unmet_prerequisites
-    when:
-      - api_failure
-      - runner_system_failure
-      - scheduler_failure
-      - data_integrity_failure
-      - unknown_failure
-
-
-# Generic rule to not run the job during scheduled pipelines. Jobs that aren't
-# something like a nightly run should include this rule.
-.no_scheduled_pipelines-rules:
-  rules:
-    - if: *is-scheduled-pipeline
-      when: never
-
-# Rule for restricted traces jobs to only run for users with access to those
-# traces (both https://gitlab.freedesktop.org/gfx-ci/tracie/traces-db-private
-# for trace access, and minio bucket access for viewing result images from CI).
-#
-# This is a compromise, allowing some marked developers to have their MRs
-# blocked on regressions to non-redistributable traces, while not blocking
-# merges for other devs who would be unable to debug changes to them.
-.restricted-rules:
-  rules:
-    # If the triggerer has access to the restricted traces and if it is pre-merge
-    - if: '($GITLAB_USER_LOGIN !~ "/^(robclark|anholt|flto|cwabbott0|Danil|tomeu|okias|gallo|kwg|llanderwelin|zmike|vigneshraman|Valentine|daniels)$/") &&
-           ($GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH)'
-      when: never
-
-# Mesa core source file dependencies that may impact any test job
-# ---------------------------------------------------------------
-.core-rules:
-  rules:
-    - !reference [.common-rules, rules]
-    - !reference [.no_scheduled_pipelines-rules, rules]
-    - changes: &core_file_list
-        - .gitlab-ci.yml
-        - .gitlab-ci/**/*
-        - include/**/*
-        - meson.build
-        - meson.options
-        - build-support/**/*
-        - subprojects/**/*
-        - .gitattributes
-        - src/*
-        - src/android_stub/**/*
-        - src/c11/**/*
-        - src/compiler/**/*
-        - src/drm-shim/**/*
-        - src/gtest/**/*
-        # Some src/util and src/compiler files use headers from mesa/ (e.g.
-        # mtypes.h).  We should clean that up.
-        - src/mesa/**/*.h
-        - src/tool/**/*
-        - src/util/**/*
-        - src/x11/**/*
-      when: on_success
-
-# Same core dependencies for doing manual runs.
-.core-manual-rules:
-  extends: .no-auto-retry
-  rules:
-    - !reference [.common-rules, rules]
-    # We only want manual jobs to show up when it's not marge's pre-merge CI
-    # run, otherwise she'll wait until her timeout.  The exception is
-    # performance jobs, see below.
-    - if: '($GITLAB_USER_LOGIN == "marge-bot" &&
-           $CI_PIPELINE_SOURCE == "merge_request_event" &&
-           $CI_JOB_NAME !~ "/performance$/")'
-      when: never
-    - !reference [.scheduled_pipeline-rules, rules]
-    - changes:
-        *core_file_list
-      when: manual
-
-# Rules for performance jobs tracking.  We want perf jobs to run as code is
-# merged to main, but we don't want them to block marge.  So, they need to have
-# only when: never or when: manual, and a separate script maintained by
-# Collabora triggers the manual job after merge to main.  These "never" filters
-# need to come before any paths with "manual".
-.performance-rules:
-  stage: performance
-  rules:
-    - !reference [.no_scheduled_pipelines-rules, rules]
-    # Run only on pre-merge pipelines from Marge
-    - if: $MESA_CI_PERFORMANCE_ENABLED == null
-      when: never
-  # Allow the merge to complete even before the job completes (since it won't
-  # even start until the separate script triggers on it).
-  allow_failure: true
-
-.piglit-performance-base:
-  extends:
-    - .performance-rules
-  variables:
-    JOB_PRIORITY: 40
-    PIGLIT_REPLAY_SUBCOMMAND: "profile"
-    PIGLIT_REPLAY_EXTRA_ARGS: "--db-path ${CI_PROJECT_DIR}/replayer-db/"
-    # More than this can hit OOM due to BOs leaked during the replay of the last frame
-    PIGLIT_REPLAY_LOOP_TIMES: 150
-    # We don't want for more than one workload to be submitted to the GPU at a time
-    FDO_CI_CONCURRENT: 1
-    # Piglit is very sparse in its status output and downloads of big traces can take a while
-    DEVICE_HANGING_TIMEOUT_SEC: 600
-    # So we aren't capped by VSync by the X server
-    EGL_PLATFORM: surfaceless
-    GIT_STRATEGY: none
-    HWCI_FREQ_MAX: "true"
-    # Always use the same device
-    LAVA_TAGS: "cbg-0"
-    # Ensure that we are using the release build artifact
-    S3_ARTIFACT_NAME: mesa-${ARCH}-default-release
-  # Reset dependencies in performance jobs to enforce the release build artifact
-  dependencies: null
-  # Don't run in parallel. It is okay to performance jobs to take a little
-  # longer to finish, as they don't block marge from merging an MR.
-  parallel: null
-  artifacts:
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
-    when: always
-    paths:
-    - results/
-    exclude:
-    - results/*.shader_cache
-    reports:
-      junit:
-      - results/junit.xml
-
-# Mesa source file dependencies that may impact any GL driver test job.
-.gallium-core-rules:
-  rules:
-    - !reference [.core-rules, rules]
-    - changes: &gallium_core_file_list
-        - src/gallium/*
-        - src/gallium/auxiliary/**/*
-        - src/gallium/drivers/*
-        - src/gallium/include/**/*
-        - src/gallium/frontends/dri/*
-        - src/gallium/frontends/glx/**/*
-        - src/gallium/targets/**/*
-        - src/gallium/winsys/*
-      when: on_success
-
-.gl-rules:
-  rules:
-    - !reference [.core-rules, rules]
-    - changes: &mesa_core_file_list
-        - src/egl/**/*
-        - src/gbm/**/*
-        - src/glx/**/*
-        - src/loader/**/*
-        - src/mesa/*
-        - src/mesa/glapi/**/*
-        - src/mesa/main/**/*
-        - src/mesa/math/**/*
-        - src/mesa/program/**/*
-        - src/mesa/state_tracker/**/*
-        - src/mesa/vbo/**/*
-      when: on_success
-    - !reference [.gallium-core-rules, rules]
-
-.gl-manual-rules:
-  extends: .no-auto-retry
-  rules:
-    - !reference [.core-manual-rules, rules]
-    - changes:
-        *mesa_core_file_list
-      when: manual
-    - changes:
-        *gallium_core_file_list
-      when: manual
-
-# Source file dependencies that may impact any Vulkan driver build or test
-.vulkan-rules:
-  rules:
-    - !reference [.core-rules, rules]
-    - changes: &vulkan_file_list
-        - src/vulkan/**/*
-      when: on_success
-
-.vulkan-manual-rules:
-  extends: .no-auto-retry
-  rules:
-    - !reference [.core-manual-rules, rules]
-    - changes:
-        *vulkan_file_list
-      when: manual
-
-# Rules for linters
-.lint-rustfmt-rules:
-  rules:
-    - !reference [.never-post-merge-rules, rules]
-    - !reference [.no_scheduled_pipelines-rules, rules]
-    # pre-merge: must succeed if changing Rust, skip if not
-    - if: &is-merge-attempt $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes: &rustfmt_files
-        - .gitlab-ci.yml
-        - .gitlab-ci/**/*
-        - src/**/*.rs
-      when: on_success
-      allow_failure: false
-    - if: *is-merge-attempt
-      when: never
-    - if: &is-merge-request $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes:
-        *rustfmt_files
-      when: manual
-      allow_failure: false
-    - if: *is-merge-request
-      when: never
-    # non-pre-merge: run but only advisory
-    - if: $CI_PROJECT_NAMESPACE == "mesa"
-      changes: *rustfmt_files
-      allow_failure: true
-    - if: $CI_PROJECT_NAMESPACE == "mesa"
-      when: never
-    - when: manual
-      allow_failure: true
-
-# Rules for .mr-label-maker.yml
-.mr-label-maker-rules:
-  rules:
-    - !reference [.never-post-merge-rules, rules]
-    - !reference [.no_scheduled_pipelines-rules, rules]
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes:
-        - .mr-label-maker.yml
-      when: on_success
diff --git a/.gitlab-ci/test/gitlab-ci-inc.yml b/.gitlab-ci/test/gitlab-ci-inc.yml
deleted file mode 100644
index c808c59..0000000
--- a/.gitlab-ci/test/gitlab-ci-inc.yml
+++ /dev/null
@@ -1,180 +0,0 @@
-.test:
-  # Cancel job if a newer commit is pushed to the same branch
-  interruptible: true
-  variables:
-    GIT_STRATEGY: none  # testing doesn't build anything from source
-  # `before_script:` is only used by test jobs on generic fdo runners
-  # it's overwritten by hardware test jobs
-  before_script:
-    - !reference [.download_s3, before_script]
-    - section_start ldd_section "Checking ldd on driver build"
-    - LD_LIBRARY_PATH=install/lib find install/lib -name "*.so" -print -exec ldd {} \;
-    - section_end ldd_section
-  artifacts:
-    when: always
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
-    paths:
-      - results/
-  rules:
-    - !reference [.common-rules, rules]
-    - !reference [.never-post-merge-rules, rules]
-
-.formatting-check:
-  # Cancel job if a newer commit is pushed to the same branch
-  interruptible: true
-  stage: code-validation
-  extends:
-    - .use-debian/arm64_build
-  variables:
-    GIT_STRATEGY: fetch
-  timeout: 10m
-  script:
-    - git diff --color=always --exit-code  # Fails if there are diffs
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
-
-.test-gl:
-  extends:
-    - .test
-    - .use-debian/x86_64_test-gl
-  needs:
-    - job: debian/x86_64_test-gl
-      optional: true
-    - job: debian-x86_64
-  variables:
-    DEBIAN_ARCH: amd64
-    S3_ARTIFACT_NAME: mesa-x86_64-default-debugoptimized
-
-.test-vk:
-  extends:
-    - .test
-    - .use-debian/x86_64_test-vk
-  needs:
-    - job: debian-x86_64
-    - job: debian/x86_64_test-vk
-      optional: true
-  variables:
-    DEBIAN_ARCH: amd64
-    S3_ARTIFACT_NAME: mesa-x86_64-default-debugoptimized
-
-.test-cl:
-  extends:
-    - .test
-    - .use-debian/x86_64_test-gl
-  needs:
-    - job: debian/x86_64_test-gl
-      optional: true
-  variables:
-    S3_ARTIFACT_NAME: mesa-x86_64-default-debugoptimized
-
-.test-android:
-  extends:
-    - .test
-    - .use-debian/x86_64_test-android
-  variables:
-    # This is for the guest artifacts from debian-android which will be
-    # downloaded explicitly by cuttlefish-runner.sh
-    S3_ANDROID_ARTIFACT_NAME: mesa-x86_64-android-debug
-    S3_ARTIFACT_NAME: mesa-x86_64-default-debugoptimized
-    # Set the default Vulkan driver to lavapipe for some preliminary checks
-    # that Cuttlefish always performs before starting the VM. This can be
-    # overwritten depending on the physical machine running the job.
-    VK_DRIVER: "lvp"
-  needs:
-    - job: debian-x86_64
-      artifacts: true  # On the host we want the Linux build
-    - job: debian-android
-      artifacts: false  # The Android build will be downloaded later
-    - job: debian/x86_64_test-android
-      artifacts: false
-      optional: true
-  timeout: 20m
-  script:
-    - ./install/cuttlefish-runner.sh
-  artifacts:
-    paths:
-      - results/
-
-.test-android-cts:
-  variables:
-    ANDROID_CTS_TAG: ${CONDITIONAL_BUILD_ANDROID_CTS_TAG}
-
-.test-angle:
-  variables:
-    ANGLE_TAG: ${CONDITIONAL_BUILD_ANGLE_TAG}
-
-.test-crosvm:
-  variables:
-    CROSVM_TAG: ${CONDITIONAL_BUILD_CROSVM_TAG}
-
-.test-fluster:
-  variables:
-    FLUSTER_TAG: ${CONDITIONAL_BUILD_FLUSTER_TAG}
-
-.test-piglit:
-  variables:
-    PIGLIT_TAG: ${CONDITIONAL_BUILD_PIGLIT_TAG}
-
-.test-vkd3d-proton:
-  variables:
-    VKD3D_PROTON_TAG: ${CONDITIONAL_BUILD_VKD3D_PROTON_TAG}
-    HWCI_TEST_SCRIPT: install/vkd3d-runner.sh
-
-.piglit-traces-test:
-  artifacts:
-    when: on_failure
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
-    reports:
-      junit: results/junit.xml
-    paths:
-      - results/
-    exclude:
-      - results/*.shader_cache
-  extends:
-    - .test-piglit
-  variables:
-    PIGLIT_CACHE_DIR: $CI_PROJECT_DIR
-    PIGLIT_REPLAY_EXTRA_ARGS: --db-path ${PIGLIT_CACHE_DIR}/replayer-db/ --minio_bucket=${S3_TRACIE_PUBLIC_BUCKET} --jwt-file=${S3_JWT_FILE}
-    PIGLIT_REPLAY_DEVICE_NAME: $GPU_VERSION
-    PIGLIT_RESULTS: "${GPU_VERSION}-replay"
-    PIGLIT_NO_WINDOW: 1
-    HWCI_TEST_SCRIPT: "install/piglit/piglit-traces.sh"
-    # For downloading traces:
-    CI_TRON_HTTP_ARTIFACT__TRACIE_PUBLIC__PATH: /caching_proxy/https://s3.freedesktop.org/mesa-tracie-public/(.*)
-    CI_TRON_HTTP_ARTIFACT__TRACIE_PUBLIC__URL: https://s3.freedesktop.org/mesa-tracie-public/\1
-    # For uploading renders:
-    # s3.fd.o redirects to hetzner, so we need that too
-    CI_TRON_PROXY__ALLOWED_ENDPOINTS_CATEGORY__S3__FDO: s3.freedesktop.org:443
-    CI_TRON_PROXY__ALLOWED_ENDPOINTS_CATEGORY__S3__BACKEND: fsn1.your-objectstorage.com:443
-
-.deqp-test:
-  script:
-    - if [ "${GIT_STRATEGY:-}" = none ]; then rm -rf results; fi  # Clear out old results if the docker container was cached
-    - ./install/deqp-runner.sh
-  artifacts:
-    exclude:
-      - results/*.shader_cache
-    reports:
-      junit: results/junit.xml
-
-.fossilize-test:
-  script:
-    - ./install/fossilize-runner.sh
-  artifacts:
-    when: on_failure
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
-    paths:
-      - results/
-
-.download_s3:
-  before_script:
-    - !reference [default, before_script]
-    # Use this instead of gitlab's artifacts download because it hits packet.net
-    # instead of fd.o.  Set FDO_HTTP_CACHE_URI to an http cache for your test lab to
-    # improve it even more (see https://docs.mesa3d.org/ci/bare-metal.html for
-    # setup).
-    - section_start artifacts_download "Downloading artifacts from s3"
-    # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
-    - if [ "${GIT_STRATEGY:-}" = none ]; then rm -rf install; fi
-    - (set -x; curl -L --retry 4 -f --retry-all-errors --retry-delay 60 ${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${S3_ARTIFACT_NAME}.tar.zst | tar --zstd -x)
-    - section_end artifacts_download
diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
deleted file mode 100644
index 66f5a9a..0000000
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ /dev/null
@@ -1,105 +0,0 @@
-include:
-  - local: '.gitlab-ci/test/gitlab-ci-inc.yml'
-
-mr-label-maker-test:
-  extends:
-    - .fdo.ci-fairy
-  stage: sanity
-  tags:
-    - placeholder-job
-  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
-
-rustfmt:
-  extends:
-    - .formatting-check
-    - .lint-rustfmt-rules
-  before_script:
-    - shopt -s globstar
-    - source "$HOME/.cargo/env"
-    - rustfmt --version
-    - rustfmt --verbose src/**/*.rs
-
-shader-db:
-  stage: code-validation
-  extends:
-    - .use-debian/x86_64_build
-  rules:
-    - !reference [.never-post-merge-rules, rules]
-    - !reference [.core-rules, rules]
-    # Keep this list in sync with the drivers tested in run-shader-db.sh
-    - !reference [.freedreno-common-rules, rules]
-    - !reference [.intel-common-rules, rules]
-    - !reference [.lima-rules, rules]
-    - !reference [.v3d-rules, rules]
-    - !reference [.vc4-rules, rules]
-    - !reference [.nouveau-rules, rules]
-    - !reference [.r300-rules, rules]
-    - !reference [.radeonsi-collabora-rules, rules]
-    # Also run if this job's own config or script changes
-    - changes:
-        - .gitlab-ci/build/gitlab-ci.yml
-        - .gitlab-ci/run-shader-db.sh
-  needs:
-    - debian-build-x86_64
-  variables:
-    S3_ARTIFACT_NAME: debian-build-x86_64
-  before_script:
-    - !reference [.download_s3, before_script]
-  script: |
-    .gitlab-ci/run-shader-db.sh
-  artifacts:
-    paths:
-      - shader-db
-  timeout: 15m
-
-yaml-toml-shell-py-test:
-  extends:
-    - .use-debian/arm64_build
-    - .no-auto-retry  # this job can't be flaky
-  stage: code-validation
-  script:
-    - uncollapsed_section_start tomllint "tomllint"
-    - echo "If your change looks right but this script rejects it, contact @eric (GitLab) / eric_engestrom (IRC)."
-    - python3 bin/toml_lint.py
-    - uncollapsed_section_switch yamllint "yamllint"
-    - .gitlab-ci/run-yamllint.sh
-    - uncollapsed_section_switch shellcheck "shellcheck"
-    - .gitlab-ci/run-shellcheck.sh
-    - section_end shellcheck
-    - .gitlab-ci/run-pytest.sh
-  rules:
-    - !reference [.never-post-merge-rules, rules]
-    - !reference [.no_scheduled_pipelines-rules, rules]
-    # merge pipeline
-    - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes: &lint_files
-        - .gitlab-ci/test/gitlab-ci.yml
-        - .gitlab-ci/**/*.sh
-        - .shellcheckrc
-        - bin/toml_lint.py
-        - src/**/ci/*.toml
-        - .gitlab-ci/lava/tests/**/*
-        - bin/ci/**/*
-      when: on_success
-    # direct pushes that bypassed the CI
-    - if: $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
-      changes: *lint_files
-      when: on_success
-    # direct pushes from release manager
-    - if: $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME =~ /^staging\//
-      changes: *lint_files
-      when: on_success
-    - changes: *lint_files
-      when: manual
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
diff --git a/.gitlab-ci/vkd3d-runner.sh b/.gitlab-ci/vkd3d-runner.sh
deleted file mode 100755
index f30c587..0000000
--- a/.gitlab-ci/vkd3d-runner.sh
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC1091 # paths only become valid at runtime
-
-. "${SCRIPTS_DIR}/setup-test-env.sh"
-
-set -eu -o pipefail
-
-comma_separated() {
-  local IFS=,
-  echo "$*"
-}
-
-if [[ -z "$VK_DRIVER" ]]; then
-    printf "VK_DRIVER is not defined\n"
-    exit 1
-fi
-
-if [ -z "$VKD3D_PROTON_TAG" ]; then
-    echo "VKD3D_PROTON_TAG must be set to the conditional build tag"
-    exit 1
-fi
-
-# Are we using the right vkd3d-proton version?
-ci_tag_test_time_check "VKD3D_PROTON_TAG"
-
-INSTALL=$(realpath -s "$PWD"/install)
-
-# Set up the driver environment.
-# Modifiying here directly LD_LIBRARY_PATH may cause problems when
-# using a command wrapper. Hence, we will just set it when running the
-# command.
-export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}:$INSTALL/lib/"
-
-
-# Set the Vulkan driver to use.
-ARCH=$(uname -m)
-export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json"
-
-# Set environment for Wine.
-export WINEDEBUG="-all"
-export WINEPREFIX="/vkd3d-proton-wine64"
-export WINEESYNC=1
-
-if [ -f "$INSTALL/$GPU_VERSION-vkd3d-skips.txt" ]; then
-  mapfile -t skips < <(grep -vE '^#|^$' "$INSTALL/$GPU_VERSION-vkd3d-skips.txt")
-  VKD3D_TEST_EXCLUDE=$(comma_separated "${skips[@]}")
-  printf 'VKD3D_TEST_EXCLUDE=%s\n' "$VKD3D_TEST_EXCLUDE"
-  export VKD3D_TEST_EXCLUDE
-fi
-
-# Sanity check to ensure that our environment is sufficient to make our tests
-# run against the Mesa built by CI, rather than any installed distro version.
-MESA_VERSION=$(cat "$INSTALL/VERSION")
-if ! vulkaninfo | grep driverInfo | tee /tmp/version.txt | grep -qF "Mesa $MESA_VERSION"; then
-    printf "%s\n" "Found $(cat /tmp/version.txt), expected $MESA_VERSION"
-    exit 1
-fi
-
-# Gather the list expected failures
-EXPECTATIONFILE="$RESULTS_DIR/$GPU_VERSION-vkd3d-fails.txt"
-if [ -f "$INSTALL/$GPU_VERSION-vkd3d-fails.txt" ]; then
-    # Ignore the grep "failure" if the file exists but contains only comments
-    # or empty lines; the expectation file used will be empty in this case,
-    # which is not a problem.
-    grep -vE '^(#|$)' "$INSTALL/$GPU_VERSION-vkd3d-fails.txt" | sort > "$EXPECTATIONFILE" || true
-else
-    printf "%s\n" "$GPU_VERSION-vkd3d-fails.txt not found, assuming a \"no failures\" baseline."
-    touch "$EXPECTATIONFILE"
-fi
-
-if [ -f "$INSTALL/$GPU_VERSION-vkd3d-flakes.txt" ]; then
-  mapfile -t flakes < <(grep -vE '^#|^$' "$INSTALL/$GPU_VERSION-vkd3d-flakes.txt")
-else
-  flakes=()
-fi
-
-# Some sanity checks before we start
-mapfile -t flakes_dups < <(
-  [ ${#flakes[@]} -eq 0 ] ||
-  printf '%s\n' "${flakes[@]}" | sort | uniq -d
-)
-if [ ${#flakes_dups[@]} -gt 0 ]; then
-  printf >&2 'Duplicate flakes lines:\n'
-  printf >&2 '  %s\n' "${flakes_dups[@]}"
-  exit 1
-fi
-
-flakes_in_baseline=()
-for flake in "${flakes[@]}"; do
-  if grep -qF "$flake" "$EXPECTATIONFILE"; then
-    flakes_in_baseline+=("$flake")
-  fi
-done
-if [ ${#flakes_in_baseline[@]} -gt 0 ]; then
-  printf >&2 "Flakes found in %s:\n" "$EXPECTATIONFILE"
-  printf >&2 '  %s\n' "${flakes_in_baseline[@]}"
-  exit 1
-fi
-
-printf "%s\n" "Running vkd3d-proton testsuite..."
-
-LOGFILE="$RESULTS_DIR/vkd3d-proton-log.txt"
-TEST_LOGS="/test-logs"
-pushd /vkd3d-proton-tests
-tests/test-runner.sh tests/d3d12 --jobs "${FDO_CI_CONCURRENT:-4}" --output-dir "$TEST_LOGS" | tee "$LOGFILE" || true
-popd
-
-printf '\n\n'
-
-# Print list of flakes seen this time
-flakes_seen=()
-for flake in "${flakes[@]}"; do
-  if grep -qF "FAILED $flake" "$LOGFILE"; then
-    flakes_seen+=("$flake")
-  fi
-done
-if [ ${#flakes_seen[@]} -gt 0 ]; then
-  # Keep this string and output format in line with the corresponding
-  # deqp-runner message
-  printf >&2 '\nSome known flakes found:\n'
-  printf >&2 '  %s\n' "${flakes_seen[@]}"
-fi
-
-# Collect all the failures; ignore grep "failure" if there are none
-fails_lines=$(grep -oE "^FAILED .+$" "$LOGFILE" | cut -d' ' -f2 | sort) || true
-if [ -n "$fails_lines" ]; then
-  mapfile -t fails < <(echo "$fails_lines")
-else
-  fails=()
-fi
-
-# Save test output for failed tests (before excluding flakes)
-for failed_test in "${fails[@]}"; do
-  cp "$TEST_LOGS/$failed_test.log" "$RESULTS_DIR/$failed_test.log"
-done
-
-# Ignore flakes when comparing
-for flake in "${flakes[@]}"; do
-  for idx in "${!fails[@]}"; do
-    grep -qF "$flake" <<< "${fails[$idx]}" && unset -v 'fails[$idx]'
-  done
-done
-
-RESULTSFILE="$RESULTS_DIR/$GPU_VERSION.txt"
-for failed_test in "${fails[@]}"; do
-  if ! grep -qE "$failed_test end" "$RESULTS_DIR/$failed_test.log"; then
-    test_status=Crash
-  elif grep -qE "Test failed:" "$RESULTS_DIR/$failed_test.log"; then
-    test_status=Fail
-  else
-    test_status=Unknown
-  fi
-  printf '%s,%s\n' "$failed_test" "$test_status"
-done > "$RESULTSFILE"
-
-# Catch tests listed but not executed or not failing
-mapfile -t expected_fail_lines < "$EXPECTATIONFILE"
-for expected_fail_line in "${expected_fail_lines[@]}"; do
-  test_name=$(cut -d, -f1 <<< "$expected_fail_line")
-  if [ ! -f "$TEST_LOGS/$test_name.log" ]; then
-    test_status='UnexpectedImprovement(Skip)'
-  elif [ ! -f "$RESULTS_DIR/$test_name.log" ]; then
-    test_status='UnexpectedImprovement(Pass)'
-  else
-    continue
-  fi
-  printf '%s,%s\n' "$test_name" "$test_status"
-done >> "$RESULTSFILE"
-
-mapfile -t unexpected_results < <(comm -23 <(sort "$RESULTSFILE") <(sort "$EXPECTATIONFILE"))
-if [ ${#unexpected_results[@]} -gt 0 ]; then
-  printf >&2 '\nUnexpected results:\n'
-  printf >&2 '  %s\n' "${unexpected_results[@]}"
-  exit 1
-fi
-
-exit 0
diff --git a/.gitlab-ci/windows/Dockerfile_build b/.gitlab-ci/windows/Dockerfile_build
deleted file mode 100644
index 46b51a7..0000000
--- a/.gitlab-ci/windows/Dockerfile_build
+++ /dev/null
@@ -1,18 +0,0 @@
-# escape=`
-
-ARG base_image
-FROM ${base_image}
-
-COPY mesa_deps_vulkan_sdk.ps1 C:\
-RUN C:\mesa_deps_vulkan_sdk.ps1
-
-COPY mesa_init_msvc.ps1 C:\
-
-COPY mesa_deps_libva.ps1 C:\
-RUN C:\mesa_deps_libva.ps1
-
-COPY mesa_deps_build.ps1 C:\
-RUN C:\mesa_deps_build.ps1
-
-# When building, `--isolation=process` can leverage all cores and memory
-# docker build --isolation=process -f .\Dockerfile_build -t mesa_dep --build-arg base_image=mesa_msvc .
diff --git a/.gitlab-ci/windows/Dockerfile_msvc b/.gitlab-ci/windows/Dockerfile_msvc
deleted file mode 100644
index 751383f..0000000
--- a/.gitlab-ci/windows/Dockerfile_msvc
+++ /dev/null
@@ -1,34 +0,0 @@
-# escape=`
-
-ARG base_image
-FROM ${base_image}
-
-# https://www.thomasmaurer.ch/2019/07/how-to-install-and-update-powershell-7/
-# Wrapping the following command in cmd.exe
-# iex "& { $(irm https://aka.ms/install-powershell.ps1) } -UseMSI -Quiet"
-RUN powershell -ExecutionPolicy RemoteSigned -Command "$ErrorActionPreference = 'Stop'; iex ""& { $(irm https://aka.ms/install-powershell.ps1) } -UseMSI -Quiet"""
-
-# Make sure any failure in PowerShell scripts is fatal
-SHELL ["pwsh", "-ExecutionPolicy", "RemoteSigned", "-Command", "$ErrorActionPreference = 'Stop';"]
-RUN Write-Output $PSVersionTable $ErrorActionPreference
-
-COPY mesa_deps_msvc.ps1 C:\
-RUN C:\mesa_deps_msvc.ps1
-
-COPY mesa_deps_winget.ps1 C:\
-RUN C:\mesa_deps_winget.ps1
-COPY mesa_deps_winget_settings.json C:\Users\ContainerAdministrator\AppData\Local\Microsoft\WinGet\Settings\defaultState\settings.json
-
-COPY mesa_deps_packages.ps1 C:\
-RUN C:\mesa_deps_packages.ps1
-
-# Example usage:
-# `base_image` should use windows image that can be run with `--isolation=process` option,
-# since the resulting container will want to be used that way be later containers in the build process.
-# Only --isolation=hyperv can succeed building this container locally,
-#   --isolation=process have network issue when installing Visual Studio and choco will crash
-# docker build --isolation=hyperv -f .\Dockerfile_msvc -t mesa_msvc --build-arg base_image="mcr.microsoft.com/windows:10.0.19041.1415" .
-
-# Example run:
-# docker run --isolation=hyperv -it --rm -v ${PWD}:${PWD} mesa_msvc pwsh -ExecutionPolicy RemoteSigned
-# docker run --isolation=process -it --rm -v ${PWD}:${PWD} mesa_msvc pwsh -ExecutionPolicy RemoteSigned
diff --git a/.gitlab-ci/windows/Dockerfile_test b/.gitlab-ci/windows/Dockerfile_test
deleted file mode 100644
index d75e2a8..0000000
--- a/.gitlab-ci/windows/Dockerfile_test
+++ /dev/null
@@ -1,25 +0,0 @@
-# escape=`
-
-ARG base_image
-FROM ${base_image}
-
-COPY mesa_deps_vulkan_sdk.ps1 C:\
-RUN C:\mesa_deps_vulkan_sdk.ps1
-
-COPY mesa_deps_d3d.ps1 C:\
-RUN C:\mesa_deps_d3d.ps1
-
-COPY mesa_deps_rust.ps1 C:\
-RUN C:\mesa_deps_rust.ps1
-
-COPY mesa_init_msvc.ps1 C:\
-
-COPY mesa_deps_libva.ps1 C:\
-RUN C:\mesa_deps_libva.ps1
-
-COPY mesa_deps_test_piglit.ps1 C:\
-RUN C:\mesa_deps_test_piglit.ps1
-COPY mesa_deps_test_deqp.ps1 c:\
-RUN C:\mesa_deps_test_deqp.ps1
-COPY mesa_deps_test.ps1 C:\
-RUN C:\mesa_deps_test.ps1
diff --git a/.gitlab-ci/windows/README.md b/.gitlab-ci/windows/README.md
deleted file mode 100644
index 8c8780a..0000000
--- a/.gitlab-ci/windows/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Native Windows GitLab CI builds
-
-Unlike Linux, Windows cannot reuse the freedesktop ci-templates as they exist
-as we do not have Podman, Skopeo, or even Docker-in-Docker builds available
-under Windows.
-
-We still reuse the same model: build a base container with the core operating
-system and infrequently-changed build dependencies, then execute Mesa builds
-only inside that base container. This is open-coded in PowerShell scripts.
-
-## Base container build
-
-The base container build job executes the `mesa_container.ps1` script which
-reproduces the ci-templates behaviour. It looks for the registry image in
-the user's namespace, and exits if found. If not found, it tries to copy
-the same image tag from the upstream Mesa repository. If that is not found,
-the image is rebuilt inside the user's namespace.
-
-The rebuild executes `docker build` which calls `mesa_deps.ps1` inside the
-container to fetch and install all build dependencies. This includes Visual
-Studio Community Edition (downloaded from Microsoft, under the license which
-allows use by open-source projects), other build tools from winget, and
-finally Meson and Python dependencies from PyPI.
-
-This job is executed inside a Windows shell environment directly inside the
-host, without Docker.
-
-## Mesa build
-
-The Mesa build runs inside the base container, executing `mesa_build.ps1`.
-This simply compiles Mesa using Meson and Ninja, executing the build and
-unit tests. Currently, no build artifacts are captured.
-
-## Using build scripts locally
-
-`*.ps1` scripts for building dockers are using PowerShell 7 to run
diff --git a/.gitlab-ci/windows/deqp_runner_run.ps1 b/.gitlab-ci/windows/deqp_runner_run.ps1
deleted file mode 100644
index 53d708e..0000000
--- a/.gitlab-ci/windows/deqp_runner_run.ps1
+++ /dev/null
@@ -1,38 +0,0 @@
-# VK_DRIVER_FILES environment variable is not used when running with
-# elevated privileges. Add a key to the registry instead.
-$hkey_path = "HKLM:\SOFTWARE\Khronos\Vulkan\Drivers\"
-$hkey_name = Join-Path -Path $pwd -ChildPath "_install\share\vulkan\icd.d\dzn_icd.x86_64.json"
-New-Item -Path $hkey_path -force
-New-ItemProperty -Path $hkey_path -Name $hkey_name -Value 0 -PropertyType DWORD
-
-$results = New-Item -ItemType Directory results
-$baseline = ".\_install\warp-fails.txt"
-$suite = ".\_install\deqp-dozen.toml"
-
-$jobs = ""
-if ($null -ne $env:FDO_CI_CONCURRENT) {
-  $jobs = "--jobs", "$($env:FDO_CI_CONCURRENT)"
-}
-if ($env:DEQP_FRACTION -eq $null) {
-  $env:DEQP_FRACTION = 1
-}
-
-$env:DZN_DEBUG = "warp"
-$env:MESA_VK_IGNORE_CONFORMANCE_WARNING = "true"
-deqp-runner suite --suite $($suite) `
---output $($results) `
---baseline $($baseline) `
---testlog-to-xml C:\deqp\executor\testlog-to-xml.exe `
---fraction $env:DEQP_FRACTION `
-$jobs
-$deqpstatus = $?
-
-$template = "See $($env:ARTIFACTS_BASE_URL)/results/{{testcase}}.xml"
-deqp-runner junit --testsuite dEQP --results "$($results)/failures.csv" --output "$($results)/junit.xml" --limit 50 --template $template
-Copy-Item -Path "C:\deqp\testlog.css" -Destination $($results)
-Copy-Item -Path "C:\deqp\testlog.xsl" -Destination $($results)
-Remove-Item -Path "$($results)/*.shader_cache"
-
-if (!$deqpstatus) {
-    Exit 1
-}
diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1
deleted file mode 100644
index 88bbd89..0000000
--- a/.gitlab-ci/windows/mesa_build.ps1
+++ /dev/null
@@ -1,93 +0,0 @@
-# Clear CI_COMMIT_MESSAGE and CI_COMMIT_DESCRIPTION for please meson
-# when the commit message is complicated
-$env:CI_COMMIT_MESSAGE=""
-$env:CI_COMMIT_DESCRIPTION=""
-
-# force the CA cert cache to be rebuilt, in case Meson tries to access anything
-Write-Host "Refreshing Windows TLS CA cache"
-(New-Object System.Net.WebClient).DownloadString("https://github.com") >$null
-
-$env:PYTHONUTF8=1
-
-Get-Date
-Write-Host "Compiling Mesa"
-$builddir = New-Item -Force -ItemType Directory -Name "_build"
-$installdir = New-Item -Force -ItemType Directory -Name "_install"
-$builddir=$builddir.FullName
-$installdir=$installdir.FullName
-$sourcedir=$PWD
-
-Remove-Item -Recurse -Force $builddir
-Remove-Item -Recurse -Force $installdir
-New-Item -ItemType Directory -Path $builddir
-New-Item -ItemType Directory -Path $installdir
-
-Write-Output "*" > $builddir\.gitignore
-Write-Output "*" > $installdir\.gitignore
-
-Write-Output builddir:$builddir
-Write-Output installdir:$installdir
-Write-Output sourcedir:$sourcedir
-
-$vcvars_ver_arg="$args"
-$MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent
-. "$MyPath\mesa_init_msvc.ps1" "$vcvars_ver_arg"
-
-$depsInstallPath="C:\mesa-deps"
-
-Push-Location $builddir
-
-meson setup `
---default-library=shared `
---buildtype=release `
---wrap-mode=nodownload `
--Db_ndebug=false `
--Db_vscrt=mt `
---cmake-prefix-path="$depsInstallPath" `
---pkg-config-path="$depsInstallPath\lib\pkgconfig;$depsInstallPath\share\pkgconfig" `
---prefix="$installdir" `
--Dllvm=enabled `
--Dshared-llvm=disabled `
--Dvulkan-drivers="swrast,amd,microsoft-experimental" `
--Dgallium-drivers="llvmpipe,softpipe,d3d12,zink,virgl" `
--Dgallium-va=enabled `
--Dgallium-d3d10umd=true `
--Dgallium-mediafoundation=enabled `
--Dvideo-codecs="all" `
--Dmediafoundation-codecs="all" `
--Dmediafoundation-store-dll=false `
--Dgallium-mediafoundation-test=false `
--Dgles1=enabled `
--Dgles2=enabled `
--Dgallium-rusticl=false `
--Dmicrosoft-clc=enabled `
--Dstatic-libclc=all `
--Dspirv-to-dxil=true `
--Dbuild-tests=true `
--Dwerror=true `
--Dwarning_level=2 `
-$env:EXTRA_MESON_ARGS `
-$sourcedir && `
-meson install && `
-meson test --num-processes 32 --print-errorlogs
-
-$buildstatus = $?
-Pop-Location
-
-Get-Date
-
-if (!$buildstatus) {
-  Write-Host "Mesa build or test failed"
-  Exit 1
-}
-
-Copy-Item ".\.gitlab-ci\windows\piglit_run.ps1" -Destination $installdir
-
-Copy-Item ".\.gitlab-ci\windows\spirv2dxil_check.ps1" -Destination $installdir
-Copy-Item ".\.gitlab-ci\windows\spirv2dxil_run.ps1" -Destination $installdir
-
-Copy-Item ".\.gitlab-ci\windows\deqp_runner_run.ps1" -Destination $installdir
-
-Copy-Item ".\.gitlab-ci\windows\vainfo_run.ps1" -Destination $installdir
-
-Get-ChildItem -Recurse -Filter "ci" | Get-ChildItem -Include "*.txt","*.toml" | Copy-Item -Destination $installdir
diff --git a/.gitlab-ci/windows/mesa_container.ps1 b/.gitlab-ci/windows/mesa_container.ps1
deleted file mode 100644
index cbb9e22..0000000
--- a/.gitlab-ci/windows/mesa_container.ps1
+++ /dev/null
@@ -1,58 +0,0 @@
-# Implements the equivalent of ci-templates container-ifnot-exists, using
-# Docker directly as we don't have buildah/podman/skopeo available under
-# Windows, nor can we execute Docker-in-Docker
-$registry_uri = $args[0]
-$registry_username = $args[1]
-$registry_password = $args[2]
-$registry_user_image = $args[3]
-$registry_central_image = $args[4]
-$build_dockerfile = $args[5]
-$registry_base_image = $args[6]
-
-Set-Location -Path ".\.gitlab-ci\windows"
-
-docker --config "windows-docker.conf" login -u "$registry_username" -p "$registry_password" "$registry_uri"
-if (!$?) {
-  Write-Host "docker login failed to $registry_uri"
-  Exit 1
-}
-
-# if the image already exists, don't rebuild it
-docker --config "windows-docker.conf" pull "$registry_user_image"
-if ($?) {
-  Write-Host "User image $registry_user_image already exists; not rebuilding"
-  docker --config "windows-docker.conf" logout "$registry_uri"
-  Exit 0
-}
-
-# if the image already exists upstream, copy it
-docker --config "windows-docker.conf" pull "$registry_central_image"
-if ($?) {
-  Write-Host "Copying central image $registry_central_image to user image $registry_user_image"
-  docker --config "windows-docker.conf" tag "$registry_central_image" "$registry_user_image"
-  docker --config "windows-docker.conf" push "$registry_user_image"
-  $pushstatus = $?
-  docker --config "windows-docker.conf" logout "$registry_uri"
-  if (!$pushstatus) {
-    Write-Host "Pushing image to $registry_user_image failed"
-    Exit 1
-  }
-  Exit 0
-}
-
-Write-Host "No image found at $registry_user_image or $registry_central_image; rebuilding"
-docker --config "windows-docker.conf" build --no-cache -t "$registry_user_image" -f "$build_dockerfile" --build-arg base_image="$registry_base_image" .
-if (!$?) {
-  Write-Host "Container build failed"
-  docker --config "windows-docker.conf" logout "$registry_uri"
-  Exit 1
-}
-Get-Date
-
-docker --config "windows-docker.conf" push "$registry_user_image"
-$pushstatus = $?
-docker --config "windows-docker.conf" logout "$registry_uri"
-if (!$pushstatus) {
-  Write-Host "Pushing image to $registry_user_image failed"
-  Exit 1
-}
diff --git a/.gitlab-ci/windows/mesa_deps_build.ps1 b/.gitlab-ci/windows/mesa_deps_build.ps1
deleted file mode 100644
index d4dfff7..0000000
--- a/.gitlab-ci/windows/mesa_deps_build.ps1
+++ /dev/null
@@ -1,171 +0,0 @@
-
-$MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent
-. "$MyPath\mesa_init_msvc.ps1" "-vcvars_ver=14.29"
-
-# we want more secure TLS 1.2 for most things, but it breaks SourceForge
-# downloads so must be done after winget use
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -bor [Net.SecurityProtocolType]::Tls13;
-
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue "deps" | Out-Null
-
-$depsInstallPath="C:\mesa-deps"
-
-Get-Date
-Write-Host "Cloning DirectX-Headers"
-git clone -b v1.619.1 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
-if (!$?) {
-  Write-Host "Failed to clone DirectX-Headers repository"
-  Exit 1
-}
-Write-Host "Building DirectX-Headers"
-$dxheaders_build = New-Item -ItemType Directory -Path ".\deps\DirectX-Headers" -Name "build"
-Push-Location -Path $dxheaders_build.FullName
-meson setup .. --backend=ninja -Dprefix="$depsInstallPath" --buildtype=release -Db_vscrt=mt && `
-ninja -j32 install
-$buildstatus = $?
-Pop-Location
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $dxheaders_build
-if (!$buildstatus) {
-  Write-Host "Failed to compile DirectX-Headers"
-  Exit 1
-}
-
-Get-Date
-Write-Host "Cloning zlib"
-git clone -b v1.3.1 --depth=1 https://github.com/madler/zlib deps/zlib
-if (!$?) {
-  Write-Host "Failed to clone zlib repository"
-  Exit 1
-}
-Write-Host "Downloading zlib meson build files"
-Invoke-WebRequest -Uri "https://wrapdb.mesonbuild.com/v2/zlib_1.3.1-1/get_patch" -OutFile deps/zlib.zip
-Expand-Archive -Path deps/zlib.zip -Destination deps/zlib
-# Wrap archive puts build files in a version subdir
-robocopy deps/zlib/zlib-1.3.1 deps/zlib /E
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path deps/zlib/zlib-1.3.1
-$zlib_build = New-Item -ItemType Directory -Path ".\deps\zlib" -Name "build"
-Push-Location -Path $zlib_build.FullName
-meson setup .. --backend=ninja -Dprefix="$depsInstallPath" --default-library=static --buildtype=release -Db_vscrt=mt && `
-ninja -j32 install
-$buildstatus = $?
-Pop-Location
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $zlib_build
-if (!$buildstatus) {
-  Write-Host "Failed to compile zlib"
-  Exit 1
-}
-
-Get-Date
-Write-Host "Cloning LLVM"
-git clone -b llvmorg-19.1.7 --depth=1 https://github.com/llvm/llvm-project deps/llvm-project
-if (!$?) {
-  Write-Host "Failed to clone LLVM repository"
-  Exit 1
-}
-
-Get-Date
-Write-Host "Cloning SPIRV-LLVM-Translator"
-git clone -b v19.1.10 https://github.com/KhronosGroup/SPIRV-LLVM-Translator deps/llvm-project/llvm/projects/SPIRV-LLVM-Translator
-if (!$?) {
-  Write-Host "Failed to clone SPIRV-LLVM-Translator repository"
-  Exit 1
-}
-
-Get-Date
-# slightly convoluted syntax but avoids the CWD being under the PS filesystem meta-path
-$llvm_build = New-Item -ItemType Directory -ErrorAction SilentlyContinue -Force -Path ".\deps\llvm-project" -Name "build"
-Push-Location -Path $llvm_build.FullName
-Write-Host "Compiling LLVM and Clang"
-cmake ../llvm `
--GNinja `
--DCMAKE_BUILD_TYPE=Release `
--DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded `
--DCMAKE_PREFIX_PATH="$depsInstallPath" `
--DCMAKE_INSTALL_PREFIX="$depsInstallPath" `
--DCMAKE_CXX_FLAGS="/utf-8" `
--DLLVM_ENABLE_PROJECTS="clang" `
--DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" `
--DLLVM_OPTIMIZED_TABLEGEN=TRUE `
--DLLVM_ENABLE_ASSERTIONS=TRUE `
--DLLVM_INCLUDE_UTILS=OFF `
--DLLVM_INCLUDE_RUNTIMES=OFF `
--DLLVM_INCLUDE_TESTS=OFF `
--DLLVM_INCLUDE_EXAMPLES=OFF `
--DLLVM_INCLUDE_GO_TESTS=OFF `
--DLLVM_INCLUDE_BENCHMARKS=OFF `
--DLLVM_BUILD_LLVM_C_DYLIB=OFF `
--DLLVM_ENABLE_DIA_SDK=OFF `
--DCLANG_BUILD_TOOLS=ON `
--DLLVM_SPIRV_INCLUDE_TESTS=OFF `
--DLLVM_ENABLE_ZLIB=OFF `
--Wno-dev && `
-ninja -j32 install
-$buildstatus = $?
-Pop-Location
-if (!$buildstatus) {
-  Write-Host "Failed to compile LLVM"
-  Exit 1
-}
-
-Get-Date
-$libclc_build = New-Item -ItemType Directory -Path ".\deps\llvm-project" -Name "build-libclc"
-Push-Location -Path $libclc_build.FullName
-Write-Host "Compiling libclc"
-# libclc can only be built with Ninja, because CMake's VS backend doesn't know how to compile new language types
-cmake ../libclc `
--GNinja `
--DCMAKE_BUILD_TYPE=Release `
--DCMAKE_CXX_FLAGS="-m64" `
--DCMAKE_POLICY_DEFAULT_CMP0091=NEW `
--DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded `
--DCMAKE_INSTALL_PREFIX="$depsInstallPath" `
--DLIBCLC_TARGETS_TO_BUILD="spirv-mesa3d-;spirv64-mesa3d-" && `
-ninja -j32 install
-$buildstatus = $?
-Pop-Location
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $libclc_build
-if (!$buildstatus) {
-  Write-Host "Failed to compile libclc"
-  Exit 1
-}
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $llvm_build
-
-Get-Date
-Write-Host "Cloning SPIRV-Tools"
-git clone -b "vulkan-sdk-$env:VULKAN_SDK_VERSION" --depth=1 https://github.com/KhronosGroup/SPIRV-Tools deps/SPIRV-Tools
-if (!$?) {
-  Write-Host "Failed to clone SPIRV-Tools repository"
-  Exit 1
-}
-git clone -b "vulkan-sdk-$env:VULKAN_SDK_VERSION" --depth=1 https://github.com/KhronosGroup/SPIRV-Headers deps/SPIRV-Tools/external/SPIRV-Headers
-if (!$?) {
-  Write-Host "Failed to clone SPIRV-Headers repository"
-  Exit 1
-}
-Write-Host "Building SPIRV-Tools"
-$spv_build = New-Item -ItemType Directory -Path ".\deps\SPIRV-Tools" -Name "build"
-Push-Location -Path $spv_build.FullName
-# SPIRV-Tools doesn't use multi-threaded MSVCRT, but we need it to
-cmake .. `
--GNinja `
--DCMAKE_BUILD_TYPE=Release `
--DCMAKE_POLICY_DEFAULT_CMP0091=NEW `
--DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded `
--DCMAKE_INSTALL_PREFIX="$depsInstallPath" && `
-ninja -j32 install
-$buildstatus = $?
-Pop-Location
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $spv_build
-if (!$buildstatus) {
-  Write-Host "Failed to compile SPIRV-Tools"
-  Exit 1
-}
-
-function Remove-Symlinks {
-  Get-ChildItem -Force -ErrorAction SilentlyContinue @Args | Where-Object { if($_.Attributes -match "ReparsePoint"){$_.Delete()} }
-}
-Remove-Symlinks -Path "deps" -Recurse
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path "deps" | Out-Null
-
-Get-Date
-Write-Host "Complete"
diff --git a/.gitlab-ci/windows/mesa_deps_d3d.ps1 b/.gitlab-ci/windows/mesa_deps_d3d.ps1
deleted file mode 100644
index a224e2a..0000000
--- a/.gitlab-ci/windows/mesa_deps_d3d.ps1
+++ /dev/null
@@ -1,49 +0,0 @@
-# Downloading specified D3D runtime
-# Touch this file needs update both WINDOWS_X64_BUILD_TAG WINDOWS_X64_TEST_TAG
-# This file needs run in administrator mode
-
-$ProgressPreference = "SilentlyContinue"
-
-$depsInstallPath="C:\mesa-deps"
-
-Write-Host "Downloading DirectX 12 Agility SDK at:"
-Get-Date
-Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.619.1 -OutFile 'agility.zip'
-Expand-Archive -Path 'agility.zip' -DestinationPath 'C:\agility'
-# Copy Agility SDK into mesa-deps\bin\D3D12
-New-Item -ErrorAction SilentlyContinue -ItemType Directory -Path $depsInstallPath\bin -Name 'D3D12'
-Copy-Item 'C:\agility\build\native\bin\x64\*.dll' -Destination $depsInstallPath\bin\D3D12
-Remove-Item 'agility.zip'
-Remove-Item -Recurse 'C:\agility'
-
-Write-Host "Downloading Updated WARP at:"
-Get-Date
-Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.WARP/1.0.11 -OutFile 'warp.zip'
-Expand-Archive -Path 'warp.zip' -DestinationPath 'C:\warp'
-# Copy WARP into mesa-deps\bin
-Copy-Item 'C:\warp\build\native\amd64\d3d10warp.dll' -Destination $depsInstallPath\bin
-Remove-Item 'warp.zip'
-Remove-Item -Recurse 'C:\warp'
-
-Write-Host "Downloading DirectXShaderCompiler release at:"
-Get-Date
-Invoke-WebRequest -Uri https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.8.2403/dxc_2024_03_07.zip -OutFile 'DXC.zip'
-Expand-Archive -Path 'DXC.zip' -DestinationPath 'C:\DXC'
-# No more need to get dxil.dll from the VS install
-Copy-Item 'C:\DXC\bin\x64\*.dll' -Destination 'C:\Windows\System32'
-Remove-Item -Recurse 'DXC.zip'
-Remove-Item -Recurse 'C:\DXC'
-
-Write-Host "Enabling developer mode at:"
-Get-Date
-# Create AppModelUnlock if it doesn't exist, required for enabling Developer Mode
-$RegistryKeyPath = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock"
-if (-not(Test-Path -Path $RegistryKeyPath)) {
-    New-Item -Path $RegistryKeyPath -ItemType Directory -Force
-}
-
-# Add registry value to enable Developer Mode
-New-ItemProperty -Path $RegistryKeyPath -Name AllowDevelopmentWithoutDevLicense -PropertyType DWORD -Value 1 -Force
-
-Write-Host "Complete download D3D at:"
-Get-Date
diff --git a/.gitlab-ci/windows/mesa_deps_libva.ps1 b/.gitlab-ci/windows/mesa_deps_libva.ps1
deleted file mode 100644
index 1fb201d..0000000
--- a/.gitlab-ci/windows/mesa_deps_libva.ps1
+++ /dev/null
@@ -1,85 +0,0 @@
-# Compiling libva/libva-utils deps
-
-$ProgressPreference = "SilentlyContinue"
-$MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent
-. "$MyPath\mesa_init_msvc.ps1" "-vcvars_ver=14.29"
-
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue "deps" | Out-Null
-$depsInstallPath="C:\mesa-deps"
-
-Write-Host "Cloning libva at:"
-Get-Date
-git clone https://github.com/intel/libva.git deps/libva
-if (!$?) {
-  Write-Host "Failed to clone libva repository"
-  Exit 1
-}
-
-Write-Host "Cloning libva finished at:"
-Get-Date
-
-Write-Host "Building libva at:"
-Get-Date
-
-Push-Location -Path ".\deps\libva"
-Write-Host "Checking out libva..."
-git checkout 2.21.0
-Pop-Location
-
-# libva already has a build dir in their repo, use builddir instead
-$libva_build = New-Item -ItemType Directory -Path ".\deps\libva" -Name "builddir"
-Push-Location -Path $libva_build.FullName
-meson setup .. -Dprefix="$depsInstallPath"
-ninja -j32 install
-$buildstatus = $?
-Pop-Location
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $libva_build
-if (!$buildstatus) {
-  Write-Host "Failed to compile libva"
-  Exit 1
-}
-
-Write-Host "Building libva finished at:"
-Get-Date
-
-Write-Host "Cloning libva-utils at:"
-Get-Date
-git clone https://github.com/intel/libva-utils.git deps/libva-utils
-if (!$?) {
-  Write-Host "Failed to clone libva-utils repository"
-  Exit 1
-}
-
-Write-Host "Cloning libva-utils finished at:"
-Get-Date
-
-Write-Host "Building libva-utils at:"
-Get-Date
-
-Push-Location -Path ".\deps\libva-utils"
-Write-Host "Checking out libva-utils..."
-git checkout 2.21.0
-Pop-Location
-
-Write-Host "Building libva-utils"
-# libva-utils already has a build dir in their repo, use builddir instead
-$libva_utils_build = New-Item -ItemType Directory -Path ".\deps\libva-utils" -Name "builddir"
-Push-Location -Path $libva_utils_build.FullName
-meson setup .. -Dprefix="$depsInstallPath" --pkg-config-path="$depsInstallPath\lib\pkgconfig;$depsInstallPath\share\pkgconfig"
-ninja -j32 install
-$buildstatus = $?
-Pop-Location
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $libva_utils_build
-if (!$buildstatus) {
-  Write-Host "Failed to compile libva-utils"
-  Exit 1
-}
-
-function Remove-Symlinks {
-  Get-ChildItem -Force -ErrorAction SilentlyContinue @Args | Where-Object { if($_.Attributes -match "ReparsePoint"){$_.Delete()} }
-}
-Remove-Symlinks -Path "deps" -Recurse
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path "deps" | Out-Null
-
-Write-Host "Building libva-utils finished at:"
-Get-Date
diff --git a/.gitlab-ci/windows/mesa_deps_msvc.ps1 b/.gitlab-ci/windows/mesa_deps_msvc.ps1
deleted file mode 100644
index 5f2a410..0000000
--- a/.gitlab-ci/windows/mesa_deps_msvc.ps1
+++ /dev/null
@@ -1,45 +0,0 @@
-# we want more secure TLS 1.2 for most things
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
-
-# VS17.x is 2022
-$msvc_url = 'https://aka.ms/vs/17/release/vs_buildtools.exe'
-
-Write-Host "Downloading Visual Studio 2022 build tools at:"
-Get-Date
-Invoke-WebRequest -Uri $msvc_url -OutFile C:\vs_buildtools.exe
-
-Write-Host "Installing Visual Studio 2022 at:"
-Get-Date
-# Command line
-# https://docs.microsoft.com/en-us/visualstudio/install/command-line-parameter-examples?view=vs-2022
-# Component ids
-# https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2022
-# https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-community?view=vs-2022
-Start-Process -NoNewWindow -Wait -FilePath C:\vs_buildtools.exe `
--ArgumentList `
-"--wait", `
-"--quiet", `
-"--norestart", `
-"--nocache", `
-"--installPath", "C:\BuildTools", `
-"--add", "Microsoft.VisualStudio.Component.VC.Redist.14.Latest", `
-"--add", "Microsoft.VisualStudio.Component.VC.ASAN", ` # MSVC 2022
-"--add", "Microsoft.VisualStudio.Component.VC.ATL", `
-"--add", "Microsoft.VisualStudio.Component.VC.ATLMFC", `
-"--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
-"--add", "Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64", `
-"--add", "Microsoft.VisualStudio.Component.VC.Llvm.Clang", `
-"--add", "Microsoft.VisualStudio.Component.Graphics.Tools", `
-"--add", "Microsoft.VisualStudio.Component.Windows10SDK.20348", `
-"--add", "Microsoft.VisualStudio.Component.Windows11SDK.26100"
-
-if (!$?) {
-  Write-Host "Failed to install Visual Studio tools"
-  Exit 1
-}
-Remove-Item C:\vs_buildtools.exe -Force
-
-Write-Host "Installing Visual Studio 2022 finished at:"
-Get-Date
-
-Exit 0
diff --git a/.gitlab-ci/windows/mesa_deps_packages.ps1 b/.gitlab-ci/windows/mesa_deps_packages.ps1
deleted file mode 100644
index 566735e..0000000
--- a/.gitlab-ci/windows/mesa_deps_packages.ps1
+++ /dev/null
@@ -1,96 +0,0 @@
-# Download new TLS certs from Windows Update
-Write-Host "Updating TLS certificate store at:"
-Get-Date
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue "_tlscerts" | Out-Null
-$certdir = (New-Item -ItemType Directory -Name "_tlscerts")
-certutil -syncwithWU "$certdir"
-Foreach ($file in (Get-ChildItem -Path "$certdir\*" -Include "*.crt")) {
-  Import-Certificate -FilePath $file -CertStoreLocation Cert:\LocalMachine\Root | Out-Null
-}
-Remove-Item -Recurse -Path $certdir
-
-Write-Host "Installing graphics tools (DirectX debug layer) at:"
-Get-Date
-Set-Service -Name wuauserv -StartupType Manual
-if (!$?) {
-  Write-Host "Failed to enable Windows Update"
-  Exit 1
-}
-
-For ($i = 0; $i -lt 5; $i++) {
-  Dism /online /quiet /add-capability /capabilityname:Tools.Graphics.DirectX~~~~0.0.1.0
-  $graphics_tools_installed = $?
-  if ($graphics_tools_installed) {
-    Break
-  }
-}
-
-if (!$graphics_tools_installed) {
-  Write-Host "Failed to install graphics tools"
-  Get-Content C:\Windows\Logs\DISM\dism.log
-  Exit 1
-}
-
-$USER_PATH=[System.Environment]::GetEnvironmentVariable('PATH', [System.EnvironmentVariableTarget]::User)
-$MACHINE_PATH=[System.Environment]::GetEnvironmentVariable('PATH', [System.EnvironmentVariableTarget]::Machine)
-Write-Output "Before winget install USER_PATH:$USER_PATH MACHINE_PATH:$MACHINE_PATH"
-
-$Packages = @(
-  'Microsoft.WindowsWDK.10.0.26100,10.1.26100.6584',
-  'Python.Python.3.13,3.13.9',
-  'Ninja-build.Ninja,1.13.1',
-  'Kitware.CMake,4.1.3',
-  'Git.Git,2.52.0',
-  'WinFlexBison.win_flex_bison,2.5.24',
-  'bloodrock.pkg-config-lite,0.28-1'
-)
-
-$ProgressPreference = "SilentlyContinue"
-New-Item -Force -ItemType 'directory' -Name 'flexbison' -Path 'C:\temp'
-foreach ($package in $Packages)
-{
-  $package_id, $package_version = $package -split ',', 2
-  Write-Output "Installing $package_id with version $package_version by winget"
-  For ($i = 0; $i -lt 5; $i++) {
-    winget install --verbose --silent --accept-package-agreements --source winget --exact --id $package_id --version $package_version --log C:\temp\wdk-install.log
-    $packages_installed = $?
-    if ($packages_installed) {
-      Break
-    }
-  }
-  if (!$packages_installed) {
-    Write-Host "Couldn't install $package with winget"
-    Exit 1
-  } else {
-    Write-Output "Installed $package with winget"
-  }
-}
-
-# The win_flex.exe should be directly accessed than use symbolic link https://github.com/lexxmark/winflexbison/issues/97
-$win_flex_target=((Get-ChildItem -Path (Get-Command win_flex).Path -Force | Select-Object Target).Target | Split-Path -Parent)
-$NEW_USER_PATH="$win_flex_target;"
-[Environment]::SetEnvironmentVariable('PATH', $NEW_USER_PATH + [Environment]::GetEnvironmentVariable('PATH', "User"), 'User')
-
-$USER_PATH=[System.Environment]::GetEnvironmentVariable('PATH', [System.EnvironmentVariableTarget]::User)
-$MACHINE_PATH=[System.Environment]::GetEnvironmentVariable('PATH', [System.EnvironmentVariableTarget]::Machine)
-Write-Output "After winget install USER_PATH:$USER_PATH MACHINE_PATH:$MACHINE_PATH"
-
-# Setup tmp path for git and python
-$env:PATH="$env:LOCALAPPDATA\Programs\Python\Python313\Scripts\;$env:LOCALAPPDATA\Programs\Python\Python313\;$env:ProgramFiles\Git\cmd;$env:PATH"
-
-Start-Process -NoNewWindow -Wait git -ArgumentList 'config --global core.autocrlf false'
-
-New-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" -Name "LongPathsEnabled" -Value 1 -PropertyType DWORD -Force
-
-Write-Host "Upgrading pip at:"
-Get-Date
-python -m pip install --upgrade pip --progress-bar off
-Write-Host "Installing python packages at:"
-Get-Date
-pip3 install packaging meson mako "numpy < 2.0" pyyaml --progress-bar off
-if (!$?) {
-  Write-Host "Failed to install dependencies from pip"
-  Exit 1
-}
-Write-Host "Installing python packages finished at:"
-Get-Date
diff --git a/.gitlab-ci/windows/mesa_deps_rust.ps1 b/.gitlab-ci/windows/mesa_deps_rust.ps1
deleted file mode 100644
index 0545d2e..0000000
--- a/.gitlab-ci/windows/mesa_deps_rust.ps1
+++ /dev/null
@@ -1,17 +0,0 @@
-# Installing rust compiler
-# Touch this file needs update both WINDOWS_X64_BUILD_TAG WINDOWS_X64_TEST_TAG
-# This file needs run in administrator mode
-
-$ProgressPreference = "SilentlyContinue"
-
-Write-Host "Installing rust at:"
-Get-Date
-$url = 'https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe';
-Write-Host ('Downloading {0} ...' -f $url);
-Invoke-WebRequest -Uri $url -OutFile 'rustup-init.exe';
-Write-Host "Installing rust toolchain"
-.\rustup-init.exe -y;
-Remove-Item rustup-init.exe;
-
-Write-Host "Installing rust finished at:"
-Get-Date
diff --git a/.gitlab-ci/windows/mesa_deps_test.ps1 b/.gitlab-ci/windows/mesa_deps_test.ps1
deleted file mode 100644
index d53157c..0000000
--- a/.gitlab-ci/windows/mesa_deps_test.ps1
+++ /dev/null
@@ -1,29 +0,0 @@
-# Compiling tests deps
-
-$ProgressPreference = "SilentlyContinue"
-$MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent
-. "$MyPath\mesa_init_msvc.ps1"
-
-$spirv_samples_source = Join-Path -Path "$PWD" -ChildPath "spirv-samples"
-
-Write-Host "Cloning spirv-samples at:"
-Get-Date
-New-Item -ItemType Directory -Path "$spirv_samples_source" | Out-Null
-Push-Location -Path $spirv_samples_source
-git init
-git remote add origin https://github.com/dneto0/spirv-samples.git
-git fetch --depth 1 origin 36372636df06a24c4e2de1551beee055db01b91d # of branch main
-if (!$?) {
-  Write-Host "Failed to fetch spirv-samples repository"
-  Pop-Location
-  Exit 1
-}
-git checkout FETCH_HEAD
-Pop-Location
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path "$spirv_samples_source\.git" | Out-Null
-
-Write-Host "Cloning spirv-samples finished at:"
-Get-Date
-
-Write-Host "Complete Dockerfile_test at:"
-Get-Date
diff --git a/.gitlab-ci/windows/mesa_deps_test_deqp.ps1 b/.gitlab-ci/windows/mesa_deps_test_deqp.ps1
deleted file mode 100644
index 8ee434a..0000000
--- a/.gitlab-ci/windows/mesa_deps_test_deqp.ps1
+++ /dev/null
@@ -1,90 +0,0 @@
-# Compiling deqp
-
-$ProgressPreference = "SilentlyContinue"
-$MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent
-. "$MyPath\mesa_init_msvc.ps1"
-
-$source_dir = Join-Path -Path "$PWD" -ChildPath "src"
-$deqp_source = Join-Path -Path "$source_dir" -ChildPath "VK-GL-CTS"
-$deqp_build = Join-Path -Path "$PWD" -ChildPath "deqp"
-
-Write-Host "Cloning Vulkan and GL Conformance Tests at:"
-Get-Date
-New-Item -ItemType Directory -Path "$deqp_source" | Out-Null
-Push-Location -Path $deqp_source
-git init
-git remote add origin https://github.com/KhronosGroup/VK-GL-CTS.git
-git fetch --depth 1 origin d48899f85b486a70d090af59a1453763458611d9 # of branch vulkan-cts-1.3.8
-if (!$?) {
-  Write-Host "Failed to fetch deqp repository"
-  Pop-Location
-  Exit 1
-}
-git checkout FETCH_HEAD
-
-Write-Host "Fetch sources inside $deqp_source at:"
-Get-Date
-# --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.
-py .\external\fetch_sources.py --insecure
-Pop-Location
-
-Write-Host "Compiling deqp at:"
-Get-Date
-New-Item -ItemType Directory -Path "$deqp_build" | Out-Null
-Push-Location -Path $deqp_build
-cmake -S $($deqp_source) `
--B . `
--GNinja `
--DCMAKE_BUILD_TYPE=Release `
--DCMAKE_POLICY_VERSION_MINIMUM="3.5" `
--DCMAKE_SYSTEM_VERSION="10.0.20348.0" `
--DDEQP_TARGET=default && `
-ninja -j32
-if (!$?) {
-  Write-Host "Failed to compile deqp"
-  Pop-Location
-  Exit 1
-}
-Pop-Location
-
-# Copy test result templates
-Copy-Item -Path "$($deqp_source)\doc\testlog-stylesheet\testlog.css" -Destination $deqp_build
-Copy-Item -Path "$($deqp_source)\doc\testlog-stylesheet\testlog.xsl" -Destination $deqp_build
-
-# Copy Vulkan must-pass list
-$deqp_mustpass = New-Item -ItemType Directory -Path $deqp_build -Name "mustpass"
-$root_mustpass = Join-Path -Path $deqp_source -ChildPath "external\vulkancts\mustpass\main"
-$files = Get-Content "$($root_mustpass)\vk-default.txt"
-foreach($file in $files) {
-  Get-Content "$($root_mustpass)\$($file)" | Add-Content -Path "$($deqp_mustpass)\vk-main.txt"
-}
-
-Write-Host "Installing deqp-runner at:"
-Get-Date
-$env:Path += ";$($env:USERPROFILE)\.cargo\bin"
-cargo install --git https://gitlab.freedesktop.org/anholt/deqp-runner.git --tag v0.16.1
-
-$depsInstallPath="C:\mesa-deps"
-$vk_cts_bin = "$deqp_build\external\vulkancts\modules\vulkan"
-
-# Hard link Agility SDK into subfolder of Vulkan CTS
-$agility_dest = New-Item -ItemType Directory -Path $vk_cts_bin -Name 'D3D12'
-New-Item -ItemType HardLink -path $agility_dest\D3D12Core.dll -Value $depsInstallPath\bin\D3D12\D3D12Core.dll
-New-Item -ItemType HardLink -path $agility_dest\d3d12SDKLayers.dll -Value $depsInstallPath\bin\D3D12\d3d12SDKLayers.dll
-
-# Hard link WARP next to Vulkan CTS
-New-Item -ItemType HardLink -path $vk_cts_bin\d3d10warp.dll -Value $depsInstallPath\bin\d3d10warp.dll
-
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path "$source_dir" | Out-Null
-
-# Cleanup deqp intermediate files
-Get-ChildItem -Force -ErrorAction SilentlyContinue -Recurse "$deqp_build" | Where-Object {
-  if($_.FullName -match "CMake|.git|.lib"){
-    Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $_.FullName | Out-Null
-  }
-}
-
-Write-Host "Compiling deqp finished at:"
-Get-Date
diff --git a/.gitlab-ci/windows/mesa_deps_test_piglit.ps1 b/.gitlab-ci/windows/mesa_deps_test_piglit.ps1
deleted file mode 100644
index 9909719..0000000
--- a/.gitlab-ci/windows/mesa_deps_test_piglit.ps1
+++ /dev/null
@@ -1,105 +0,0 @@
-# Compiling Piglit
-
-$ProgressPreference = "SilentlyContinue"
-$MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent
-. "$MyPath\mesa_init_msvc.ps1"
-
-$source_dir = Join-Path -Path "$PWD" -ChildPath "src"
-$waffle_source = Join-Path -Path "$source_dir" -ChildPath "waffle"
-$waffle_install = Join-Path -Path "$PWD" -ChildPath "waffle"
-$piglit_source = Join-Path -Path "$PWD" -ChildPath "Piglit"
-
-Write-Host "Cloning Waffle at:"
-Get-Date
-New-Item -ItemType Directory -Path "$waffle_source" | Out-Null
-Push-Location -Path $waffle_source
-git init
-git remote add origin https://gitlab.freedesktop.org/mesa/waffle.git
-git fetch --depth 1 origin 950a1f35a718bc2a8e1dda75845e52651bb331a7 # of branch master
-if (!$?) {
-  Write-Host "Failed to fetch Waffle repository"
-  Pop-Location
-  Exit 1
-}
-git checkout FETCH_HEAD
-Pop-Location
-
-Write-Host "Compiling Waffle at:"
-Get-Date
-$waffle_build = Join-Path -Path "$source_dir" -ChildPath "waffle\build"
-New-Item -ItemType Directory -Path "$waffle_build" | Out-Null
-Push-Location -Path $waffle_build
-meson setup `
---buildtype=release `
---default-library=static `
---prefix="$waffle_install" && `
-ninja -j32 install
-if (!$?) {
-  Write-Host "Failed to compile or install Waffle"
-  Pop-Location
-  Exit 1
-}
-Pop-Location
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path "$waffle_build" | Out-Null
-
-Write-Host "Downloading glext.h at:"
-Get-Date
-New-Item -ItemType Directory -Path "$source_dir\glext\GL" | Out-Null
-Invoke-WebRequest -Uri 'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/api/GL/glext.h' -OutFile "$source_dir\glext\GL\glext.h" | Out-Null
-
-Write-Host "Cloning Piglit at:"
-Get-Date
-New-Item -ItemType Directory -Path "$piglit_source" | Out-Null
-Push-Location -Path $piglit_source
-git init
-git remote add origin https://gitlab.freedesktop.org/mesa/piglit.git
-git fetch --depth 1 origin 814046fe6942eac660ee4a6cc5fcc54011a49945 # of branch main
-if (!$?) {
-  Write-Host "Failed to fetch Piglit repository"
-  Pop-Location
-  Exit 1
-}
-git checkout FETCH_HEAD
-
-Write-Host "Compiling Piglit at:"
-Get-Date
-cmake -S . -B . `
--GNinja `
--DCMAKE_BUILD_TYPE=Release `
--DPIGLIT_USE_WAFFLE=ON `
--DWaffle_INCLUDE_DIRS="$waffle_install\include\waffle-1" `
--DWaffle_LDFLAGS="$waffle_install\lib\libwaffle-1.a" `
--DCMAKE_POLICY_VERSION_MINIMUM="3.5" `
--DCMAKE_C_FLAGS="-D_UCRT_NOISY_NAN=1" `
--DGLEXT_INCLUDE_DIR="$source_dir\glext" && `
-ninja -j32
-if (!$?) {
-  Write-Host "Failed to compile Piglit"
-  Pop-Location
-  Exit 1
-}
-Pop-Location
-
-$depsInstallPath="C:\mesa-deps"
-$piglit_bin = "$piglit_source\bin"
-
-# Hard link Agility SDK into subfolder of piglit
-$agility_dest = New-Item -ItemType Directory -Path $piglit_bin -Name 'D3D12'
-New-Item -ItemType HardLink -path $agility_dest\D3D12Core.dll -Value $depsInstallPath\bin\D3D12\D3D12Core.dll
-New-Item -ItemType HardLink -path $agility_dest\d3d12SDKLayers.dll -Value $depsInstallPath\bin\D3D12\d3d12SDKLayers.dll
-
-# Hard link WARP next to piglit
-New-Item -ItemType HardLink -path $piglit_bin\d3d10warp.dll -Value $depsInstallPath\bin\d3d10warp.dll
-
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path "$source_dir" | Out-Null
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path "$waffle_install" | Out-Null
-
-# Cleanup piglit intermediate files
-Get-ChildItem -Force -ErrorAction SilentlyContinue -Recurse "$piglit_source" | Where-Object {
-  if($_.FullName -match "CMake|.git|.lib"){
-    Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $_.FullName | Out-Null
-  }
-}
-
-Write-Host "Compiling Piglit finished at:"
-Get-Date
diff --git a/.gitlab-ci/windows/mesa_deps_vulkan_sdk.ps1 b/.gitlab-ci/windows/mesa_deps_vulkan_sdk.ps1
deleted file mode 100644
index 74e0b13..0000000
--- a/.gitlab-ci/windows/mesa_deps_vulkan_sdk.ps1
+++ /dev/null
@@ -1,26 +0,0 @@
-# Downloading specified vulkan sdk and vulkan runtime
-# Touch this file needs update both WINDOWS_X64_BUILD_TAG WINDOWS_X64_TEST_TAG
-# This file needs run in administrator mode
-
-$env:VULKAN_SDK_VERSION="1.4.304.0"
-
-$ProgressPreference = "SilentlyContinue"
-
-# Save environment VULKAN_SDK_VERSION to system
-[System.Environment]::SetEnvironmentVariable('VULKAN_SDK_VERSION', "$env:VULKAN_SDK_VERSION", [System.EnvironmentVariableTarget]::Machine)
-
-$VULKAN_SDK_URL="https://sdk.lunarg.com/sdk/download/$env:VULKAN_SDK_VERSION/windows/VulkanSDK-$env:VULKAN_SDK_VERSION-Installer.exe"
-Write-Host "Downloading Vulkan-SDK $VULKAN_SDK_URL at:"
-Get-Date
-Invoke-WebRequest -Uri "$VULKAN_SDK_URL" -OutFile "${env:TMP}\vulkan_sdk.exe" | Out-Null
-Write-Host "Installing Vulkan-SDK at:"
-Get-Date
-Start-Process -NoNewWindow -Wait "${env:TMP}\vulkan_sdk.exe" -ArgumentList "--am --al -c in"
-if (!$?) {
-    Write-Host "Failed to install Vulkan SDK"
-    Exit 1
-}
-Remove-Item "${env:TMP}\vulkan_sdk.exe" -Force
-
-Write-Host "Installing Vulkan-Runtime finished at:"
-Get-Date
diff --git a/.gitlab-ci/windows/mesa_deps_winget.ps1 b/.gitlab-ci/windows/mesa_deps_winget.ps1
deleted file mode 100644
index 1d62fbc..0000000
--- a/.gitlab-ci/windows/mesa_deps_winget.ps1
+++ /dev/null
@@ -1,21 +0,0 @@
-# According to https://github.com/microsoft/winget-cli/issues/3037#issuecomment-2155167046
-Write-Host "Install winget"
-New-Item -Force -ItemType 'directory' -Name 'winget-cli' -Path 'C:/temp'
-Invoke-WebRequest 'https://aka.ms/vs/16/release/vc_redist.x64.exe' -OutFile 'C:/temp/vc_redist.x64.exe' -UseBasicParsing
-powershell -c C:/temp/vc_redist.x64.exe /install /quiet /norestart
-Invoke-WebRequest 'https://aka.ms/getwinget' -OutFile 'C:/temp/winget-cli/winget.zip' -UseBasicParsing
-Expand-Archive -LiteralPath 'C:/temp/winget-cli/winget.zip' -DestinationPath 'C:/temp/winget-cli' -Force
-Move-Item -Path 'C:/temp/winget-cli/AppInstaller_x64.msix' -Destination 'C:/temp/winget-cli/AppInstaller_x64.zip'
-Expand-Archive -LiteralPath 'C:/temp/winget-cli/AppInstaller_x64.zip' -DestinationPath 'C:/temp/winget-cli' -Force
-New-Item -Force -ItemType 'directory' -Name 'winget-cli' -Path 'C:/'
-Move-Item -Path 'C:/temp/winget-cli/winget.exe' -Destination 'C:/winget-cli/winget.exe'
-Move-Item -Path 'C:/temp/winget-cli/WindowsPackageManager.dll' -Destination 'C:/winget-cli/WindowsPackageManager.dll'
-Move-Item -Path 'C:/temp/winget-cli/resources.pri' -Destination 'C:/winget-cli'
-
-$env:PATH="C:/winget-cli;$env:PATH"
-winget settings export
-
-$NEW_USER_PATH="$env:LOCALAPPDATA\Microsoft\WinGet\Links;C:\winget-cli;"
-[Environment]::SetEnvironmentVariable('PATH', $NEW_USER_PATH + [Environment]::GetEnvironmentVariable('PATH', "User"), 'User')
-Remove-Item -Recurse -Path "C:/temp"
-Write-Host "Install winget done"
diff --git a/.gitlab-ci/windows/mesa_deps_winget_settings.json b/.gitlab-ci/windows/mesa_deps_winget_settings.json
deleted file mode 100644
index 01f7d93..0000000
--- a/.gitlab-ci/windows/mesa_deps_winget_settings.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "$schema": "https://aka.ms/winget-settings.schema.json",
-    "installBehavior": {
-        "archiveExtractionMethod": "tar"
-    }
-}
diff --git a/.gitlab-ci/windows/mesa_init_msvc.ps1 b/.gitlab-ci/windows/mesa_init_msvc.ps1
deleted file mode 100644
index 63934c9..0000000
--- a/.gitlab-ci/windows/mesa_init_msvc.ps1
+++ /dev/null
@@ -1,17 +0,0 @@
-$vsInstallPath=& "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -version 16.0  -property installationpath
-Write-Output "vswhere.exe installPath: $vsInstallPath"
-$vsInstallPath =  if ("$vsInstallPath" -eq "" ) { "C:\BuildTools" } else { "$vsInstallPath" }
-Write-Output "Final installPath: $vsInstallPath"
-Import-Module (Join-Path $vsInstallPath "Common7\Tools\Microsoft.VisualStudio.DevShell.dll")
-# https://en.wikipedia.org/wiki/Microsoft_Visual_C%2B%2B
-# VS2015 14.0 use -vcvars_ver=14.0
-# VS2017 14.1 to 14.16 use -vcvars_ver=14.16
-# VS2019 14.20 to 14.29 use -vcvars_ver=14.29
-# VS2022 14.30 to 14.38 (not finished yet) use -vcvars_ver=14 to choose the newest version
-
-$vcvars_ver_arg="$args"
-if ($null -eq $vcvars_ver_arg[0]) {
-  $vcvars_ver_arg="-vcvars_ver=14"
-}
-
-Enter-VsDevShell -VsInstallPath $vsInstallPath -SkipAutomaticLocation -DevCmdArguments "$vcvars_ver_arg -arch=x64 -no_logo -host_arch=amd64"
diff --git a/.gitlab-ci/windows/piglit_run.ps1 b/.gitlab-ci/windows/piglit_run.ps1
deleted file mode 100644
index c51138c..0000000
--- a/.gitlab-ci/windows/piglit_run.ps1
+++ /dev/null
@@ -1,19 +0,0 @@
-$env:PIGLIT_NO_FAST_SKIP = 1
-$env:PIGLIT_SPIRV_AS_BINARY = "C:\VulkanSDK\$env:VULKAN_SDK_VERSION\Bin\spirv-as.exe"
-
-Copy-Item -Path _install\bin\opengl32.dll -Destination C:\Piglit\bin\opengl32.dll
-Copy-Item -Path _install\bin\libgallium_wgl.dll -Destination C:\Piglit\bin\libgallium_wgl.dll
-
-$jobs = ""
-if ($null -ne $env:FDO_CI_CONCURRENT) {
-  $jobs = "--jobs", "$($env:FDO_CI_CONCURRENT)"
-}
-
-deqp-runner suite --output .\logs --suite "_install/$env:PIGLIT_SUITE" `
-  --skips "_install/$env:PIGLIT_SKIPS" `
-  --baseline "_install/$env:PIGLIT_BASELINE" `
-  --flakes "_install/$env:PIGLIT_FLAKES" `
-  $jobs
-if (!$?) {
-  Exit 1
-}
diff --git a/.gitlab-ci/windows/spirv2dxil_check.ps1 b/.gitlab-ci/windows/spirv2dxil_check.ps1
deleted file mode 100644
index 94735c9..0000000
--- a/.gitlab-ci/windows/spirv2dxil_check.ps1
+++ /dev/null
@@ -1,46 +0,0 @@
-$exec_mode_to_stage = @{ Fragment = "fragment"; Vertex = "vertex"; GLCompute = "compute" }
-
-$spvasm_files = (Get-ChildItem C:\spirv-samples\spvasm\*.spvasm) | Sort-Object Name
-foreach ($spvasm in $spvasm_files) {
-    $test_name = "Test:$($spvasm.Name):"
-    $spvfile = ($spvasm -replace '\.spvasm$', '.spv')
-    $content = Get-Content $spvasm
-    $spv_version = "1.0"
-    if ($content | Where-Object { $_ -match 'Version:\s(\d+\.\d+)' }) {
-        $spv_version = $Matches[1]
-    }
-    
-    $as_output = . "$env:VULKAN_SDK\Bin\spirv-as.exe" --target-env spv$spv_version --preserve-numeric-ids -o $spvfile $spvasm 2>&1 | % { if ($_ -is [System.Management.Automation.ErrorRecord]) { $_.Exception.Message } else { $_ } }  | Out-String
-    if ($LASTEXITCODE -ne 0) {
-        Write-Output "$test_name Skip: Unable to assemble shader"
-        Write-Output "$as_output`n"
-        continue
-    }
-
-    $entry_points = $content | Select-String -Pattern '^OpEntryPoint\s(\w+)[^"]+"(\w+)"' | Select-Object -ExpandProperty Matches -First 1
-    if ($entry_points.Count -eq 0) {
-        Write-Output "$test_name Skip"
-        Write-Output "No OpEntryPoint not found`n"
-        continue
-    }
-
-    foreach ($match in $entry_points) {
-        $exec_mode, $entry_point = $match.Groups[1].Value, $match.Groups[2].Value
-        $subtest = "$test_name$entry_point|${exec_mode}:"
-        $stage = $exec_mode_to_stage[$exec_mode]
-        if ($stage -eq '') {
-            Write-Output "$subtest Fail: Unknown shader type ($exec_mode)"
-            continue
-        }
-        
-        $s2d_output = .\_install\bin\spirv2dxil.exe -v -e "$entry_point" -s "$stage" -o NUL $spvfile 2>&1 | ForEach-Object { if ($_ -is [System.Management.Automation.ErrorRecord]) { $_.Exception.Message } else { $_ } }  | Out-String
-        if ($LASTEXITCODE -eq 0) {
-            Write-Output "$subtest Pass"
-        }
-        else {
-            Write-Output "$subtest Fail"
-            $sanitized_output = $s2d_output -replace ', file .+, line \d+' -replace '    In file .+:\d+'
-            Write-Output "$sanitized_output`n"
-        }
-    }
-}
diff --git a/.gitlab-ci/windows/spirv2dxil_run.ps1 b/.gitlab-ci/windows/spirv2dxil_run.ps1
deleted file mode 100644
index ae6c1c2..0000000
--- a/.gitlab-ci/windows/spirv2dxil_run.ps1
+++ /dev/null
@@ -1,16 +0,0 @@
-. .\_install\spirv2dxil_check.ps1 2>&1 | Set-Content -Path .\spirv2dxil_results.txt
-$reference = Get-Content .\_install\spirv2dxil_reference.txt
-$result = Get-Content .\spirv2dxil_results.txt
-if (-Not ($reference -And $result)) {
-    Exit 1
-}
-  
-$diff = Compare-Object -ReferenceObject $reference -DifferenceObject $result
-if (-Not $diff) {
-    Exit 0
-}
-
-Write-Host "Unexpected change in results:"
-Write-Output $diff | Format-Table -Property SideIndicator, InputObject -Wrap
-
-Exit 1
diff --git a/.gitlab-ci/windows/vainfo_run.ps1 b/.gitlab-ci/windows/vainfo_run.ps1
deleted file mode 100644
index a02e6c5..0000000
--- a/.gitlab-ci/windows/vainfo_run.ps1
+++ /dev/null
@@ -1,99 +0,0 @@
-
-function Deploy-Dependencies {
-  param (
-    [string] $deploy_directory
-  )
-  
-  Write-Host "Copying libva runtime and driver at:"
-  Get-Date
-
-  # Copy the VA runtime binaries from the mesa built dependencies so the versions match with the built mesa VA driver binary
-  $depsInstallPath="C:\mesa-deps"
-  Copy-Item "$depsInstallPath\bin\vainfo.exe" -Destination "$deploy_directory\vainfo.exe"
-  Copy-Item "$depsInstallPath\bin\va_win32.dll" -Destination "$deploy_directory\va_win32.dll"
-  Copy-Item "$depsInstallPath\bin\va.dll" -Destination "$deploy_directory\va.dll"
-
-  # Copy Agility SDK into D3D12 subfolder of vainfo
-  New-Item -ItemType Directory -Force -Path "$deploy_directory\D3D12" | Out-Null
-  Copy-Item "$depsInstallPath\bin\D3D12\D3D12Core.dll" -Destination "$deploy_directory\D3D12\D3D12Core.dll"
-  Copy-Item "$depsInstallPath\bin\D3D12\d3d12SDKLayers.dll" -Destination "$deploy_directory\D3D12\d3d12SDKLayers.dll"
-
-  # Copy WARP next to vainfo
-  Copy-Item "$depsInstallPath\bin\d3d10warp.dll" -Destination "$deploy_directory\d3d10warp.dll"
-
-  Write-Host "Copying libva runtime and driver finished at:"
-  Get-Date
-}
-
-function Check-VAInfo-Entrypoint {
-  param (
-    [string] $vainfo_app_path,
-    [string] $entrypoint
-  )
-
-  $vainfo_run_cmd = "$vainfo_app_path --display win32 --device 0 2>&1 | Select-String $entrypoint -Quiet"
-  Write-Host "Running: $vainfo_run_cmd"
-  $vainfo_ret_code= Invoke-Expression $vainfo_run_cmd
-  if (-not($vainfo_ret_code)) {
-      return 0
-  }
-  return 1
-}
-
-# Set testing environment variables
-$successful_run=1
-$testing_dir="$PWD\_install\bin" # vaon12_drv_video.dll is placed on this directory by the build
-$vainfo_app_path = "$testing_dir\vainfo.exe"
-
-# Deploy vainfo and dependencies
-Deploy-Dependencies -deploy_directory $testing_dir
-
-# Set VA runtime environment variables
-$env:LIBVA_DRIVER_NAME="vaon12"
-$env:LIBVA_DRIVERS_PATH="$testing_dir"
-
-Write-Host "LIBVA_DRIVER_NAME: $env:LIBVA_DRIVER_NAME"
-Write-Host "LIBVA_DRIVERS_PATH: $env:LIBVA_DRIVERS_PATH"
-
-# Check video processing entrypoint is supported
-# Inbox WARP/D3D12 supports this entrypoint with VA frontend shaders support (e.g no video APIs support required)
-$entrypoint = "VAEntrypointVideoProc"
-
-# First run without app verifier
-Write-Host "Disabling appverifier for $vainfo_app_path and checking for the presence of $entrypoint supported..."
-appverif.exe /disable * -for "$vainfo_app_path"
-$result_without_appverifier = Check-VAInfo-Entrypoint -vainfo_app_path $vainfo_app_path -entrypoint $entrypoint
-if ($result_without_appverifier -eq 1) {
-  Write-Host "Process exited successfully."
-} else {
-  $successful_run=0
-  Write-Error "Process exit not successful for $vainfo_run_cmd. Please see vainfo verbose output below for diagnostics..."
-  # verbose run to print more info on error (helpful to investigate issues from the CI output)
-  Invoke-Expression "$vainfo_app_path -a --display win32 --device help"
-  Invoke-Expression "$vainfo_app_path -a --display win32 --device 0"
-}
-
-# Enable appverif and run again
-Write-Host "Enabling appverifier for $vainfo_app_path and checking for the presence of $entrypoint supported..."
-appverif.exe /logtofile enable
-appverif.exe /verify "$vainfo_app_path"
-appverif.exe /enable "Leak" -for "$vainfo_app_path"
-$verifier_log_path="$testing_dir\vainfo_appverif_log.xml"
-$result_with_appverifier = Check-VAInfo-Entrypoint -vainfo_app_path $vainfo_app_path -entrypoint $entrypoint
-if ($result_with_appverifier -eq 1) {
-  Write-Host "Process exited successfully."
-  appverif.exe /logtofile disable
-} else {
-  Write-Host "Process failed. Please see Application Verifier log contents below."
-  # Need to wait for appverif to exit before gathering log
-  Start-Process -Wait -FilePath "appverif.exe" -ArgumentList "-export", "log", "-for", "$vainfo_app_path", "-with", "to=$verifier_log_path"
-  Get-Content $verifier_log_path
-  Write-Error "Process exit not successful for $vainfo_run_cmd."
-  appverif.exe /logtofile disable
-  $successful_run=0
-}
-
-if ($successful_run -ne 1) {
-  Exit 1
-}
-
diff --git a/.gitlab/issue_templates/Bug Report - AMD Radeon Vulkan.md b/.gitlab/issue_templates/Bug Report - AMD Radeon Vulkan.md
deleted file mode 100644
index 3a6b12c..0000000
--- a/.gitlab/issue_templates/Bug Report - AMD Radeon Vulkan.md	
+++ /dev/null
@@ -1,75 +0,0 @@
-### Before submitting your bug report:
-- Check if a new version of Mesa is available which might have fixed the problem.
-- If you can, check if the latest development version (git main) works better.
-- Check if your bug has already been reported here.
-- For any logs, backtraces, etc - use [code blocks](https://docs.gitlab.com/user/markdown/#code-spans-and-blocks), GitLab removes line breaks without this.
-   - Do not paste long logs directly into the description. Use https://gitlab.freedesktop.org/-/snippets/new, attachments, or a pastebin with a long expiration instead.
-- As examples of good bug reports you may review one of these - #2598, #2615, #2608
-
-
-Otherwise, fill the requested information below.
-And please remove anything that doesn't apply to keep things readable :)
-
-
-The title should effectively distinguish this bug report from others and be specific to issue you encounter. When writing the title of the bug report, include a short description of the issue, the hardware/driver(s) affected and application(s) affected.
-
-
-### Description
-
-Describe what you are doing, what you expect and what you're
-seeing instead. How frequent is the issue? Is it a one time occurrence? Does it appear multiple times but randomly? Can you easily reproduce it?
-
-"It doesn't work" usually is not a helpful description of an issue.
-The more detail about how things are going wrong, the better.
-
-### Screenshots/video files
-
-For rendering errors, attach screenshots of the problem and (if possible) of how it should look. For freezes, it may be useful to provide a screenshot of the affected game scene. Prefer screenshots over videos.
-
-### Log files (for system lockups / game freezes / crashes)
-
-- Backtrace (for crashes)
-- Output of `dmesg`
-- Hang reports: Follow the steps described [here](https://docs.mesa3d.org/drivers/amd/hang-debugging.html#radv-debug-hang) and attach the files created in `$HOME/radv_dumps_*/`.
-
-### Steps to reproduce
-
-How can Mesa developers reproduce the issue? When reporting a game issue, start explaining from a fresh save file and don't assume prior knowledge of the game's story.
-
-Example:
-
-1. `Start new game and enter second mission (takes about 10 minutes)`
-2. `Talk to the NPC called "Frank"`
-3. `Observe flickering on Frank's body`
-
-### System information
-
-Please post `inxi -GSC -xx` output ([fenced with triple backticks](https://docs.gitlab.com/user/markdown/#code-spans-and-blocks)) OR fill information below manually
-
-
-- OS: (`cat /etc/os-release | grep "NAME"`)
-- GPU: (`lspci -nn | grep VGA` or `lshw -C display -numeric`)
-- Kernel version: (`uname -a`)
-- Mesa version: (`glxinfo -B | grep "OpenGL version string"`)
-- Desktop environment: (`env | grep XDG_CURRENT_DESKTOP`)
-
-#### If applicable
-- Xserver version: (`sudo X -version`)
-- DXVK version:
-- Wine/Proton version:
-
-
-### Regression
-
-Did it used to work in a previous Mesa version? It can greatly help to know when the issue started.
-
-
-### API captures (if applicable, optional)
-
-Consider recording a [GFXReconstruct](https://github.com/LunarG/gfxreconstruct/blob/dev/USAGE_desktop_Vulkan.md) (preferred), [RenderDoc](https://renderdoc.org/), or [apitrace](https://github.com/apitrace/apitrace/blob/master/docs/USAGE.markdown) capture of the issue with the RADV driver active. This can tremendously help when debugging issues, but you're still encouraged to report issues if you can't provide a capture file.
-
-### Further information (optional)
-
-Does the issue reproduce with the LLVM backend (`RADV_DEBUG=llvm`) or on the AMDGPU-PRO drivers?
-
-Does your environment set any of the variables `ACO_DEBUG`, `RADV_DEBUG`, `RADV_PERFTEST` and `RADV_EXPERIMENTAL`?
diff --git a/.gitlab/issue_templates/Bug Report.md b/.gitlab/issue_templates/Bug Report.md
deleted file mode 100644
index f4e5824..0000000
--- a/.gitlab/issue_templates/Bug Report.md	
+++ /dev/null
@@ -1,58 +0,0 @@
-### Before submitting your bug report:
-- Check if a new version of Mesa is available which might have fixed the problem.
-- If you can, check if the latest development version (git main) works better.
-- Check if your bug has already been reported here.
-- For any logs, backtraces, etc - use [code blocks](https://docs.gitlab.com/user/markdown/#code-spans-and-blocks), GitLab removes line breaks without this.
-   - Do not paste long logs directly into the description. Use https://gitlab.freedesktop.org/-/snippets/new, attachments, or a pastebin with a long expiration instead.
-- As examples of good bug reports you may review one of these - #2598, #2615, #2608
-
-
-Otherwise, please fill the requested information below.
-And please remove anything that doesn't apply to keep things readable :)
-
-
-The title should effectively distinguish this bug report from others and be specific to issue you encounter. When writing the title of the bug report, include a short description of the issue, the hardware/driver(s) affected and application(s) affected.
-
-
-### System information
-
-Please post `inxi -GSC -xx` output ([fenced with triple backticks](https://docs.gitlab.com/user/markdown/#code-spans-and-blocks)) OR fill information below manually
-
-
-- OS: (`cat /etc/os-release | grep "NAME"`)
-- GPU: (`lspci -nn | grep VGA` or `lshw -C display -numeric`)
-- Kernel version: (run `uname -a`)
-- Mesa version: (`glxinfo -B | grep "OpenGL version string"`)
-- Xserver version (if applicable): (`sudo X -version`)
-- Desktop manager and compositor:
-
-#### If applicable
-- DXVK version:
-- Wine/Proton version:
-
-
-### Describe the issue
-
-Please describe what you are doing, what you expect and what you're
-seeing instead.  How frequent is the issue? Is it a one time occurrence? Does it appear multiple times but randomly? Can you easily reproduce it?
-
-"It doesn't work" usually is not a helpful description of an issue. 
-The more detail about how things are going wrong, the better.
-
-
-### Regression
-
-Did it used to work? It can greatly help to know when the issue started.
-
-
-### Log files as attachment
-- Output of `dmesg`
-- Backtrace
-- Gpu hang details
-
-
-### Screenshots/video files (if applicable)
-
-
-
-### Any extra information would be greatly appreciated
diff --git a/.gitlab/merge_request_templates/Default.md b/.gitlab/merge_request_templates/Default.md
deleted file mode 100644
index 131e86e..0000000
--- a/.gitlab/merge_request_templates/Default.md
+++ /dev/null
@@ -1,6 +0,0 @@
-### What does this MR do and why?
-<!-- Describe in detail what your merge request does and why. -->
-
-```
-%{first_multiline_commit}
-```

src / upstream-forks / mesa

Remove CI