VERSION: update to 23.2.0-rc2

Revert incorrect 23.2.0 release
A bug in my script caused .0 to be released instead of -rc2.
2023-07-29 14:43:25 -07:00 · 2023-07-29 14:41:02 -07:00 · 2023-07-29 03:26:01 -07:00 · 2023-07-29 03:26:00 -07:00 · 2023-07-29 03:05:19 -07:00 · 2023-07-29 03:05:19 -07:00
3995 changed files with 193879 additions and 509947 deletions
--- a/.ci-farms-disabled/anholt
+++ b/.ci-farms-disabled/anholt
--- a/.ci-farms/ondracka
+++ b/.ci-farms/ondracka
--- a/.clang-format-include
+++ b/.clang-format-include
@@ -1,8 +1,8 @@
 # The following files are opted into `ninja clang-format` and
 # enforcement in the CI.

-src/gallium/drivers/i915
+src/**/asahi/**/*
+src/**/panfrost/**/*
 src/amd/vulkan/**/*
 src/amd/compiler/**/*
 src/egl/**/*
-src/etnaviv/isa/**/*
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,6 +1,4 @@
 # List of commits to ignore when using `git blame`.
-# Enable with:
-#   git config blame.ignoreRevsFile .git-blame-ignore-revs
 #
 # Per git-blame(1):
 #   Ignore revisions listed in the file, one unabbreviated object name
@@ -47,21 +45,3 @@ c7bf3b69ebc8f2252dbf724a4de638e6bb2ac402

 # egl: re-format using clang-format
 2f670d89db038d5a29f6b72732fd7ad63dfaf4c6
-
-# panfrost: clang-format the tree
-0afd691f29683f6e9dde60f79eca094373521806
-
-# aco: Format.
-1e2639026fec7069806449f9ba2a124ce4eb5569
-
-# radv: Format.
-59c501ca353f8ec9d2717c98af2bfa1a1dbf4d75
-
-# pvr: clang-format fixes
-953c04ebd39c52d457301bdd8ac803949001da2d
-
-# freedreno: Re-indent
-2d439343ea1aee146d4ce32800992cd389bd505d
-
-# ir3: Reformat source with clang-format
-177138d8cb0b4f6a42ef0a1f8593e14d79f17c54
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,4 +4,3 @@
 *.png binary
 *.gif binary
 *.ico binary
-*.cl gitlab-language=c
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,67 +1,21 @@
-# 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
    # merge pipeline
-    - if: &is-merge-attempt $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_COMMIT_BRANCH == null
      variables:
-        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
        MESA_CI_PERFORMANCE_ENABLED: 1
        VALVE_INFRA_VANGOGH_JOB_PRIORITY: ""  # Empty tags are ignored by gitlab
    # post-merge pipeline
-    - if: &is-post-merge $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "push"
-    # nightly pipeline
-    - if: &is-scheduled-pipeline $CI_PIPELINE_SOURCE == "schedule"
+    - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_COMMIT_BRANCH
      variables:
-        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
-        JOB_PRIORITY: 50
+        LAVA_JOB_PRIORITY: 40
        VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
-    # pipeline for direct pushes that bypassed the CI
-    - if: &is-direct-push $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $GITLAB_USER_LOGIN != "marge-bot"
+    # any other pipeline
+    - if: $GITLAB_USER_LOGIN != "marge-bot"
      variables:
-        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
-        JOB_PRIORITY: 40
+        LAVA_JOB_PRIORITY: 50
        VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
-    # pre-merge or fork pipeline
-    - if: $FORCE_KERNEL_TAG != null
-      variables:
-        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${FORCE_KERNEL_TAG}
-        JOB_PRIORITY: 50
-        VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
-    - if: $FORCE_KERNEL_TAG == null
-      variables:
-        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
-        JOB_PRIORITY: 50
-        VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
-
+    - when: always

 variables:
  FDO_UPSTREAM_REPO: mesa/mesa
@@ -84,9 +38,6 @@ variables:
  # 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
-  # Python scripts for structured logger
-  PYTHONPATH: "$PYTHONPATH:$CI_PROJECT_DIR/install"

 default:
  before_script:
@@ -98,9 +49,6 @@ default:
      unset CI_JOB_JWT  # Unsetting vulnerable env variables

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

@@ -123,24 +71,6 @@ default:
      - data_integrity_failure
      - unknown_failure

-stages:
-  - sanity
-  - container
-  - git-archive
-  - build-x86_64
-  - build-misc
-  - code-validation
-  - amd
-  - intel
-  - nouveau
-  - arm
-  - broadcom
-  - freedreno
-  - etnaviv
-  - software-renderer
-  - layered-backends
-  - deploy
-
 include:
  - project: 'freedesktop/ci-templates'
    ref: 16bc29078de5e0a067ff84a1a199a3760d3b3811
@@ -167,7 +97,6 @@ include:
  - local: 'src/gallium/drivers/crocus/ci/gitlab-ci.yml'
  - local: 'src/gallium/drivers/d3d12/ci/gitlab-ci.yml'
  - local: 'src/gallium/drivers/i915/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/r300/ci/gitlab-ci.yml'
  - local: 'src/gallium/drivers/lima/ci/gitlab-ci.yml'
  - local: 'src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml'
  - local: 'src/gallium/drivers/nouveau/ci/gitlab-ci.yml'
@@ -180,70 +109,66 @@ include:
  - local: 'src/panfrost/ci/gitlab-ci.yml'
  - local: 'src/virtio/ci/gitlab-ci.yml'

+stages:
+  - sanity
+  - container
+  - git-archive
+  - build-x86_64
+  - build-misc
+  - lint
+  - amd
+  - intel
+  - nouveau
+  - arm
+  - broadcom
+  - freedreno
+  - etnaviv
+  - software-renderer
+  - layered-backends
+  - deploy
+

 # YAML anchors for rule conditions
 # --------------------------------
 .rules-anchors:
-  # Pre-merge pipeline
-  - &is-pre-merge '$CI_PIPELINE_SOURCE == "merge_request_event"'
-
-
-.never-post-merge-rules:
  rules:
-    - if: *is-post-merge
-      when: never
+    # Post-merge pipeline
+    - if: &is-post-merge '$CI_PROJECT_NAMESPACE == "mesa" && $CI_COMMIT_BRANCH'
+      when: on_success
+    # Post-merge pipeline, not for Marge Bot
+    - if: &is-post-merge-not-for-marge '$CI_PROJECT_NAMESPACE == "mesa" && $GITLAB_USER_LOGIN != "marge-bot" && $CI_COMMIT_BRANCH'
+      when: on_success
+    # Pre-merge pipeline
+    - if: &is-pre-merge '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: on_success
+    # Pre-merge pipeline for Marge Bot
+    - if: &is-pre-merge-for-marge '$GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: on_success


-.container+build-rules:
+# When to automatically run the CI for build jobs
+.build-rules:
  rules:
-    # Run when re-enabling a disabled farm, but not when disabling it
-    - !reference [.disable-farm-mr-rules, rules]
-    # Never run immediately after merging, as we just ran everything
-    - !reference [.never-post-merge-rules, rules]
-    # Build everything in merge pipelines, if any files affecting the pipeline
-    # were changed
-    - if: *is-merge-attempt
-      changes: &all_paths
-        - VERSION
-        - bin/git_sha1_gen.py
-        - bin/install_megadrivers.py
-        - bin/symbols-check.py
-        # 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/**/*
+    # If any files affecting the pipeline are changed, build/test jobs run
+    # automatically once all dependency jobs have passed
+    - changes: &all_paths
+      - VERSION
+      - bin/git_sha1_gen.py
+      - bin/install_megadrivers.py
+      - bin/symbols-check.py
+      # GitLab CI
+      - .gitlab-ci.yml
+      - .gitlab-ci/**/*
+      # Meson
+      - meson*
+      - build-support/**/*
+      - subprojects/**/*
+      # Source code
+      - include/**/*
+      - src/**/*
+      - .ci-farms/*
      when: on_success
-    # Same as above, but for pre-merge pipelines
-    - if: *is-pre-merge
-      changes:
-        *all_paths
-      when: manual
-    # Skip everything for pre-merge and merge pipelines which don't change
-    # anything in the build
-    - if: *is-merge-attempt
-      when: never
-    - if: *is-pre-merge
-      when: never
-    # Build everything after someone bypassed the CI
-    - if: *is-direct-push
-      when: 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
+    # Otherwise, build/test jobs won't run because no rule matched.


 .ci-deqp-artifacts:
@@ -258,6 +183,34 @@ include:
      - _build/meson-logs/*.txt
      - _build/meson-logs/strace

+.container-rules:
+  rules:
+    # Run pipeline by default in the main project if any CI pipeline
+    # configuration files were changed, to ensure docker images are up to date
+    - if: *is-post-merge
+      changes:
+      - .gitlab-ci.yml
+      - .gitlab-ci/**/*
+      when: on_success
+    # Run pipeline by default if it was triggered by Marge Bot, is for a
+    # merge request, and any files affecting the pipeline were changed
+    - if: *is-pre-merge-for-marge
+      changes:
+        *all_paths
+      when: on_success
+    # Run pipeline by default in the main project if it was not triggered by
+    # Marge Bot, and any files affecting the pipeline were changed
+    - if: *is-post-merge-not-for-marge
+      changes:
+        *all_paths
+      when: on_success
+    # Allow triggering jobs manually in other cases if any files affecting the
+    # pipeline were changed
+    - changes:
+        *all_paths
+      when: manual
+    # Otherwise, container jobs won't run because no rule matched.
+
 # Git archive

 make git archive:
@@ -272,8 +225,6 @@ make git archive:
  script:
    # Compactify the .git directory
    - git gc --aggressive
-    # Download & cache the perfetto subproject as well.
-    - rm -rf subprojects/perfetto ; mkdir -p subprojects/perfetto && curl https://android.googlesource.com/platform/external/perfetto/+archive/$(grep 'revision =' subprojects/perfetto.wrap | cut -d ' ' -f3).tar.gz | tar zxf - -C subprojects/perfetto
    # compress the current folder
    - tar -cvzf ../$CI_PROJECT_NAME.tar.gz .

@@ -288,7 +239,7 @@ sanity:
  rules:
    - if: *is-pre-merge
      when: on_success
-    - when: never
+    # Other cases default to never
  variables:
    GIT_STRATEGY: none
  script:
@@ -298,8 +249,6 @@ sanity:
    when: on_failure
    reports:
      junit: check-*.xml
-  tags:
-    - placeholder-job


 # Jobs that need to pass before spending hardware resources on further testing
--- a/.gitlab-ci/all-skips.txt
+++ b/.gitlab-ci/all-skips.txt
@@ -2,13 +2,6 @@
 # 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
-
 # 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.*
@@ -36,44 +29,6 @@ spec@!opengl 1.1@windowoverlap
 # Note that "glx-" tests don't appear in x11-skips.txt because they can be
 # run even if PIGLIT_PLATFORM=gbm (for example)
 glx@glx-copy-sub-buffer.*
-
-# A majority of the tests introduced in CTS 1.3.7.0 are experiencing failures and flakes.
-# Disable these tests until someone with a more deeper understanding of EGL examines them.
-#
-# Note: on sc8280xp/a690 I get identical results (same passes and fails)
-# between freedreno, zink, and llvmpipe, so I believe this is either a
-# deqp bug or egl/wayland bug, rather than driver issue.
-#
-# With llvmpipe, the failing tests have the error message:
-#
-#   "Illegal sampler view creation without bind flag"
-#
-# which might be a hint.  (But some passing tests also have the same
-# error message.)
-#
-# more context from David Heidelberg on IRC: the deqp commit where these
-# started failing is: https://github.com/KhronosGroup/VK-GL-CTS/commit/79b25659bcbced0cfc2c3fe318951c585f682abe
-# prior to that they were skipping.
-wayland-dEQP-EGL.functional.color_clears.single_context.gles1.other
-wayland-dEQP-EGL.functional.color_clears.single_context.gles2.other
-wayland-dEQP-EGL.functional.color_clears.single_context.gles3.other
-wayland-dEQP-EGL.functional.color_clears.multi_context.gles1.other
-wayland-dEQP-EGL.functional.color_clears.multi_context.gles2.other
-wayland-dEQP-EGL.functional.color_clears.multi_context.gles3.other
-wayland-dEQP-EGL.functional.color_clears.multi_context.gles1_gles2.other
-wayland-dEQP-EGL.functional.color_clears.multi_context.gles1_gles2_gles3.other
-wayland-dEQP-EGL.functional.color_clears.multi_thread.gles1.other
-wayland-dEQP-EGL.functional.color_clears.multi_thread.gles2.other
-wayland-dEQP-EGL.functional.color_clears.multi_thread.gles3.other
-wayland-dEQP-EGL.functional.color_clears.multi_thread.gles1_gles2.other
-wayland-dEQP-EGL.functional.color_clears.multi_thread.gles1_gles2_gles3.other
-
-# Seems to be the same is as wayland-dEQP-EGL.functional.color_clears.*
-wayland-dEQP-EGL.functional.render.single_context.gles2.other
-wayland-dEQP-EGL.functional.render.single_context.gles3.other
-wayland-dEQP-EGL.functional.render.multi_context.gles2.other
-wayland-dEQP-EGL.functional.render.multi_context.gles3.other
-wayland-dEQP-EGL.functional.render.multi_context.gles2_gles3.other
-wayland-dEQP-EGL.functional.render.multi_thread.gles2.other
-wayland-dEQP-EGL.functional.render.multi_thread.gles3.other
-wayland-dEQP-EGL.functional.render.multi_thread.gles2_gles3.other
+# Reads the front buffer but it doesn't have to.
+# https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/755
+glx-swap-copy
--- a/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2
+++ b/.gitlab-ci/b2c/b2c.yml.jinja2.jinja2
@@ -2,7 +2,12 @@ version: 1

 # Rules to match for a machine to qualify
 target:
-  id: '{{ ci_runner_id }}'
+{% if tags %}
+  tags:
+{% for tag in tags %}
+    - '{{ tag | trim }}'
+{% endfor %}
+{% endif %}

 timeouts:
  first_console_activity:  # This limits the time it can take to receive the first console log
@@ -45,8 +50,8 @@ deployment:
        SALAD.machine_id={{ '{{' }} machine_id }}
        console={{ '{{' }} local_tty_device }},115200 earlyprintk=vga,keep
        loglevel={{ log_level }} no_hash_pointers
-        b2c.service="--privileged --tls-verify=false --pid=host docker://{{ '{{' }} fdo_proxy_registry }}/gfx-ci/ci-tron/telegraf:latest" b2c.hostname=dut-{{ '{{' }} machine.full_name }}
-        b2c.container="-ti --tls-verify=false docker://{{ '{{' }} fdo_proxy_registry }}/gfx-ci/ci-tron/machine-registration:latest check"
+        b2c.service="--privileged --tls-verify=false --pid=host docker://{{ '{{' }} fdo_proxy_registry }}/mupuf/valve-infra/telegraf-container:latest" b2c.hostname=dut-{{ '{{' }} machine.full_name }}
+        b2c.container="-ti --tls-verify=false docker://{{ '{{' }} fdo_proxy_registry }}/mupuf/valve-infra/machine_registration:latest check"
        b2c.ntp_peer=10.42.0.1 b2c.pipefail b2c.cache_device=auto b2c.poweroff_delay={{ poweroff_delay }}
        b2c.minio="gateway,{{ '{{' }} minio_url }},{{ '{{' }} job_bucket_access_key }},{{ '{{' }} job_bucket_secret_key }}"
        b2c.volume="{{ '{{' }} job_bucket }}-results,mirror=gateway/{{ '{{' }} job_bucket }},pull_on=pipeline_start,push_on=changes,overwrite{% for excl in job_volume_exclusions %},exclude={{ excl }}{% endfor %},remove,expiration=pipeline_end,preserve"
@@ -54,8 +59,8 @@ deployment:
        b2c.volume={{ volume }}
 {% endfor %}
        b2c.container="-v {{ '{{' }} job_bucket }}-results:{{ working_dir }} -w {{ working_dir }} {% for mount_volume in mount_volumes %} -v {{ mount_volume }}{% endfor %} --tls-verify=false docker://{{ local_container }} {{ container_cmd }}"
-        {% if kernel_cmdline_extras is defined %}
-        {{ kernel_cmdline_extras }}
+        {% if cmdline_extras is defined %}
+        {{ cmdline_extras }}
        {% endif %}

    initramfs:
--- a/.gitlab-ci/b2c/generate_b2c.py
+++ b/.gitlab-ci/b2c/generate_b2c.py
@@ -22,34 +22,86 @@
 # IN THE SOFTWARE.

 from jinja2 import Environment, FileSystemLoader
+from argparse import ArgumentParser
 from os import environ, path
+import json


-# Pass all the environment variables prefixed by B2C_
-values = {
-    key.removeprefix("B2C_").lower(): environ[key]
-    for key in environ if key.startswith("B2C_")
-}
+parser = ArgumentParser()
+parser.add_argument('--ci-job-id')
+parser.add_argument('--container-cmd')
+parser.add_argument('--initramfs-url')
+parser.add_argument('--job-success-regex')
+parser.add_argument('--job-warn-regex')
+parser.add_argument('--kernel-url')
+parser.add_argument('--log-level', type=int)
+parser.add_argument('--poweroff-delay', type=int)
+parser.add_argument('--session-end-regex')
+parser.add_argument('--session-reboot-regex')
+parser.add_argument('--tags', nargs='?', default='')
+parser.add_argument('--template', default='b2c.yml.jinja2.jinja2')
+parser.add_argument('--timeout-boot-minutes', type=int)
+parser.add_argument('--timeout-boot-retries', type=int)
+parser.add_argument('--timeout-first-minutes', type=int)
+parser.add_argument('--timeout-first-retries', type=int)
+parser.add_argument('--timeout-minutes', type=int)
+parser.add_argument('--timeout-overall-minutes', type=int)
+parser.add_argument('--timeout-retries', type=int)
+parser.add_argument('--job-volume-exclusions', nargs='?', default='')
+parser.add_argument('--volume', action='append')
+parser.add_argument('--mount-volume', action='append')
+parser.add_argument('--local-container', default=environ.get('B2C_LOCAL_CONTAINER', 'alpine:latest'))
+parser.add_argument('--working-dir')
+args = parser.parse_args()

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

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

-values['ci_job_id'] = environ['CI_JOB_ID']
-values['ci_runner_id'] = environ['CI_RUNNER_ID']
-values['job_volume_exclusions'] = [excl for excl in values['job_volume_exclusions'].split(",") if excl]
-values['working_dir'] = environ['CI_PROJECT_DIR']
+values = {}
+values['ci_job_id'] = args.ci_job_id
+values['container_cmd'] = args.container_cmd
+values['initramfs_url'] = args.initramfs_url
+values['job_success_regex'] = args.job_success_regex
+values['job_warn_regex'] = args.job_warn_regex
+values['kernel_url'] = args.kernel_url
+values['log_level'] = args.log_level
+values['poweroff_delay'] = args.poweroff_delay
+values['session_end_regex'] = args.session_end_regex
+values['session_reboot_regex'] = args.session_reboot_regex
+try:
+    values['tags'] = json.loads(args.tags)
+except json.decoder.JSONDecodeError:
+    values['tags'] = args.tags.split(",")
+values['template'] = args.template
+values['timeout_boot_minutes'] = args.timeout_boot_minutes
+values['timeout_boot_retries'] = args.timeout_boot_retries
+values['timeout_first_minutes'] = args.timeout_first_minutes
+values['timeout_first_retries'] = args.timeout_first_retries
+values['timeout_minutes'] = args.timeout_minutes
+values['timeout_overall_minutes'] = args.timeout_overall_minutes
+values['timeout_retries'] = args.timeout_retries
+if len(args.job_volume_exclusions) > 0:
+    exclusions = args.job_volume_exclusions.split(",")
+    values['job_volume_exclusions'] = [excl for excl in exclusions if len(excl) > 0]
+if args.volume is not None:
+    values['volumes'] = args.volume
+if args.mount_volume is not None:
+    values['mount_volumes'] = args.mount_volume
+values['working_dir'] = args.working_dir
+
+assert(len(args.local_container) > 0)

 # Use the gateway's pull-through registry caches to reduce load on fd.o.
-values['local_container'] = environ['IMAGE_UNDER_TEST']
-values['local_container'] = values['local_container'].replace(
-    'registry.freedesktop.org',
-    '{{ fdo_proxy_registry }}'
-)
+values['local_container'] = args.local_container
+for url, replacement in [('registry.freedesktop.org', '{{ fdo_proxy_registry }}'),
+                         ('harbor.freedesktop.org', '{{ harbor_fdo_registry }}')]:
+    values['local_container'] = values['local_container'].replace(url, replacement)

-if 'kernel_cmdline_extras' not in values:
-    values['kernel_cmdline_extras'] = ''
+if 'B2C_KERNEL_CMDLINE_EXTRAS' in environ:
+    values['cmdline_extras'] = environ['B2C_KERNEL_CMDLINE_EXTRAS']

-with open(path.splitext(path.basename(values['job_template']))[0], "w") as f:
-    f.write(template.render(values))
+f = open(path.splitext(path.basename(args.template))[0], "w")
+f.write(template.render(values))
+f.close()
--- a/.gitlab-ci/bare-metal/cros-servo.sh
+++ b/.gitlab-ci/bare-metal/cros-servo.sh
@@ -9,7 +9,6 @@
 # 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
@@ -84,41 +83,24 @@ mkdir -p /nfs/results

 rm -rf /tftp/*
 if echo "$BM_KERNEL" | grep -q http; then
+  apt-get install -y curl
  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
      $BM_KERNEL -o /tftp/vmlinuz
-elif [ -n "${FORCE_KERNEL_TAG}" ]; then
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    "${FDO_HTTP_CACHE_URI:-}${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${BM_KERNEL}" -o /tftp/vmlinuz
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    "${FDO_HTTP_CACHE_URI:-}${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/modules.tar.zst" -o modules.tar.zst
-  tar --keep-directory-symlink --zstd -xf modules.tar.zst -C "/nfs/"
-  rm modules.tar.zst &
 else
-  cp /baremetal-files/"$BM_KERNEL" /tftp/vmlinuz
+  cp $BM_KERNEL /tftp/vmlinuz
 fi
 echo "$BM_CMDLINE" > /tftp/cmdline

 set +e
-STRUCTURED_LOG_FILE=job_detail.json
-python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update dut_job_type "${DEVICE_TYPE}"
-python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update farm "${FARM}"
-python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --create-dut-job dut_name "${CI_RUNNER_DESCRIPTION}"
-python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update-dut-time submit "${CI_JOB_STARTED_AT}"
 python3 $BM/cros_servo_run.py \
        --cpu $BM_SERIAL \
        --ec $BM_SERIAL_EC \
        --test-timeout ${TEST_PHASE_TIMEOUT:-20}
 ret=$?
-python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --close-dut-job
-python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --close
 set -e

 # Bring artifacts back from the NFS dir to the build dir where gitlab-runner
 # will look for them.
 cp -Rp /nfs/results/. results/
-if [ -f "${STRUCTURED_LOG_FILE}" ]; then
-  cp -p ${STRUCTURED_LOG_FILE} results/
-  echo "Structured log file is available at https://${CI_PROJECT_ROOT_NAMESPACE}.pages.freedesktop.org/-/${CI_PROJECT_NAME}/-/jobs/${CI_JOB_ID}/artifacts/results/${STRUCTURED_LOG_FILE}"
-fi

 exit $ret
--- a/.gitlab-ci/bare-metal/cros_servo_run.py
+++ b/.gitlab-ci/bare-metal/cros_servo_run.py
@@ -1,18 +1,37 @@
+
 #!/usr/bin/env python3
 #
 # Copyright © 2020 Google LLC
-# SPDX-License-Identifier: MIT
+#
+# 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 queue
 import re
-import sys
-
-from custom_logger import CustomLogger
 from serial_buffer import SerialBuffer
+import sys
+import threading


 class CrosServoRun:
-    def __init__(self, cpu, ec, test_timeout, logger):
+    def __init__(self, cpu, ec, test_timeout):
        self.cpu_ser = SerialBuffer(
            cpu, "results/serial.txt", "R SERIAL-CPU> ")
        # Merge the EC serial into the cpu_ser's line stream so that we can
@@ -20,7 +39,6 @@ class CrosServoRun:
        self.ec_ser = SerialBuffer(
            ec, "results/serial-ec.txt", "R SERIAL-EC> ", line_queue=self.cpu_ser.line_queue)
        self.test_timeout = test_timeout
-        self.logger = logger

    def close(self):
        self.ec_ser.close()
@@ -38,7 +56,6 @@ class CrosServoRun:
        RED = '\033[0;31m'
        NO_COLOR = '\033[0m'
        print(RED + message + NO_COLOR)
-        self.logger.update_status_fail(message)

    def run(self):
        # Flush any partial commands in the EC's prompt, then ask for a reboot.
@@ -46,8 +63,6 @@ class CrosServoRun:
        self.ec_write("reboot\n")

        bootloader_done = False
-        self.logger.create_job_phase("boot")
-        tftp_failures = 0
        # This is emitted right when the bootloader pauses to check for input.
        # Emit a ^N character to request network boot, because we don't have a
        # direct-to-netboot firmware on cheza.
@@ -57,17 +72,6 @@ class CrosServoRun:
                bootloader_done = True
                break

-            # The Cheza firmware seems to occasionally get stuck looping in
-            # this error state during TFTP booting, possibly based on amount of
-            # network traffic around it, but it'll usually recover after a
-            # reboot. Currently mostly visible on google-freedreno-cheza-14.
-            if re.search("R8152: Bulk read error 0xffffffbf", line):
-                tftp_failures += 1
-                if tftp_failures >= 10:
-                    self.print_error(
-                        "Detected intermittent tftp failure, restarting run.")
-                    return 1
-
            # If the board has a netboot firmware and we made it to booting the
            # kernel, proceed to processing of the test run.
            if re.search("Booting Linux", line):
@@ -79,30 +83,41 @@ class CrosServoRun:
            # in the farm.
            if re.search("POWER_GOOD not seen in time", line):
                self.print_error(
-                    "Detected intermittent poweron failure, abandoning run.")
-                return 1
+                    "Detected intermittent poweron failure, restarting run...")
+                return 2

        if not bootloader_done:
-            self.print_error("Failed to make it through bootloader, abandoning run.")
-            return 1
+            print("Failed to make it through bootloader, restarting run...")
+            return 2

-        self.logger.create_job_phase("test")
+        tftp_failures = 0
        for line in self.cpu_ser.lines(timeout=self.test_timeout, phase="test"):
            if re.search("---. end Kernel panic", line):
                return 1

+            # The Cheza firmware seems to occasionally get stuck looping in
+            # this error state during TFTP booting, possibly based on amount of
+            # network traffic around it, but it'll usually recover after a
+            # reboot.
+            if re.search("R8152: Bulk read error 0xffffffbf", line):
+                tftp_failures += 1
+                if tftp_failures >= 100:
+                    self.print_error(
+                        "Detected intermittent tftp failure, restarting run...")
+                    return 2
+
            # There are very infrequent bus errors during power management transitions
            # on cheza, which we don't expect to be the case on future boards.
            if re.search("Kernel panic - not syncing: Asynchronous SError Interrupt", line):
                self.print_error(
-                    "Detected cheza power management bus error, abandoning run.")
-                return 1
+                    "Detected cheza power management bus error, restarting run...")
+                return 2

            # If the network device dies, it's probably not graphics's fault, just try again.
            if re.search("NETDEV WATCHDOG", line):
                self.print_error(
-                    "Detected network device failure, abandoning run.")
-                return 1
+                    "Detected network device failure, restarting run...")
+                return 2

            # These HFI response errors started appearing with the introduction
            # of piglit runs.  CosmicPenguin says:
@@ -115,30 +130,28 @@ class CrosServoRun:
            # break many tests after that, just restart the whole run.
            if re.search("a6xx_hfi_send_msg.*Unexpected message id .* on the response queue", line):
                self.print_error(
-                    "Detected cheza power management bus error, abandoning run.")
-                return 1
+                    "Detected cheza power management bus error, restarting run...")
+                return 2

            if re.search("coreboot.*bootblock starting", line):
                self.print_error(
-                    "Detected spontaneous reboot, abandoning run.")
-                return 1
+                    "Detected spontaneous reboot, restarting run...")
+                return 2

            if re.search("arm-smmu 5040000.iommu: TLB sync timed out -- SMMU may be deadlocked", line):
-                self.print_error("Detected cheza MMU fail, abandoning run.")
-                return 1
+                self.print_error("Detected cheza MMU fail, restarting run...")
+                return 2

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

        self.print_error(
            "Reached the end of the CPU serial log without finding a result")
-        return 1
+        return 2


 def main():
@@ -151,17 +164,16 @@ def main():
        '--test-timeout', type=int, help='Test phase timeout (minutes)', required=True)
    args = parser.parse_args()

-    logger = CustomLogger("job_detail.json")
-    logger.update_dut_time("start", None)
-    servo = CrosServoRun(args.cpu, args.ec, args.test_timeout * 60, logger)
-    retval = servo.run()
+    while True:
+        servo = CrosServoRun(args.cpu, args.ec, args.test_timeout * 60)
+        retval = servo.run()

-    # power down the CPU on the device
-    servo.ec_write("power off\n")
-    logger.update_dut_time("end", None)
-    servo.close()
+        # power down the CPU on the device
+        servo.ec_write("power off\n")
+        servo.close()

-    sys.exit(retval)
+        if retval != 2:
+            sys.exit(retval)


 if __name__ == '__main__':
--- a/.gitlab-ci/bare-metal/fastboot.sh
+++ b/.gitlab-ci/bare-metal/fastboot.sh
@@ -96,33 +96,27 @@ else
  popd
 fi

+# Make the combined kernel image and dtb for passing to fastboot.  For normal
+# Mesa development, we build the kernel and store it in the docker container
+# that this script is running in.
+#
+# However, container builds are expensive, so when you're hacking on the
+# kernel, it's nice to be able to skip the half hour container build and plus
+# moving that container to the runner.  So, if BM_KERNEL+BM_DTB are URLs,
+# fetch them instead of looking in the container.
 if echo "$BM_KERNEL $BM_DTB" | grep -q http; then
+  apt-get install -y curl
+
  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
      "$BM_KERNEL" -o kernel
-  # FIXME: modules should be supplied too
  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
      "$BM_DTB" -o dtb

  cat kernel dtb > Image.gz-dtb
-
-elif [ -n "${FORCE_KERNEL_TAG}" ]; then
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-      "${FDO_HTTP_CACHE_URI:-}${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${BM_KERNEL}" -o kernel
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-      "${FDO_HTTP_CACHE_URI:-}${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/modules.tar.zst" -o modules.tar.zst
-
-  if [ -n "$BM_DTB" ]; then
-    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-	"${FDO_HTTP_CACHE_URI:-}${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${BM_DTB}.dtb" -o dtb
-  fi
-
-  cat kernel dtb > Image.gz-dtb || echo "No DTB available, using pure kernel."
  rm kernel
-  tar --keep-directory-symlink --zstd -xf modules.tar.zst -C "$BM_ROOTFS/"
-  rm modules.tar.zst &
 else
-  cat /baremetal-files/"$BM_KERNEL" /baremetal-files/"$BM_DTB".dtb > Image.gz-dtb
-  cp /baremetal-files/"$BM_DTB".dtb dtb
+  cat $BM_KERNEL $BM_DTB > Image.gz-dtb
+  cp $BM_DTB dtb
 fi

 export PATH=$BM:$PATH
--- a/.gitlab-ci/bare-metal/fastboot_run.py
+++ b/.gitlab-ci/bare-metal/fastboot_run.py
@@ -51,8 +51,8 @@ class FastbootRun:
        try:
            return subprocess.call(cmd, shell=True, timeout=timeout)
        except subprocess.TimeoutExpired:
-            self.print_error("timeout, abandoning run.")
-            return 1
+            self.print_error("timeout, restarting run...")
+            return 2

    def run(self):
        if ret := self.logged_system(self.powerup):
@@ -60,20 +60,20 @@ class FastbootRun:

        fastboot_ready = False
        for line in self.ser.lines(timeout=2 * 60, phase="bootloader"):
-            if re.search("[Ff]astboot: [Pp]rocessing commands", line) or \
+            if re.search("fastboot: processing commands", line) or \
                    re.search("Listening for fastboot command on", line):
                fastboot_ready = True
                break

            if re.search("data abort", line):
                self.print_error(
-                    "Detected crash during boot, abandoning run.")
-                return 1
+                    "Detected crash during boot, restarting run...")
+                return 2

        if not fastboot_ready:
            self.print_error(
-                "Failed to get to fastboot prompt, abandoning run.")
-            return 1
+                "Failed to get to fastboot prompt, restarting run...")
+            return 2

        if ret := self.logged_system(self.fastboot):
            return ret
@@ -81,7 +81,7 @@ class FastbootRun:
        print_more_lines = -1
        for line in self.ser.lines(timeout=self.test_timeout, phase="test"):
            if print_more_lines == 0:
-                return 1
+                return 2
            if print_more_lines > 0:
                print_more_lines -= 1

@@ -92,20 +92,20 @@ class FastbootRun:
            # when if we see a reboot after we got past fastboot.
            if re.search("PON REASON", line):
                self.print_error(
-                    "Detected spontaneous reboot, abandoning run.")
-                return 1
+                    "Detected spontaneous reboot, restarting run...")
+                return 2

            # db820c sometimes wedges around iommu fault recovery
            if re.search("watchdog: BUG: soft lockup - CPU.* stuck", line):
                self.print_error(
-                    "Detected kernel soft lockup, abandoning run.")
-                return 1
+                    "Detected kernel soft lockup, restarting run...")
+                return 2

            # If the network device dies, it's probably not graphics's fault, just try again.
            if re.search("NETDEV WATCHDOG", line):
                self.print_error(
-                    "Detected network device failure, abandoning run.")
-                return 1
+                    "Detected network device failure, restarting run...")
+                return 2

            # A3xx recovery doesn't quite work. Sometimes the GPU will get
            # wedged and recovery will fail (because power can't be reset?)
@@ -115,7 +115,7 @@ class FastbootRun:
            # of the hang. Once a hang happens, it's pretty chatty.
            if "[drm:adreno_recover] *ERROR* gpu hw init failed: -22" in line:
                self.print_error(
-                    "Detected GPU hang, abandoning run.")
+                    "Detected GPU hang, restarting run...")
                if print_more_lines == -1:
                    print_more_lines = 30

@@ -127,8 +127,8 @@ class FastbootRun:
                    return 1

        self.print_error(
-            "Reached the end of the CPU serial log without finding a result, abandoning run.")
-        return 1
+            "Reached the end of the CPU serial log without finding a result, restarting run...")
+        return 2


 def main():
@@ -147,8 +147,13 @@ def main():

    fastboot = FastbootRun(args, args.test_timeout * 60)

-    retval = fastboot.run()
-    fastboot.close()
+    while True:
+        retval = fastboot.run()
+        fastboot.close()
+        if retval != 2:
+            break
+
+        fastboot = FastbootRun(args, args.test_timeout * 60)

    fastboot.logged_system(args.powerdown)

--- a/.gitlab-ci/bare-metal/poe-powered.sh
+++ b/.gitlab-ci/bare-metal/poe-powered.sh
@@ -12,7 +12,6 @@
 # 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
@@ -61,8 +60,8 @@ if [ -z "$BM_ROOTFS" ]; then
  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"
+if [ -z "$BM_BOOTFS" ]; then
+  echo "Must set /boot files for the TFTP boot in the job's variables"
  exit 1
 fi

@@ -71,6 +70,11 @@ if [ -z "$BM_CMDLINE" ]; then
  exit 1
 fi

+if [ -z "$BM_BOOTCONFIG" ]; then
+  echo "Must set BM_BOOTCONFIG to your board's required boot configuration arguments"
+  exit 1
+fi
+
 set -ex

 date +'%F %T'
@@ -87,6 +91,7 @@ date +'%F %T'

 # If BM_BOOTFS is an URL, download it
 if echo $BM_BOOTFS | grep -q http; then
+  apt-get install -y curl
  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
@@ -95,50 +100,23 @@ fi
 date +'%F %T'

 # If BM_BOOTFS is a file, assume it is a tarball and uncompress it
-if [ -f "${BM_BOOTFS}" ]; then
+if [ -f $BM_BOOTFS ]; then
  mkdir -p /tmp/bootfs
  tar xf $BM_BOOTFS -C /tmp/bootfs
  BM_BOOTFS=/tmp/bootfs
 fi

-# If BM_KERNEL and BM_DTS is present
-if [ -n "${FORCE_KERNEL_TAG}" ]; then
-  if [ -z "${BM_KERNEL}" ] || [ -z "${BM_DTB}" ]; then
-    echo "This machine cannot be tested with external kernel since BM_KERNEL or BM_DTB missing!"
-    exit 1
-  fi
-
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-      "${FDO_HTTP_CACHE_URI:-}${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${BM_KERNEL}" -o "${BM_KERNEL}"
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-      "${FDO_HTTP_CACHE_URI:-}${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${BM_DTB}.dtb" -o "${BM_DTB}.dtb"
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-      "${FDO_HTTP_CACHE_URI:-}${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/modules.tar.zst" -o modules.tar.zst
-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 "${FORCE_KERNEL_TAG}" ]; then
-  tar --keep-directory-symlink --zstd -xf modules.tar.zst -C /nfs/
-  rm modules.tar.zst &
-elif [ -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
-
+[ -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/

 date +'%F %T'

 # Install kernel image + bootloader files
-if [ -n "${FORCE_KERNEL_TAG}" ] || [ -z "$BM_BOOTFS" ]; then
-  mv "${BM_KERNEL}" "${BM_DTB}.dtb" /tftp/
-else  # BM_BOOTFS
-  rsync -aL --delete $BM_BOOTFS/boot/ /tftp/
-fi
+rsync -aL --delete $BM_BOOTFS/boot/ /tftp/

 date +'%F %T'

@@ -170,31 +148,19 @@ LABEL primary
 EOF

 # Create the rootfs in the NFS directory
+mkdir -p /nfs/results
 . $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
+# Add some required options in config.txt
+printf "$BM_BOOTCONFIG" >> /tftp/config.txt

 set +e
-STRUCTURED_LOG_FILE=job_detail.json
-python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update dut_job_type "${DEVICE_TYPE}"
-python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update farm "${FARM}"
-ATTEMPTS=3
-first_attempt=True
+ATTEMPTS=10
 while [ $((ATTEMPTS--)) -gt 0 ]; do
-  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" \
@@ -204,14 +170,10 @@ while [ $((ATTEMPTS--)) -gt 0 ]; do

  if [ $ret -eq 2 ]; then
    echo "Did not detect boot sequence, retrying..."
-    python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --close-dut-job
-    first_attempt=False
  else
    ATTEMPTS=0
  fi
 done
-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'
@@ -219,10 +181,6 @@ date +'%F %T'
 # Bring artifacts back from the NFS dir to the build dir where gitlab-runner
 # will look for them.
 cp -Rp /nfs/results/. results/
-if [ -f "${STRUCTURED_LOG_FILE}" ]; then
-  cp -p ${STRUCTURED_LOG_FILE} results/
-  echo "Structured log file is available at ${ARTIFACTS_BASE_URL}/results/${STRUCTURED_LOG_FILE}"
-fi

 date +'%F %T'

--- a/.gitlab-ci/bare-metal/poe_run.py
+++ b/.gitlab-ci/bare-metal/poe_run.py
@@ -24,26 +24,23 @@
 import argparse
 import os
 import re
+from serial_buffer import SerialBuffer
 import sys
 import threading

-from custom_logger import CustomLogger
-from serial_buffer import SerialBuffer

 class PoERun:
-    def __init__(self, args, test_timeout, logger):
+    def __init__(self, args, test_timeout):
        self.powerup = args.powerup
        self.powerdown = args.powerdown
        self.ser = SerialBuffer(
            args.dev, "results/serial-output.txt", "")
        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))
@@ -51,11 +48,9 @@ class PoERun:

    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=5 * 60, phase="bootloader"):
            if re.search("Booting Linux", line):
                boot_detected = True
@@ -64,12 +59,10 @@ class PoERun:
        if not boot_detected:
            self.print_error(
                "Something wrong; couldn't detect the boot start up sequence")
-            return 1
+            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
@@ -78,26 +71,24 @@ class PoERun:
                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
+                self.print_error("nouveau jetson boot bug, retrying.")
+                return 2

            # 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
+                self.print_error("nouveau jetson tk1 network fail, retrying.")
+                return 2

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

        self.print_error(
            "Reached the end of the CPU serial log without finding a result")
-        return 1
+        return 2


 def main():
@@ -112,13 +103,10 @@ def main():
        '--test-timeout', type=int, help='Test phase timeout (minutes)', required=True)
    args = parser.parse_args()

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

    poe.logged_system(args.powerdown)
-    logger.update_dut_time("end", None)

    sys.exit(retval)

--- a/.gitlab-ci/bare-metal/rootfs-setup.sh
+++ b/.gitlab-ci/bare-metal/rootfs-setup.sh
@@ -19,7 +19,6 @@ date +'%F %T'

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

 set +x
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -1,16 +1,8 @@
 # Shared between windows and Linux
 .build-common:
-  extends: .container+build-rules
+  extends: .build-rules
  # Cancel job if a newer commit is pushed to the same branch
  interruptible: true
-  # Build jobs don't take more than 1-3 minutes. 5-8 min max on a fresh runner
-  # without a populated ccache.
-  # These jobs are never slow, either they finish within reasonable time or
-  # something has gone wrong and the job will never terminate, so we should
-  # instead timeout so that the retry mechanism can kick in.
-  # A few exception are made, see `timeout:` overrides in the rest of this
-  # file.
-  timeout: 30m
  artifacts:
    name: "mesa_${CI_JOB_NAME}"
    when: always
@@ -43,9 +35,12 @@
    - !reference [default, after_script]

 .build-windows:
-  extends:
-    - .build-common
-    - .windows-docker-tags
+  extends: .build-common
+  tags:
+    - windows
+    - docker
+    - "2022"
+    - mesa
  cache:
    key: ${CI_JOB_NAME}
    paths:
@@ -61,6 +56,15 @@
  script:
    - .gitlab-ci/meson/build.sh

+.meson-build_mingw:
+  extends:
+    - .build-linux
+    - .use-debian/x86_64_build_mingw
+    - .use-wine
+  stage: build-x86_64
+  script:
+    - .gitlab-ci/meson/build.sh
+
 debian-testing:
  extends:
    - .meson-build
@@ -75,9 +79,8 @@ debian-testing:
    GALLIUM_ST: >
      -D dri3=enabled
      -D gallium-va=enabled
-      -D gallium-rusticl=true
-    GALLIUM_DRIVERS: "swrast,virgl,radeonsi,zink,crocus,iris,i915,r300"
-    VULKAN_DRIVERS: "swrast,amd,intel,intel_hasvk,virtio,nouveau-experimental"
+    GALLIUM_DRIVERS: "swrast,virgl,radeonsi,zink,crocus,iris,i915"
+    VULKAN_DRIVERS: "swrast,amd,intel,intel_hasvk,virtio"
    BUILDTYPE: "debugoptimized"
    EXTRA_OPTION: >
      -D spirv-to-dxil=true
@@ -125,6 +128,42 @@ debian-testing-msan:
    GALLIUM_DRIVERS: "freedreno,iris,nouveau,kmsro,r300,r600,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus"
    VULKAN_DRIVERS: intel,amd,broadcom,virtio

+.debian-cl-testing:
+  extends:
+    - .meson-build
+    - .ci-deqp-artifacts
+  variables:
+    LLVM_VERSION: 15
+    UNWIND: "enabled"
+    DRI_LOADERS: >
+      -D glx=disabled
+      -D egl=disabled
+      -D gbm=disabled
+    GALLIUM_DRIVERS: "swrast"
+    BUILDTYPE: "debugoptimized"
+    EXTRA_OPTION: >
+      -D valgrind=disabled
+  script:
+    - .gitlab-ci/meson/build.sh
+    - .gitlab-ci/prepare-artifacts.sh
+
+# TODO: remove together with Clover
+.debian-clover-testing:
+  extends:
+    - .debian-cl-testing
+  variables:
+    GALLIUM_ST: >
+      -D gallium-opencl=icd
+      -D opencl-spirv=true
+
+debian-rusticl-testing:
+  extends:
+    - .debian-cl-testing
+  variables:
+    GALLIUM_ST: >
+      -D gallium-rusticl=true
+      -D opencl-spirv=true
+
 debian-build-testing:
  extends: .meson-build
  variables:
@@ -143,6 +182,7 @@ debian-build-testing:
      -D gallium-va=enabled
      -D gallium-xa=enabled
      -D gallium-nine=true
+      -D gallium-opencl=disabled
      -D gallium-rusticl=false
    GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus"
    VULKAN_DRIVERS: swrast
@@ -163,7 +203,6 @@ debian-build-testing:
    .gitlab-ci/meson/build.sh
    section_switch shader-db "shader-db"
    .gitlab-ci/run-shader-db.sh
-  timeout: 30m

 # Test a release build with -Werror so new warnings don't sneak in.
 debian-release:
@@ -186,6 +225,7 @@ debian-release:
      -D gallium-va=enabled
      -D gallium-xa=enabled
      -D gallium-nine=false
+      -D gallium-opencl=disabled
      -D gallium-rusticl=false
      -D llvm=enabled
    GALLIUM_DRIVERS: "i915,iris,nouveau,kmsro,freedreno,r300,svga,swrast,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,crocus"
@@ -237,6 +277,8 @@ alpine-build-testing:
      -D shared-llvm=enabled
    UNWIND: "disabled"
    VULKAN_DRIVERS: "amd,broadcom,freedreno,intel,imagination-experimental"
+  script:
+    - .gitlab-ci/meson/build.sh

 fedora-release:
  extends:
@@ -276,6 +318,7 @@ fedora-release:
      -D gallium-va=enabled
      -D gallium-xa=enabled
      -D gallium-nine=false
+      -D gallium-opencl=icd
      -D gallium-rusticl=true
      -D gles1=disabled
      -D gles2=enabled
@@ -285,6 +328,8 @@ fedora-release:
    LLVM_VERSION: ""
    UNWIND: "disabled"
    VULKAN_DRIVERS: "amd,broadcom,freedreno,imagination-experimental,intel,intel_hasvk"
+  script:
+    - .gitlab-ci/meson/build.sh

 debian-android:
  extends:
@@ -300,6 +345,7 @@ debian-android:
      -Wno-error=enum-conversion
      -Wno-error=initializer-overrides
      -Wno-error=sometimes-uninitialized
+      -Wno-error=implicit-const-int-float-conversion
    CPP_ARGS: >
      -Wno-error=c99-designator
      -Wno-error=unused-variable
@@ -323,6 +369,7 @@ debian-android:
      -D gallium-va=disabled
      -D gallium-xa=disabled
      -D gallium-nine=false
+      -D gallium-opencl=disabled
      -D gallium-rusticl=false
    LLVM_VERSION: ""
    PKG_CONFIG_LIBDIR: "/disable/non/android/system/pc/files"
@@ -415,7 +462,6 @@ debian-arm64:
      -D valgrind=disabled
      -D imagination-srv=true
      -D perfetto=true
-      -D freedreno-kmds=msm,virtio
    S3_ARTIFACT_NAME: mesa-arm64-default-${BUILDTYPE}
  script:
    - .gitlab-ci/meson/build.sh
@@ -442,6 +488,8 @@ debian-arm64-build-test:
    VULKAN_DRIVERS: "amd"
    EXTRA_OPTION: >
      -Dtools=panfrost,imagination
+  script:
+    - .gitlab-ci/meson/build.sh

 debian-arm64-release:
  extends:
@@ -463,14 +511,16 @@ debian-clang:
    BUILDTYPE: debug
    LLVM_VERSION: 15
    UNWIND: "enabled"
+    GALLIUM_DUMP_CPU: "true"
    C_ARGS: >
      -Wno-error=constant-conversion
      -Wno-error=enum-conversion
+      -Wno-error=implicit-const-int-float-conversion
      -Wno-error=initializer-overrides
      -Wno-error=sometimes-uninitialized
-      -Werror=misleading-indentation
    CPP_ARGS: >
      -Wno-error=c99-designator
+      -Wno-error=implicit-const-int-float-conversion
      -Wno-error=overloaded-virtual
      -Wno-error=tautological-constant-out-of-range-compare
      -Wno-error=unused-private-field
@@ -488,6 +538,7 @@ debian-clang:
      -D gallium-va=enabled
      -D gallium-xa=enabled
      -D gallium-nine=true
+      -D gallium-opencl=icd
      -D gles1=enabled
      -D gles2=enabled
      -D llvm=enabled
@@ -496,7 +547,7 @@ debian-clang:
      -D opencl-spirv=true
      -D shared-glapi=enabled
    GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus,i915,asahi"
-    VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,swrast,panfrost,imagination-experimental,microsoft-experimental,nouveau-experimental
+    VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,swrast,panfrost,imagination-experimental,microsoft-experimental
    EXTRA_OPTION:
      -D spirv-to-dxil=true
      -D osmesa=true
@@ -524,6 +575,7 @@ debian-clang-release:
      -D gallium-va=enabled
      -D gallium-xa=enabled
      -D gallium-nine=true
+      -D gallium-opencl=icd
      -D gles1=disabled
      -D gles2=disabled
      -D llvm=enabled
@@ -532,10 +584,10 @@ debian-clang-release:
      -D opencl-spirv=true
      -D shared-glapi=disabled

-windows-msvc:
+windows-vs2019:
  extends:
    - .build-windows
-    - .use-windows_build_msvc
+    - .use-windows_build_vs2019
    - .windows-build-rules
  stage: build-misc
  script:
@@ -545,6 +597,49 @@ windows-msvc:
      - _build/meson-logs/*.txt
      - _install/

+.debian-cl:
+  extends: .meson-build
+  variables:
+    LLVM_VERSION: 15
+    UNWIND: "enabled"
+    DRI_LOADERS: >
+      -D glx=disabled
+      -D egl=disabled
+      -D gbm=disabled
+    EXTRA_OPTION: >
+      -D valgrind=disabled
+
+# TODO: remove with Clover
+.debian-clover:
+  extends: .debian-cl
+  variables:
+    GALLIUM_DRIVERS: "r600,radeonsi,swrast"
+    GALLIUM_ST: >
+      -D dri3=disabled
+      -D gallium-vdpau=disabled
+      -D gallium-omx=disabled
+      -D gallium-va=disabled
+      -D gallium-xa=disabled
+      -D gallium-nine=false
+      -D gallium-opencl=icd
+      -D gallium-rusticl=false
+
+debian-rusticl:
+  extends: .debian-cl
+  variables:
+    BUILDTYPE: debug
+    GALLIUM_DRIVERS: "iris,swrast"
+    GALLIUM_ST: >
+      -D dri3=disabled
+      -D gallium-vdpau=disabled
+      -D gallium-omx=disabled
+      -D gallium-va=disabled
+      -D gallium-xa=disabled
+      -D gallium-nine=false
+      -D gallium-opencl=disabled
+      -D gallium-rusticl=true
+    RUSTC: clippy-driver
+
 debian-vulkan:
  extends: .meson-build
  variables:
@@ -555,9 +650,6 @@ debian-vulkan:
      -D glx=disabled
      -D gbm=disabled
      -D egl=disabled
-      -D opengl=false
-      -D gles1=disabled
-      -D gles2=disabled
      -D platforms=x11,wayland
      -D osmesa=false
    GALLIUM_ST: >
@@ -567,12 +659,13 @@ debian-vulkan:
      -D gallium-va=disabled
      -D gallium-xa=disabled
      -D gallium-nine=false
+      -D gallium-opencl=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,broadcom,freedreno,intel,intel_hasvk,virtio,imagination-experimental,microsoft-experimental
+    VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,imagination-experimental,microsoft-experimental
    EXTRA_OPTION: >
      -D vulkan-layers=device-select,overlay
      -D build-aco-tests=true
@@ -587,7 +680,7 @@ debian-x86_32:
    BUILDTYPE: debug
    CROSS: i386
    VULKAN_DRIVERS: intel,amd,swrast,virtio
-    GALLIUM_DRIVERS: "iris,nouveau,r300,r600,radeonsi,swrast,virgl,zink,crocus,d3d12"
+    GALLIUM_DRIVERS: "iris,nouveau,r300,r600,radeonsi,swrast,virgl,zink,crocus"
    LLVM_VERSION: 15
    EXTRA_OPTION: >
      -D vulkan-layers=device-select,overlay
@@ -615,3 +708,41 @@ debian-ppc64el:
    CROSS: ppc64el
    GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl,zink"
    VULKAN_DRIVERS: "amd,swrast"
+
+# Disabled as it hangs with winedbg on shared runners
+.debian-mingw32-x86_64:
+  extends: .meson-build_mingw
+  stage: build-misc
+  variables:
+    UNWIND: "disabled"
+    C_ARGS: >
+      -Wno-error=format
+      -Wno-error=unused-but-set-variable
+    CPP_ARGS: >
+      -Wno-error=format
+      -Wno-error=unused-function
+      -Wno-error=unused-variable
+      -Wno-error=sign-compare
+      -Wno-error=narrowing
+    GALLIUM_DRIVERS: "swrast,d3d12,zink"
+    VULKAN_DRIVERS: "swrast,amd,microsoft-experimental"
+    GALLIUM_ST: >
+      -D gallium-opencl=icd
+      -D gallium-rusticl=false
+      -D opencl-spirv=true
+      -D microsoft-clc=enabled
+      -D static-libclc=all
+      -D opencl-external-clang-headers=disabled
+      -D llvm=enabled
+      -D gallium-va=enabled
+      -D video-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec
+    EXTRA_OPTION: >
+      -D min-windows-version=7
+      -D spirv-to-dxil=true
+      -D gles1=enabled
+      -D gles2=enabled
+      -D osmesa=true
+      -D cpp_rtti=true
+      -D shared-glapi=enabled
+      -D zlib=enabled
+      --cross-file=.gitlab-ci/x86_64-w64-mingw32
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -2,7 +2,6 @@

 for var in \
    ACO_DEBUG \
-    ARTIFACTS_BASE_URL \
    ASAN_OPTIONS \
    BASE_SYSTEM_FORK_HOST_PREFIX \
    BASE_SYSTEM_MAINLINE_HOST_PREFIX \
@@ -70,7 +69,7 @@ for var in \
    JOB_ARTIFACTS_BASE \
    JOB_RESULTS_PATH \
    JOB_ROOTFS_OVERLAY_PATH \
-    KERNEL_IMAGE_BASE \
+    KERNEL_IMAGE_BASE_URL \
    KERNEL_IMAGE_NAME \
    LD_LIBRARY_PATH \
    LP_NUM_THREADS \
@@ -91,13 +90,13 @@ for var in \
    NIR_DEBUG \
    PAN_I_WANT_A_BROKEN_VULKAN_DRIVER \
    PAN_MESA_DEBUG \
-    PANVK_DEBUG \
    PIGLIT_FRACTION \
    PIGLIT_NO_WINDOW \
    PIGLIT_OPTIONS \
    PIGLIT_PLATFORM \
    PIGLIT_PROFILES \
    PIGLIT_REPLAY_ARTIFACTS_BASE_URL \
+    PIGLIT_REPLAY_DESCRIPTION_FILE \
    PIGLIT_REPLAY_DEVICE_NAME \
    PIGLIT_REPLAY_EXTRA_ARGS \
    PIGLIT_REPLAY_LOOP_TIMES \
@@ -105,9 +104,7 @@ for var in \
    PIGLIT_REPLAY_SUBCOMMAND \
    PIGLIT_RESULTS \
    PIGLIT_TESTS \
-    PIGLIT_TRACES_FILE \
    PIPELINE_ARTIFACTS_BASE \
-    RADEON_DEBUG \
    RADV_DEBUG \
    RADV_PERFTEST \
    SKQP_ASSETS_DIR \
--- a/.gitlab-ci/common/init-stage1.sh
+++ b/.gitlab-ci/common/init-stage1.sh
@@ -7,10 +7,10 @@ set -ex

 cd /

-findmnt --mountpoint /proc || mount -t proc none /proc
-findmnt --mountpoint /sys || mount -t sysfs none /sys
+mount -t proc none /proc
+mount -t sysfs none /sys
 mount -t debugfs none /sys/kernel/debug
-findmnt --mountpoint /dev || mount -t devtmpfs none /dev
+mount -t devtmpfs none /dev || echo possibly already mounted
 mkdir -p /dev/pts
 mount -t devpts devpts /dev/pts
 mkdir /dev/shm
--- a/.gitlab-ci/common/init-stage2.sh
+++ b/.gitlab-ci/common/init-stage2.sh
@@ -86,7 +86,7 @@ if [ "$HWCI_KVM" = "true" ]; then
    mkdir -p /lava-files
    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
 	-o "/lava-files/${KERNEL_IMAGE_NAME}" \
-        "${KERNEL_IMAGE_BASE}/amd64/${KERNEL_IMAGE_NAME}"
+        "${KERNEL_IMAGE_BASE_URL}/${KERNEL_IMAGE_NAME}"
 fi

 # Fix prefix confusion: the build installs to $CI_PROJECT_DIR, but we expect
@@ -127,15 +127,6 @@ if [ "$HWCI_FREQ_MAX" = "true" ]; then
  /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
-if [ -x /kdl.sh ]; then
-  echo "launch kdl.sh!"
-  /kdl.sh &
-  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
@@ -216,11 +207,7 @@ fi
 [ ${EXIT_CODE} -eq 0 ] && RESULT=pass || RESULT=fail

 set +x
-
-# Print the final result; both bare-metal and LAVA look for this string to get
-# the result of our run, so try really hard to get it out rather than losing
-# the run. The device gets shut down right at this point, and a630 seems to
-# enjoy corrupting the last line of serial output before shutdown.
-for _ in $(seq 0 3); do echo "hwci: mesa: $RESULT"; sleep 1; echo; done
-
+echo "hwci: mesa: $RESULT"
+# Sleep a bit to avoid kernel dump message interleave from LAVA ENDTC signal
+sleep 1
 exit $EXIT_CODE
--- a/.gitlab-ci/common/kdl.sh
+++ b/.gitlab-ci/common/kdl.sh
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC1091  # the path is created in build-kdl and
-# here is check if exist
-
-terminate() {
-  echo "ci-kdl.sh caught SIGTERM signal! propagating to child processes"
-  for job in $(jobs -p)
-  do
-    kill -15 "$job"
-  done
-}
-
-trap terminate SIGTERM
-
-if [ -f /ci-kdl.venv/bin/activate ]; then
-  source /ci-kdl.venv/bin/activate
-  /ci-kdl.venv/bin/python /ci-kdl.venv/bin/ci-kdl | tee -a /results/kdl.log &
-  child=$!
-  wait $child
-  mv kdl_*.json /results/kdl.json
-else
-  echo -e "Not possible to activate ci-kdl virtual environment"
-fi
-
--- a/.gitlab-ci/container/alpine/x86_64_build.sh
+++ b/.gitlab-ci/container/alpine/x86_64_build.sh
@@ -1,14 +1,18 @@
 #!/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
 set -o xtrace

 EPHEMERAL=(
+    autoconf
+    automake
+    bzip2
+    libtool
+    libepoxy-dev
+    libtbb-dev
+    make
+    openssl-dev
+    unzip
 )


@@ -46,10 +50,17 @@ DEPS=(
    wayland-protocols
 )

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

 . .gitlab-ci/container/container_pre_build.sh

+pushd /usr/local
+git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
+rm -rf shader-db/.git
+cd shader-db
+make
+popd
+

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

--- a/.gitlab-ci/container/alpine/x86_64_lava_ssh_client.sh
+++ b/.gitlab-ci/container/alpine/x86_64_lava_ssh_client.sh
@@ -18,7 +18,7 @@ DEPS=(
 )


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

 . .gitlab-ci/container/container_pre_build.sh

--- a/.gitlab-ci/container/arm.config
+++ b/.gitlab-ci/container/arm.config
@@ -0,0 +1,69 @@
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_DEBUG_KERNEL=y
+
+CONFIG_CRYPTO_ZSTD=y
+CONFIG_ZRAM_MEMORY_TRACKING=y
+CONFIG_ZRAM_WRITEBACK=y
+CONFIG_ZRAM=y
+CONFIG_ZSMALLOC_STAT=y
+
+# abootimg with a 'dummy' rootfs fails with root=/dev/nfs
+CONFIG_BLK_DEV_INITRD=n
+
+CONFIG_DEVFREQ_GOV_PERFORMANCE=y
+CONFIG_DEVFREQ_GOV_POWERSAVE=y
+CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_GOV_PASSIVE=y
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+
+CONFIG_DRM=y
+CONFIG_DRM_ETNAVIV=y
+CONFIG_DRM_ROCKCHIP=y
+CONFIG_DRM_PANFROST=y
+CONFIG_DRM_LIMA=y
+CONFIG_DRM_PANEL_SIMPLE=y
+CONFIG_PWM_CROS_EC=y
+CONFIG_BACKLIGHT_PWM=y
+
+CONFIG_ROCKCHIP_CDN_DP=n
+
+CONFIG_SPI_ROCKCHIP=y
+CONFIG_PWM_ROCKCHIP=y
+CONFIG_PHY_ROCKCHIP_DP=y
+CONFIG_DWMAC_ROCKCHIP=y
+
+CONFIG_MFD_RK808=y
+CONFIG_REGULATOR_RK808=y
+CONFIG_RTC_DRV_RK808=y
+CONFIG_COMMON_CLK_RK808=y
+
+CONFIG_REGULATOR_FAN53555=y
+CONFIG_REGULATOR=y
+
+CONFIG_REGULATOR_VCTRL=y
+
+CONFIG_KASAN=n
+CONFIG_KASAN_INLINE=n
+CONFIG_STACKTRACE=n
+
+CONFIG_TMPFS=y
+
+CONFIG_PROVE_LOCKING=n
+CONFIG_DEBUG_LOCKDEP=n
+CONFIG_SOFTLOCKUP_DETECTOR=n
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=n
+
+CONFIG_FW_LOADER_COMPRESS=y
+
+CONFIG_USB_USBNET=y
+CONFIG_NETDEVICES=y
+CONFIG_USB_NET_DRIVERS=y
+CONFIG_USB_RTL8152=y
+CONFIG_USB_NET_AX8817X=y
+CONFIG_USB_NET_SMSC95XX=y
+
+# TK1
+CONFIG_ARM_TEGRA_DEVFREQ=y
+
+# 32-bit build failure
+CONFIG_DRM_MSM=n
--- a/.gitlab-ci/container/arm64.config
+++ b/.gitlab-ci/container/arm64.config
@@ -0,0 +1,197 @@
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_DEBUG_KERNEL=y
+
+CONFIG_CRYPTO_ZSTD=y
+CONFIG_ZRAM_MEMORY_TRACKING=y
+CONFIG_ZRAM_WRITEBACK=y
+CONFIG_ZRAM=y
+CONFIG_ZSMALLOC_STAT=y
+
+# abootimg with a 'dummy' rootfs fails with root=/dev/nfs
+CONFIG_BLK_DEV_INITRD=n
+
+CONFIG_DEVFREQ_GOV_PERFORMANCE=y
+CONFIG_DEVFREQ_GOV_POWERSAVE=y
+CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_GOV_PASSIVE=y
+
+CONFIG_DRM=y
+CONFIG_DRM_ROCKCHIP=y
+CONFIG_DRM_PANFROST=y
+CONFIG_DRM_LIMA=y
+CONFIG_DRM_PANEL_SIMPLE=y
+CONFIG_DRM_PANEL_EDP=y
+CONFIG_DRM_MSM=y
+CONFIG_DRM_ETNAVIV=y
+CONFIG_DRM_I2C_ADV7511=y
+CONFIG_PWM_CROS_EC=y
+CONFIG_BACKLIGHT_PWM=y
+
+CONFIG_ROCKCHIP_CDN_DP=n
+
+CONFIG_SPI_ROCKCHIP=y
+CONFIG_PWM_ROCKCHIP=y
+CONFIG_PHY_ROCKCHIP_DP=y
+CONFIG_DWMAC_ROCKCHIP=y
+CONFIG_STMMAC_ETH=y
+CONFIG_TYPEC_FUSB302=y
+CONFIG_TYPEC=y
+CONFIG_TYPEC_TCPM=y
+
+# MSM platform bits
+
+# For CONFIG_QCOM_LMH
+CONFIG_OF=y
+
+CONFIG_ARM_SMMU_QCOM=y
+CONFIG_QCOM_COMMAND_DB=y
+CONFIG_QCOM_RPMHPD=y
+CONFIG_QCOM_RPMPD=y
+CONFIG_QCOM_OCMEM=y
+CONFIG_SDM_GPUCC_845=y
+CONFIG_SDM_VIDEOCC_845=y
+CONFIG_SDM_DISPCC_845=y
+CONFIG_SDM_LPASSCC_845=y
+CONFIG_SDM_CAMCC_845=y
+CONFIG_RESET_QCOM_PDC=y
+CONFIG_DRM_TI_SN65DSI86=y
+CONFIG_I2C_QCOM_GENI=y
+CONFIG_SPI_QCOM_GENI=y
+CONFIG_PHY_QCOM_QUSB2=y
+CONFIG_PHY_QCOM_QMP=y
+CONFIG_QCOM_CLK_APCC_MSM8996=y
+CONFIG_QCOM_LLCC=y
+CONFIG_QCOM_LMH=y
+CONFIG_QCOM_SPMI_TEMP_ALARM=y
+CONFIG_QCOM_WDT=y
+CONFIG_POWER_RESET_QCOM_PON=y
+CONFIG_RTC_DRV_PM8XXX=y
+CONFIG_INTERCONNECT=y
+CONFIG_INTERCONNECT_QCOM=y
+CONFIG_INTERCONNECT_QCOM_MSM8996=y
+CONFIG_INTERCONNECT_QCOM_SDM845=y
+CONFIG_INTERCONNECT_QCOM_MSM8916=y
+CONFIG_INTERCONNECT_QCOM_OSM_L3=y
+CONFIG_INTERCONNECT_QCOM_SC7180=y
+CONFIG_INTERCONNECT_QCOM_SM8350=y
+CONFIG_CRYPTO_DEV_QCOM_RNG=y
+CONFIG_SC_DISPCC_7180=y
+CONFIG_SC_GPUCC_7180=y
+CONFIG_SM_GPUCC_8350=y
+CONFIG_QCOM_SPMI_ADC5=y
+CONFIG_DRM_PARADE_PS8640=y
+CONFIG_DRM_LONTIUM_LT9611UXC=y
+CONFIG_PHY_QCOM_USB_HS=y
+CONFIG_QCOM_GPI_DMA=y
+CONFIG_USB_ONBOARD_HUB=y
+CONFIG_NVMEM_QCOM_QFPROM=y
+CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=y
+
+
+# db410c ethernet
+CONFIG_USB_RTL8152=y
+# db820c ethernet
+CONFIG_ATL1C=y
+# Chromebooks ethernet
+CONFIG_USB_ONBOARD_HUB=y
+# 888 HDK ethernet
+CONFIG_USB_LAN78XX=y
+
+CONFIG_ARCH_ALPINE=n
+CONFIG_ARCH_BCM2835=n
+CONFIG_ARCH_BCM_IPROC=n
+CONFIG_ARCH_BERLIN=n
+CONFIG_ARCH_BRCMSTB=n
+CONFIG_ARCH_EXYNOS=n
+CONFIG_ARCH_K3=n
+CONFIG_ARCH_LAYERSCAPE=n
+CONFIG_ARCH_LG1K=n
+CONFIG_ARCH_HISI=n
+CONFIG_ARCH_MVEBU=n
+CONFIG_ARCH_SEATTLE=n
+CONFIG_ARCH_SYNQUACER=n
+CONFIG_ARCH_RENESAS=n
+CONFIG_ARCH_R8A774A1=n
+CONFIG_ARCH_R8A774C0=n
+CONFIG_ARCH_R8A7795=n
+CONFIG_ARCH_R8A7796=n
+CONFIG_ARCH_R8A77965=n
+CONFIG_ARCH_R8A77970=n
+CONFIG_ARCH_R8A77980=n
+CONFIG_ARCH_R8A77990=n
+CONFIG_ARCH_R8A77995=n
+CONFIG_ARCH_STRATIX10=n
+CONFIG_ARCH_TEGRA=n
+CONFIG_ARCH_SPRD=n
+CONFIG_ARCH_THUNDER=n
+CONFIG_ARCH_THUNDER2=n
+CONFIG_ARCH_UNIPHIER=n
+CONFIG_ARCH_VEXPRESS=n
+CONFIG_ARCH_XGENE=n
+CONFIG_ARCH_ZX=n
+CONFIG_ARCH_ZYNQMP=n
+
+# Strip out some stuff we don't need for graphics testing, to reduce
+# the build.
+CONFIG_CAN=n
+CONFIG_WIRELESS=n
+CONFIG_RFKILL=n
+CONFIG_WLAN=n
+
+CONFIG_REGULATOR_FAN53555=y
+CONFIG_REGULATOR=y
+
+CONFIG_REGULATOR_VCTRL=y
+
+CONFIG_KASAN=n
+CONFIG_KASAN_INLINE=n
+CONFIG_STACKTRACE=n
+
+CONFIG_TMPFS=y
+
+CONFIG_PROVE_LOCKING=n
+CONFIG_DEBUG_LOCKDEP=n
+CONFIG_SOFTLOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
+
+CONFIG_DETECT_HUNG_TASK=y
+
+CONFIG_FW_LOADER_COMPRESS=y
+CONFIG_FW_LOADER_USER_HELPER=n
+
+CONFIG_USB_USBNET=y
+CONFIG_NETDEVICES=y
+CONFIG_USB_NET_DRIVERS=y
+CONFIG_USB_RTL8152=y
+CONFIG_USB_NET_AX8817X=y
+CONFIG_USB_NET_SMSC95XX=y
+
+# For amlogic
+CONFIG_MESON_GXL_PHY=y
+CONFIG_MDIO_BUS_MUX_MESON_G12A=y
+CONFIG_DRM_MESON=y
+
+# For Mediatek
+CONFIG_DRM_MEDIATEK=y
+CONFIG_PWM_MEDIATEK=y
+CONFIG_DRM_MEDIATEK_HDMI=y
+CONFIG_GNSS=y
+CONFIG_GNSS_MTK_SERIAL=y
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_MTK=y
+CONFIG_MTK_DEVAPC=y
+CONFIG_PWM_MTK_DISP=y
+CONFIG_MTK_CMDQ=y
+
+# For nouveau.  Note that DRM must be a module so that it's loaded after NFS is up to provide the firmware.
+CONFIG_ARCH_TEGRA=y
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_TEGRA=m
+CONFIG_R8169=y
+CONFIG_STAGING=y
+CONFIG_DRM_TEGRA_STAGING=y
+CONFIG_TEGRA_HOST1X=y
+CONFIG_ARM_TEGRA_DEVFREQ=y
+CONFIG_TEGRA_SOCTHERM=y
+CONFIG_DRM_TEGRA_DEBUG=y
+CONFIG_PWM_TEGRA=y
--- a/.gitlab-ci/container/baremetal_build.sh
+++ b/.gitlab-ci/container/baremetal_build.sh
@@ -24,11 +24,11 @@ if [[ $arch == "arm64" ]]; then
    pushd /baremetal-files

    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-	-O "${KERNEL_IMAGE_BASE}"/arm64/Image
+	-O "${ARTIFACTS_URL}"/Image
    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-        -O "${KERNEL_IMAGE_BASE}"/arm64/Image.gz
+        -O "${ARTIFACTS_URL}"/Image.gz
    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-        -O "${KERNEL_IMAGE_BASE}"/arm64/cheza-kernel
+        -O "${ARTIFACTS_URL}"/cheza-kernel

    DEVICE_TREES=""
    DEVICE_TREES="$DEVICE_TREES apq8016-sbc.dtb"
@@ -38,7 +38,7 @@ if [[ $arch == "arm64" ]]; then

    for DTB in $DEVICE_TREES; do
 	curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-            -O "${KERNEL_IMAGE_BASE}/arm64/$DTB"
+            -O "${ARTIFACTS_URL}/$DTB"
    done

    popd
@@ -47,7 +47,7 @@ elif [[ $arch == "armhf" ]]; then
    pushd /baremetal-files

    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-        -O "${KERNEL_IMAGE_BASE}"/armhf/zImage
+        -O "${ARTIFACTS_URL}"/zImage

    DEVICE_TREES=""
    DEVICE_TREES="$DEVICE_TREES imx6q-cubox-i.dtb"
@@ -55,7 +55,7 @@ elif [[ $arch == "armhf" ]]; then

    for DTB in $DEVICE_TREES; do
 	curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-            -O "${KERNEL_IMAGE_BASE}/armhf/$DTB"
+            -O "${ARTIFACTS_URL}/$DTB"
    done

    popd
--- a/.gitlab-ci/container/build-angle.sh
+++ b/.gitlab-ci/container/build-angle.sh
@@ -2,7 +2,7 @@

 set -ex

-ANGLE_REV="0518a3ff4d4e7e5b2ce8203358f719613a31c118"
+ANGLE_REV="82f1cee01a9ea24960e8f23b24d348fccbe0aae0"

 # DEPOT tools
 git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
--- a/.gitlab-ci/container/build-crosvm.sh
+++ b/.gitlab-ci/container/build-crosvm.sh
@@ -6,13 +6,13 @@ set -ex
 git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"

-CROSVM_VERSION=e3815e62d675ef436956a992e0ed58b7309c759d
+CROSVM_VERSION=d0cbf0b23eb4bd2355b011184025c7c5d8749376
 git clone --single-branch -b main --no-checkout https://chromium.googlesource.com/crosvm/crosvm /platform/crosvm
 pushd /platform/crosvm
 git checkout "$CROSVM_VERSION"
 git submodule update --init

-VIRGLRENDERER_VERSION=747c6ae5b194ca551a79958a9a86c42bddcc4553
+VIRGLRENDERER_VERSION=45bb2449b81336b88c267b1c1735f3b4946c7b3a
 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
@@ -25,7 +25,6 @@ cargo update -p pkg-config@0.3.26 --precise 0.3.27

 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
  bindgen-cli \
-  --locked \
  -j ${FDO_CI_CONCURRENT:-4} \
  --root /usr/local \
  --version 0.65.1 \
--- a/.gitlab-ci/container/build-deqp-runner.sh
+++ b/.gitlab-ci/container/build-deqp-runner.sh
@@ -1,16 +1,8 @@
-#!/usr/bin/env bash
+#!/bin/sh
 # shellcheck disable=SC2086 # we want word splitting

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

-DEQP_RUNNER_VERSION=0.18.0
-
 if [ -n "${DEQP_RUNNER_GIT_TAG}${DEQP_RUNNER_GIT_REV}" ]; then
    # Build and install from source
    DEQP_RUNNER_CARGO_ARGS="--git ${DEQP_RUNNER_GIT_URL:-https://gitlab.freedesktop.org/anholt/deqp-runner.git}"
@@ -24,7 +16,7 @@ if [ -n "${DEQP_RUNNER_GIT_TAG}${DEQP_RUNNER_GIT_REV}" ]; then
    DEQP_RUNNER_CARGO_ARGS="${DEQP_RUNNER_CARGO_ARGS} ${EXTRA_CARGO_ARGS}"
 else
    # Install from package registry
-    DEQP_RUNNER_CARGO_ARGS="--version ${DEQP_RUNNER_VERSION} ${EXTRA_CARGO_ARGS} -- deqp-runner"
+    DEQP_RUNNER_CARGO_ARGS="--version 0.16.0 ${EXTRA_CARGO_ARGS} -- deqp-runner"
 fi

 if [ -z "$ANDROID_NDK_HOME" ]; then
@@ -35,7 +27,7 @@ if [ -z "$ANDROID_NDK_HOME" ]; then
 else
    mkdir -p /deqp-runner
    pushd /deqp-runner
-    git clone --branch v${DEQP_RUNNER_VERSION} --depth 1 https://gitlab.freedesktop.org/anholt/deqp-runner.git deqp-runner-git
+    git clone --branch v0.16.1 --depth 1 https://gitlab.freedesktop.org/anholt/deqp-runner.git deqp-runner-git
    pushd deqp-runner-git

    cargo install --locked  \
--- a/.gitlab-ci/container/build-deqp.sh
+++ b/.gitlab-ci/container/build-deqp.sh
@@ -8,23 +8,17 @@
 # DEBIAN_X86_64_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG

-set -ex -o pipefail
-
-DEQP_VERSION=vulkan-cts-1.3.7.0
+set -ex

 git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"
 git clone \
    https://github.com/KhronosGroup/VK-GL-CTS.git \
-    -b $DEQP_VERSION \
+    -b vulkan-cts-1.3.5.2 \
    --depth 1 \
    /VK-GL-CTS
 pushd /VK-GL-CTS

-mkdir -p /deqp
-
-echo "dEQP base version $DEQP_VERSION" > /deqp/version-log
-
 # 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).
@@ -32,17 +26,46 @@ echo "dEQP base version $DEQP_VERSION" > /deqp/version-log
 # patches.

 cts_commits_to_backport=(
-    # Take multiview into account for task shader inv. stats
-    22aa3f4c59f6e1d4daebd5a8c9c05bce6cd3b63b
+        # sync fix for SSBO writes
+        44f1be32fe6bd2a7de7b9169fc71cc44e0b26124

-    # Remove illegal mesh shader query tests
-    2a87f7b25dc27188be0f0a003b2d7aef69d9002e
+        # sync fix for KHR-GL46.multi_bind.dispatch_bind_image_textures
+        db6c9e295ab38054ace425cb75ff966719ccc609

-    # Relax fragment shader invocations result verifications
-    0d8bf6a2715f95907e9cf86a86876ff1f26c66fe
+        # VK robustness barriers fix
+        6052f21c4d6077438d644f525c10cc58dcdf25bf

-    # Fix several issues in dynamic rendering basic tests
-    c5453824b498c981c6ba42017d119f5de02a3e34
+        # correctness fixes for zink validation fails
+        1923cbc89ed3969a3afe7c6926124b51157902e1
+        af3a979c49dc65f8809c27660405ae3a76c7da4a
+
+        # GL/GLES vertex_attrib_binding.advanced-largeStrideAndOffsetsNewAndLegacyAPI fix
+        bdb456dcf85e34fced872ebdaf06f6b73451f99c
+
+        # KHR-GLES31.core.compute_shader.max fix
+        7aa3ebb49d07982f5c44edd4799edb5a894567e9
+
+        # GL arrays_of_arrays perf fix
+        b481dada59734e8e34050fe884ba6d627d9e5c54
+
+        # GL shadow samplers require depth compares fix
+        a8bc242ec234bf8d7df8b4eec1eeccab4e401288
+
+        # GL PolygonOffsetClamp fix
+        1f2feb2388da88b4e46eba55547d50856467cc20
+
+        # KHR-GL46.texture_view.view_sampling fix
+        aca29fb9553ebe28094513ce18bb46bad138cf46
+
+        # video validation fails
+        4cc3980a86ba5b7fe6e76b559cc1a9cb5fd1b253
+        a7a2ce442db51ca058ce051de7e09d62db44ae81
+
+        # Check for robustness before testing it
+        ee7138d8adf5ed3c4845e5ac2553c4f9697be9d8
+
+        # dEQP-VK.wsi.acquire_drm_display.*invalid_fd
+        98ad9402e7d94030d1689fd59135da7a2f52384c
 )

 for commit in "${cts_commits_to_backport[@]}"
@@ -65,14 +88,13 @@ do
  git am < $OLDPWD/.gitlab-ci/container/patches/$patch
 done

-echo "The following local patches are applied on top:" >> /deqp/version-log
-git log --reverse --oneline $DEQP_VERSION.. --format=%s | sed 's/^/- /' >> /deqp/version-log
-
 # --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

+mkdir -p /deqp
+
 # Save the testlog stylesheets:
 cp doc/testlog-stylesheet/testlog.{css,xsl} /deqp
 popd
@@ -98,18 +120,10 @@ if [ "${DEQP_TARGET}" != 'android' ]; then
 fi

 cmake -S /VK-GL-CTS -B . -G Ninja \
-      -DDEQP_TARGET=${DEQP_TARGET:-default} \
+      -DDEQP_TARGET=${DEQP_TARGET:-x11_glx} \
      -DCMAKE_BUILD_TYPE=Release \
      $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
-
-mold --run ninja
+ninja

 if [ "${DEQP_TARGET}" = 'android' ]; then
    mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-android
@@ -156,7 +170,8 @@ rm -rf /deqp/external/openglcts/modules/cts-runner
 rm -rf /deqp/modules/internal
 rm -rf /deqp/execserver
 rm -rf /deqp/framework
-find . -depth \( -iname '*cmake*' -o -name '*ninja*' -o -name '*.o' -o -name '*.a' \) -exec rm -rf {} \;
+# shellcheck disable=SC2038,SC2185 # TODO: rewrite find
+find -iname '*cmake*' -o -name '*ninja*' -o -name '*.o' -o -name '*.a' | xargs rm -rf
 ${STRIP_CMD:-strip} external/vulkancts/modules/vulkan/deqp-vk
 ${STRIP_CMD:-strip} external/openglcts/modules/glcts
 ${STRIP_CMD:-strip} modules/*/deqp-*
--- a/.gitlab-ci/container/build-directx-headers.sh
+++ b/.gitlab-ci/container/build-directx-headers.sh
@@ -1,15 +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 -ex
-
-git clone https://github.com/microsoft/DirectX-Headers -b v1.611.0 --depth 1
-pushd DirectX-Headers
-meson setup build --backend=ninja --buildtype=release -Dbuild-test=false $EXTRA_MESON_ARGS
-meson install -C build
-popd
-rm -rf DirectX-Headers
--- a/.gitlab-ci/container/build-fossilize.sh
+++ b/.gitlab-ci/container/build-fossilize.sh
@@ -1,15 +1,10 @@
 #!/bin/bash

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

 git clone https://github.com/ValveSoftware/Fossilize.git
 cd Fossilize
-git checkout b43ee42bbd5631ea21fe9a2dee4190d5d875c327
+git checkout 16fba1b8b5d9310126bb02323d7bae3227338461
 git submodule update --init
 mkdir build
 cd build
--- a/.gitlab-ci/container/build-kdl.sh
+++ b/.gitlab-ci/container/build-kdl.sh
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC1091  # the path is created by the script
-
-set -ex
-
-KDL_REVISION="5056f71b100a68b72b285c6fc845a66a2ed25985"
-
-mkdir ci-kdl.git
-pushd ci-kdl.git
-git init
-git remote add origin https://gitlab.freedesktop.org/gfx-ci/ci-kdl.git
-git fetch --depth 1 origin ${KDL_REVISION}
-git checkout FETCH_HEAD
-popd
-
-python3 -m venv ci-kdl.venv
-source ci-kdl.venv/bin/activate
-pushd ci-kdl.git
-pip install -r requirements.txt
-pip install .
-popd
-
-rm -rf ci-kdl.git
--- a/.gitlab-ci/container/build-kernel.sh
+++ b/.gitlab-ci/container/build-kernel.sh
@@ -1,30 +1,53 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # shellcheck disable=SC2086 # we want word splitting
-# shellcheck disable=SC2153

 set -ex

 mkdir -p kernel
+curl -L -s --retry 4 -f --retry-all-errors --retry-delay 60 ${KERNEL_URL} \
+    | tar -xj --strip-components=1 -C kernel
 pushd kernel

-if [[ ${DEBIAN_ARCH} = "arm64" ]]; then
-    KERNEL_IMAGE_NAME+=" cheza-kernel"
-fi
-
-for image in ${KERNEL_IMAGE_NAME}; do
-    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-      -o "/lava-files/${image}" "${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${image}"
+# The kernel doesn't like the gold linker (or the old lld in our debians).
+# Sneak in some override symlinks during kernel build until we can update
+# debian (they'll get blown away by the rm of the kernel dir at the end).
+mkdir -p ld-links
+for i in /usr/bin/*-ld /usr/bin/ld; do
+    i=$(basename $i)
+    ln -sf /usr/bin/$i.bfd ld-links/$i
 done

-for dtb in ${DEVICE_TREES}; do
-    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-      -o "/lava-files/${dtb}" "${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${dtb}"
-  done
+NEWPATH=$(pwd)/ld-links
+export PATH=$NEWPATH:$PATH

-mkdir -p "/lava-files/rootfs-${DEBIAN_ARCH}"
-curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-  -O "${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/modules.tar.zst"
-tar --keep-directory-symlink --zstd -xf modules.tar.zst -C "/lava-files/rootfs-${DEBIAN_ARCH}/"
+KERNEL_FILENAME=$(basename $KERNEL_URL)
+export LOCALVERSION="$KERNEL_FILENAME"
+./scripts/kconfig/merge_config.sh ${DEFCONFIG} ../.gitlab-ci/container/${KERNEL_ARCH}.config
+make ${KERNEL_IMAGE_NAME}
+for image in ${KERNEL_IMAGE_NAME}; do
+    cp arch/${KERNEL_ARCH}/boot/${image} /lava-files/.
+done
+
+if [[ -n ${DEVICE_TREES} ]]; then
+    make dtbs
+    cp ${DEVICE_TREES} /lava-files/.
+fi
+
+make modules
+INSTALL_MOD_PATH=/lava-files/rootfs-${DEBIAN_ARCH}/ make modules_install
+
+if [[ ${DEBIAN_ARCH} = "arm64" ]]; then
+    make Image.lzma
+    mkimage \
+        -f auto \
+        -A arm \
+        -O linux \
+        -d arch/arm64/boot/Image.lzma \
+        -C lzma\
+        -b arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dtb \
+        /lava-files/cheza-kernel
+    KERNEL_IMAGE_NAME+=" cheza-kernel"
+fi

 popd
 rm -rf kernel
--- a/.gitlab-ci/container/build-libdrm.sh
+++ b/.gitlab-ci/container/build-libdrm.sh
@@ -1,10 +1,9 @@
 #!/usr/bin/env bash
-# Script used for Android and Fedora builds
 # shellcheck disable=SC2086 # we want word splitting

 set -ex

-export LIBDRM_VERSION=libdrm-2.4.119
+export LIBDRM_VERSION=libdrm-2.4.114

 curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \
    https://dri.freedesktop.org/libdrm/"$LIBDRM_VERSION".tar.xz
--- a/.gitlab-ci/container/build-piglit.sh
+++ b/.gitlab-ci/container/build-piglit.sh
@@ -1,14 +1,9 @@
 #!/bin/bash
 # shellcheck disable=SC2086 # we want word splitting
+
 set -ex

-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_X86_64_TEST_GL_TAG
-# DEBIAN_X86_64_TEST_VK_TAG
-# KERNEL_ROOTFS_TAG
-
-REV="f7db20b03de6896d013826c0a731bc4417c1a5a0"
+REV="5036601c43fff63f7be5cd8ad7b319a5c1f6652c"

 git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
 pushd /piglit
@@ -16,18 +11,18 @@ 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]' \) -exec rm -rf {} \;
+# shellcheck disable=SC2038,SC2185 # TODO: rewrite find
+find -name .git -o -name '*ninja*' -o -iname '*cmake*' -o -name '*.[chao]' | xargs rm -rf
 rm -rf target_api
 if [ "$PIGLIT_BUILD_TARGETS" = "piglit_replayer" ]; then
-    find . -depth \
-         ! -regex "^\.$" \
+    # shellcheck disable=SC2038,SC2185 # TODO: rewrite find
+    find ! -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
+         ! -regex "^\.\/tests\/replay\.py" 2>/dev/null | xargs rm -rf
 fi
 popd
--- a/.gitlab-ci/container/build-rust.sh
+++ b/.gitlab-ci/container/build-rust.sh
@@ -11,11 +11,11 @@ set -ex
 mkdir -p "$HOME"/.cargo
 ln -s /usr/local/bin "$HOME"/.cargo/bin

-# Rusticl requires at least Rust 1.66.0 and NAK requires 1.73.0
+# Rusticl requires at least Rust 1.60.0
 #
 # Also, pick a specific snapshot from rustup so the compiler doesn't drift on
 # us.
-RUST_VERSION=1.73.0-2023-10-05
+RUST_VERSION=1.60.0-2022-04-07

 # For rust in Mesa, we use rustup to install.  This lets us pick an arbitrary
 # version of the compiler, rather than whatever the container's Debian comes
--- a/.gitlab-ci/container/build-shader-db.sh
+++ b/.gitlab-ci/container/build-shader-db.sh
@@ -1,14 +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
-
-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
--- a/.gitlab-ci/container/build-vkd3d-proton.sh
+++ b/.gitlab-ci/container/build-vkd3d-proton.sh
@@ -6,7 +6,7 @@
 # KERNEL_ROOTFS_TAG
 set -ex

-VKD3D_PROTON_COMMIT="a0ccc383937903f4ca0997ce53e41ccce7f2f2ec"
+VKD3D_PROTON_COMMIT="6365efeba253807beecaed0eaa963295522c6b70"

 VKD3D_PROTON_DST_DIR="/vkd3d-proton-tests"
 VKD3D_PROTON_SRC_DIR="/vkd3d-proton-src"
--- a/.gitlab-ci/container/build-vulkan-validation.sh
+++ b/.gitlab-ci/container/build-vulkan-validation.sh
@@ -7,7 +7,7 @@

 set -ex

-VALIDATION_TAG="v1.3.269"
+VALIDATION_TAG="v1.3.251"

 git clone -b "$VALIDATION_TAG" --single-branch --depth 1 https://github.com/KhronosGroup/Vulkan-ValidationLayers.git
 pushd Vulkan-ValidationLayers
--- a/.gitlab-ci/container/container_post_build.sh
+++ b/.gitlab-ci/container/container_post_build.sh
@@ -1,12 +1,10 @@
-#!/usr/bin/env bash
+#!/bin/sh

 if test -f /etc/debian_version; then
    apt-get autoremove -y --purge
 fi

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

 if test -x /usr/bin/ccache; then
--- a/.gitlab-ci/container/container_pre_build.sh
+++ b/.gitlab-ci/container/container_pre_build.sh
@@ -25,7 +25,7 @@ fi

 # When not using the mold linker (e.g. unsupported architecture), force
 # linkers to gold, since it's so much faster for building.  We can't use
-# lld because we're on old debian and it's buggy.  mingw fails meson builds
+# lld because we're on old debian and it's buggy.  ming fails meson builds
 # with it with "meson.build:21:0: ERROR: Unable to determine dynamic linker"
 find /usr/bin -name \*-ld -o -name ld | \
    grep -v mingw | \
--- a/.gitlab-ci/container/cross_build.sh
+++ b/.gitlab-ci/container/cross_build.sh
@@ -8,61 +8,55 @@ export DEBIAN_FRONTEND=noninteractive
 export LLVM_VERSION="${LLVM_VERSION:=15}"

 # 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"
-    "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"
-    "libwayland-dev:$arch"
-)
+STABLE_EPHEMERAL=" \
+        "

 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
+apt-get install -y --no-remove \
+        $STABLE_EPHEMERAL \
+        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 \
+        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 \
+        libwayland-dev:$arch

 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}"
+    apt-get remove -y clang-format-${LLVM_VERSION} libclang-cpp${LLVM_VERSION}

    # llvm-*-tools:$arch conflicts with python3:amd64. Install dependencies only
    # with apt-get, then force-install llvm-*-{dev,tools}:$arch with dpkg to get
    # around this.
    apt-get install -y --no-remove --no-install-recommends \
-            "libclang-cpp${LLVM_VERSION}:$arch" \
-            "libgcc-s1:$arch" \
-            "libtinfo-dev:$arch" \
-            "libz3-dev:$arch" \
-            "llvm-${LLVM_VERSION}:$arch" \
+            libclang-cpp${LLVM_VERSION}:$arch \
+            libgcc-s1:$arch \
+            libtinfo-dev:$arch \
+            libz3-dev:$arch \
+            llvm-${LLVM_VERSION}:$arch \
            zlib1g
 fi

@@ -73,19 +67,19 @@ fi


 # 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}"
+EXTRA_MESON_ARGS="--cross-file=/cross_file-${arch}.txt -D libdir=lib/$(dpkg-architecture -A $arch -qDEB_TARGET_MULTIARCH)"
+. .gitlab-ci/container/build-libdrm.sh
+
 . .gitlab-ci/container/build-wayland.sh

-. .gitlab-ci/container/build-directx-headers.sh
-
-apt-get purge -y "${EPHEMERAL[@]}"
+apt-get purge -y \
+        $STABLE_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
+    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
--- a/.gitlab-ci/container/debian/android_build.sh
+++ b/.gitlab-ci/container/debian/android_build.sh
@@ -1,19 +1,15 @@
 #!/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 -ex

-EPHEMERAL=(
-    autoconf
-    rdfind
-    unzip
-)
+EPHEMERAL="\
+         autoconf \
+         rdfind \
+         unzip \
+         "

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

 # Fetch the NDK and extract just the toolchain we want.
 ndk=$ANDROID_NDK
@@ -25,7 +21,7 @@ rm $ndk.zip
 # 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 {} \;
+find /${ndk}/ -type f | grep -E -i "clang-check|clang-tidy|lldb" | xargs rm -f

 sh .gitlab-ci/container/create-android-ndk-pc.sh /$ndk zlib.pc "" "-lz" "1.2.3" $ANDROID_SDK_VERSION

@@ -34,13 +30,33 @@ sh .gitlab-ci/container/create-android-cross-file.sh /$ndk i686-linux-android x8
 sh .gitlab-ci/container/create-android-cross-file.sh /$ndk aarch64-linux-android aarch64 armv8 $ANDROID_SDK_VERSION
 sh .gitlab-ci/container/create-android-cross-file.sh /$ndk arm-linux-androideabi arm armv7hl $ANDROID_SDK_VERSION armv7a-linux-androideabi

+# Not using build-libdrm.sh because we don't want its cleanup after building
+# each arch.  Fetch and extract now.
+export LIBDRM_VERSION=libdrm-2.4.114
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+  -O https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz
+tar -xf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz
+
 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
+
+    cd $LIBDRM_VERSION
+    rm -rf build-$arch
+    meson setup build-$arch \
+          --cross-file=/cross_file-$arch.txt \
+          --libdir=lib/$arch \
+          -Dnouveau=disabled \
+          -Dvc4=disabled \
+          -Detnaviv=disabled \
+          -Dfreedreno=disabled \
+          -Dintel=disabled \
+          -Dcairo-tests=disabled \
+          -Dvalgrind=disabled
+    meson install -C build-$arch
+    cd ..
 done

 rm -rf $LIBDRM_VERSION
@@ -90,4 +106,4 @@ done
 cd ..
 rm -rf $LIBELF_VERSION

-apt-get purge -y "${EPHEMERAL[@]}"
+apt-get purge -y $EPHEMERAL
--- a/.gitlab-ci/container/debian/arm64_build.sh
+++ b/.gitlab-ci/container/debian/arm64_build.sh
@@ -8,68 +8,67 @@ export LLVM_VERSION="${LLVM_VERSION:=15}"

 apt-get -y install ca-certificates
 sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list.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

-# Ephemeral packages (installed for this script and removed again at the end)
-EPHEMERAL=(
-    libssl-dev
-)
+# Ephemeral packages (installed for this script and removed again at
+# the end)
+STABLE_EPHEMERAL=" \
+        libssl-dev \
+        "

-DEPS=(
-    apt-utils
-    android-libext4-utils
-    autoconf
-    automake
-    bc
-    bison
-    ccache
-    cmake
-    curl
-    fastboot
-    flex
-    g++
-    git
-    glslang-tools
-    kmod
-    libasan8
-    libdrm-dev
-    libelf-dev
-    libexpat1-dev
-    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
-    libxxf86vm-dev
-    libwayland-dev
-    libwayland-egl-backend-dev
-    "llvm-${LLVM_VERSION}-dev"
-    ninja-build
-    meson
-    openssh-server
-    pkgconf
-    python3-mako
-    python3-pil
-    python3-pip
-    python3-requests
-    python3-setuptools
-    u-boot-tools
-    xz-utils
-    zlib1g-dev
-    zstd
-)
-
-apt-get -y install "${DEPS[@]}" "${EPHEMERAL[@]}"
+apt-get -y install \
+	${STABLE_EPHEMERAL} \
+	apt-utils \
+	android-libext4-utils \
+	autoconf \
+	automake \
+	bc \
+	bison \
+	ccache \
+	cmake \
+	curl \
+	debootstrap \
+	fastboot \
+	flex \
+	g++ \
+	git \
+	glslang-tools \
+	kmod \
+	libasan8 \
+	libdrm-dev \
+	libelf-dev \
+	libexpat1-dev \
+	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 \
+	libxxf86vm-dev \
+	libwayland-dev \
+	libwayland-egl-backend-dev \
+	llvm-${LLVM_VERSION}-dev \
+	ninja-build \
+	meson \
+	openssh-server \
+	pkgconf \
+	python3-mako \
+	python3-pil \
+	python3-pip \
+	python3-requests \
+	python3-setuptools \
+	u-boot-tools \
+	xz-utils \
+	zlib1g-dev \
+	zstd

 pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2

@@ -82,6 +81,6 @@ arch=armhf

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

-apt-get purge -y "${EPHEMERAL[@]}"
+apt-get purge -y $STABLE_EPHEMERAL

 . .gitlab-ci/container/container_post_build.sh
--- a/.gitlab-ci/container/debian/arm_test.sh
+++ b/.gitlab-ci/container/debian/arm_test.sh
@@ -9,29 +9,23 @@ set -e
 set -o xtrace

 ############### Install packages for baremetal testing
-DEPS=(
-    cpio
-    curl
-    fastboot
-    netcat-openbsd
-    openssh-server
-    procps
-    python3-distutils
-    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[@]}"
+apt-get install -y --no-remove \
+        cpio \
+        curl \
+        fastboot \
+        netcat-openbsd \
+        openssh-server \
+        procps \
+        python3-distutils \
+        python3-minimal \
+        python3-serial \
+        rsync \
+        snmp \
+        zstd

 # setup SNMPv2 SMI MIB
 curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
--- a/.gitlab-ci/container/debian/ppc64el_build.sh
+++ b/.gitlab-ci/container/debian/ppc64el_build.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 arch=ppc64el

--- a/.gitlab-ci/container/debian/s390x_build.sh
+++ b/.gitlab-ci/container/debian/s390x_build.sh
@@ -1,18 +1,16 @@
-#!/usr/bin/env bash
+#!/bin/bash

 set -e

 arch=s390x

 # Ephemeral packages (installed for this script and removed again at the end)
-EPHEMERAL=(
-    libssl-dev
-)
+STABLE_EPHEMERAL="libssl-dev"

-apt-get -y install "${EPHEMERAL[@]}"
+apt-get -y install "$STABLE_EPHEMERAL"

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

-apt-get purge -y "${EPHEMERAL[@]}"
+apt-get purge -y "$STABLE_EPHEMERAL"

 . .gitlab-ci/container/cross_build.sh
--- a/.gitlab-ci/container/debian/x86_32_build.sh
+++ b/.gitlab-ci/container/debian/x86_32_build.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 arch=i386

--- a/.gitlab-ci/container/debian/x86_64_build-base-wine.sh
+++ b/.gitlab-ci/container/debian/x86_64_build-base-wine.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+set -e
+set -o xtrace
+
+# Installing wine, need this for testing mingw or nine
+
+apt-get update
+apt-get install -y --no-remove \
+      wine \
+      wine64 \
+      xvfb
+
+# Used to initialize the Wine environment to reduce build time
+wine wineboot.exe --init
--- a/.gitlab-ci/container/debian/x86_64_build-base.sh
+++ b/.gitlab-ci/container/debian/x86_64_build-base.sh
@@ -1,10 +1,6 @@
-#!/usr/bin/env bash
+#!/bin/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
 set -o xtrace

@@ -13,86 +9,82 @@ export LLVM_VERSION="${LLVM_VERSION:=15}"

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

 # Ephemeral packages (installed for this script and removed again at
 # the end)
-EPHEMERAL=(
-)
-
-DEPS=(
-    apt-utils
-    bison
-    ccache
-    curl
-    "clang-format-${LLVM_VERSION}"
-    dpkg-cross
-    findutils
-    flex
-    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
-    libgtk-3-dev
-    "libllvm${LLVM_VERSION}"
-    libomxil-bellagio-dev
-    libpciaccess-dev
-    libunwind-dev
-    libva-dev
-    libvdpau-dev
-    libvulkan-dev
-    libx11-dev
-    libx11-xcb-dev
-    libxext-dev
-    libxml2-utils
-    libxrandr-dev
-    libxrender-dev
-    libxshmfence-dev
-    libxxf86vm-dev
-    libwayland-egl-backend-dev
-    make
-    ninja-build
-    openssh-server
-    pkgconf
-    python3-mako
-    python3-pil
-    python3-pip
-    python3-ply
-    python3-requests
-    python3-setuptools
-    qemu-user
-    valgrind
-    x11proto-dri2-dev
-    x11proto-gl-dev
-    x11proto-randr-dev
-    xz-utils
-    zlib1g-dev
-    zstd
-)
+STABLE_EPHEMERAL=" \
+        "

 apt-get update

-apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
-        $EXTRA_LOCAL_PACKAGES
+apt-get install -y --no-remove \
+        $STABLE_EPHEMERAL \
+        apt-utils \
+        bison \
+        ccache \
+        curl \
+        clang-format-${LLVM_VERSION} \
+        dpkg-cross \
+        findutils \
+        flex \
+        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 \
+        libgtk-3-dev \
+        libllvm${LLVM_VERSION} \
+        libomxil-bellagio-dev \
+        libpciaccess-dev \
+        libunwind-dev \
+        libva-dev \
+        libvdpau-dev \
+        libvulkan-dev \
+        libx11-dev \
+        libx11-xcb-dev \
+        libxext-dev \
+        libxml2-utils \
+        libxrandr-dev \
+        libxrender-dev \
+        libxshmfence-dev \
+        libxxf86vm-dev \
+        libwayland-egl-backend-dev \
+        make \
+        meson \
+        ninja-build \
+        openssh-server \
+        pkgconf \
+        python3-mako \
+        python3-pil \
+        python3-pip \
+        python3-ply \
+        python3-requests \
+        python3-setuptools \
+        qemu-user \
+        valgrind \
+        x11proto-dri2-dev \
+        x11proto-gl-dev \
+        x11proto-randr-dev \
+        xz-utils \
+        zlib1g-dev \
+        zstd

 # Needed for ci-fairy, this revision is able to upload files to S3
 pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2

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

+. .gitlab-ci/container/debian/x86_64_build-base-wine.sh
+
 ############### Uninstall ephemeral packages

-apt-get purge -y "${EPHEMERAL[@]}"
+apt-get purge -y $STABLE_EPHEMERAL

 . .gitlab-ci/container/container_post_build.sh
--- a/.gitlab-ci/container/debian/x86_64_build-mingw-patch.sh
+++ b/.gitlab-ci/container/debian/x86_64_build-mingw-patch.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+# shellcheck disable=SC2086 # we want word splitting
+
+set -e
+
+# Pull packages from msys2 repository that can be directly used.
+# We can use https://packages.msys2.org/ to retrieve the newest package
+mkdir ~/tmp
+pushd ~/tmp
+MINGW_PACKET_LIST="
+mingw-w64-x86_64-headers-git-10.0.0.r14.ga08c638f8-1-any.pkg.tar.zst
+mingw-w64-x86_64-vulkan-loader-1.3.211-1-any.pkg.tar.zst
+mingw-w64-x86_64-libelf-0.8.13-6-any.pkg.tar.zst
+mingw-w64-x86_64-zlib-1.2.12-1-any.pkg.tar.zst
+mingw-w64-x86_64-zstd-1.5.2-2-any.pkg.tar.zst
+"
+
+for i in $MINGW_PACKET_LIST
+do
+  curl -L -s --retry 4 -f --retry-all-errors --retry-delay 60 \
+    -O "https://mirror.msys2.org/mingw/mingw64/$i"
+  tar xf $i --strip-components=1 -C /usr/x86_64-w64-mingw32/
+done
+popd
+rm -rf ~/tmp
+
+mkdir -p /usr/x86_64-w64-mingw32/bin
+
+# The output of `wine64 llvm-config --system-libs --cxxflags mcdisassembler`
+# containes absolute path like '-IZ:'
+# The sed is used to replace `-IZ:/usr/x86_64-w64-mingw32/include`
+# to `-I/usr/x86_64-w64-mingw32/include`
+
+# Debian's pkg-config wrapers for mingw are broken, and there's no sign that
+# they're going to be fixed, so we'll just have to fix it ourselves
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=930492
+cat >/usr/x86_64-w64-mingw32/bin/pkg-config <<EOF
+#!/bin/sh
+
+PKG_CONFIG_LIBDIR=/usr/x86_64-w64-mingw32/lib/pkgconfig:/usr/x86_64-w64-mingw32/share/pkgconfig pkg-config \$@
+EOF
+chmod +x /usr/x86_64-w64-mingw32/bin/pkg-config
+
+cat >/usr/x86_64-w64-mingw32/bin/llvm-config <<EOF
+#!/bin/sh
+wine64 llvm-config \$@ | sed -e "s,Z:/,/,gi"
+EOF
+chmod +x /usr/x86_64-w64-mingw32/bin/llvm-config
+
+cat >/usr/x86_64-w64-mingw32/bin/clang <<EOF
+#!/bin/sh
+wine64 clang \$@
+EOF
+chmod +x /usr/x86_64-w64-mingw32/bin/clang
+
+cat >/usr/x86_64-w64-mingw32/bin/llvm-as <<EOF
+#!/bin/sh
+wine64 llvm-as \$@
+EOF
+chmod +x /usr/x86_64-w64-mingw32/bin/llvm-as
+
+cat >/usr/x86_64-w64-mingw32/bin/llvm-link <<EOF
+#!/bin/sh
+wine64 llvm-link \$@
+EOF
+chmod +x /usr/x86_64-w64-mingw32/bin/llvm-link
+
+cat >/usr/x86_64-w64-mingw32/bin/opt <<EOF
+#!/bin/sh
+wine64 opt \$@
+EOF
+chmod +x /usr/x86_64-w64-mingw32/bin/opt
+
+cat >/usr/x86_64-w64-mingw32/bin/llvm-spirv <<EOF
+#!/bin/sh
+wine64 llvm-spirv \$@
+EOF
+chmod +x /usr/x86_64-w64-mingw32/bin/llvm-spirv
--- a/.gitlab-ci/container/debian/x86_64_build-mingw-source-deps.sh
+++ b/.gitlab-ci/container/debian/x86_64_build-mingw-source-deps.sh
@@ -0,0 +1,125 @@
+#!/bin/bash
+# shellcheck disable=SC2086 # we want word splitting
+
+set -e
+
+# Building libdrm (libva dependency)
+. .gitlab-ci/container/build-libdrm.sh
+
+wd=$PWD
+CMAKE_TOOLCHAIN_MINGW_PATH=$wd/.gitlab-ci/container/debian/x86_mingw-toolchain.cmake
+mkdir -p ~/tmp
+pushd ~/tmp
+
+# Building DirectX-Headers
+git clone https://github.com/microsoft/DirectX-Headers -b v1.606.4 --depth 1
+mkdir -p DirectX-Headers/build
+pushd DirectX-Headers/build
+meson .. \
+--backend=ninja \
+--buildtype=release -Dbuild-test=false \
+-Dprefix=/usr/x86_64-w64-mingw32/ \
+--cross-file=$wd/.gitlab-ci/x86_64-w64-mingw32
+
+ninja install
+popd
+
+# Building libva
+git clone https://github.com/intel/libva
+pushd libva/
+# libva-win32 is released with libva version 2.17 (see https://github.com/intel/libva/releases/tag/2.17.0)
+git checkout 2.17.0
+popd
+# libva already has a build dir in their repo, use builddir instead
+mkdir -p libva/builddir
+pushd libva/builddir
+meson .. \
+--backend=ninja \
+--buildtype=release \
+-Dprefix=/usr/x86_64-w64-mingw32/ \
+--cross-file=$wd/.gitlab-ci/x86_64-w64-mingw32
+
+ninja install
+popd
+
+export VULKAN_SDK_VERSION=1.3.211.0
+
+# Building SPIRV Tools
+git clone -b sdk-$VULKAN_SDK_VERSION --depth=1 \
+https://github.com/KhronosGroup/SPIRV-Tools SPIRV-Tools
+
+git clone -b sdk-$VULKAN_SDK_VERSION --depth=1 \
+https://github.com/KhronosGroup/SPIRV-Headers SPIRV-Tools/external/SPIRV-Headers
+
+mkdir -p SPIRV-Tools/build
+pushd SPIRV-Tools/build
+cmake .. \
+-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_MINGW_PATH \
+-DCMAKE_INSTALL_PREFIX=/usr/x86_64-w64-mingw32/ \
+-GNinja -DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_CROSSCOMPILING=1 \
+-DCMAKE_POLICY_DEFAULT_CMP0091=NEW
+
+ninja install
+popd
+
+# Building LLVM
+git clone -b release/15.x --depth=1 \
+https://github.com/llvm/llvm-project llvm-project
+
+git clone -b v15.0.0 --depth=1 \
+https://github.com/KhronosGroup/SPIRV-LLVM-Translator llvm-project/llvm/projects/SPIRV-LLVM-Translator
+
+mkdir llvm-project/build
+pushd llvm-project/build
+cmake ../llvm \
+-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_MINGW_PATH \
+-DCMAKE_INSTALL_PREFIX=/usr/x86_64-w64-mingw32/ \
+-GNinja -DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_CROSSCOMPILING=1 \
+-DLLVM_ENABLE_RTTI=ON \
+-DCROSS_TOOLCHAIN_FLAGS_NATIVE=-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=$PWD/../../SPIRV-Tools/external/SPIRV-Headers \
+-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=$PWD/../../SPIRV-Tools/external/SPIRV-Headers \
+-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
+
+ninja install
+popd
+
+# Building libclc
+mkdir llvm-project/build-libclc
+pushd llvm-project/build-libclc
+cmake ../libclc \
+-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_MINGW_PATH \
+-DCMAKE_INSTALL_PREFIX=/usr/x86_64-w64-mingw32/ \
+-GNinja -DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_CROSSCOMPILING=1 \
+-DCMAKE_POLICY_DEFAULT_CMP0091=NEW \
+-DCMAKE_CXX_FLAGS="-m64" \
+-DLLVM_CONFIG="/usr/x86_64-w64-mingw32/bin/llvm-config" \
+-DLLVM_CLANG="/usr/x86_64-w64-mingw32/bin/clang" \
+-DLLVM_AS="/usr/x86_64-w64-mingw32/bin/llvm-as" \
+-DLLVM_LINK="/usr/x86_64-w64-mingw32/bin/llvm-link" \
+-DLLVM_OPT="/usr/x86_64-w64-mingw32/bin/opt" \
+-DLLVM_SPIRV="/usr/x86_64-w64-mingw32/bin/llvm-spirv" \
+-DLIBCLC_TARGETS_TO_BUILD="spirv-mesa3d-;spirv64-mesa3d-"
+
+ninja install
+popd
+
+popd # ~/tmp
+
+# Cleanup ~/tmp
+rm -rf ~/tmp
--- a/.gitlab-ci/container/debian/x86_64_build-mingw.sh
+++ b/.gitlab-ci/container/debian/x86_64_build-mingw.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -e
+set -o xtrace
+
+apt-get update
+apt-get install -y --no-remove \
+        zstd \
+        g++-mingw-w64-i686 \
+        g++-mingw-w64-x86-64
+
+. .gitlab-ci/container/debian/x86_64_build-mingw-patch.sh
+. .gitlab-ci/container/debian/x86_64_build-mingw-source-deps.sh
--- a/.gitlab-ci/container/debian/x86_64_build.sh
+++ b/.gitlab-ci/container/debian/x86_64_build.sh
@@ -1,10 +1,6 @@
 #!/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
 set -o xtrace

@@ -12,52 +8,49 @@ export DEBIAN_FRONTEND=noninteractive
 export LLVM_VERSION="${LLVM_VERSION:=15}"

 # 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"
-    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
-    "llvm-${LLVM_VERSION}-dev"
-    ocl-icd-opencl-dev
-    python3-pip
-    python3-venv
-    procps
-    spirv-tools
-    shellcheck
-    strace
-    time
-    yamllint
-    zstd
-)
+STABLE_EPHEMERAL=" \
+      autoconf \
+      automake \
+      autotools-dev \
+      bzip2 \
+      libtool \
+      libssl-dev \
+      "

 apt-get update

 apt-get install -y --no-remove \
-      "${DEPS[@]}" "${EPHEMERAL[@]}"
+      $STABLE_EPHEMERAL \
+      check \
+      clang-${LLVM_VERSION} \
+      libasan8 \
+      libarchive-dev \
+      libdrm-dev \
+      libclang-cpp${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 \
+      llvm-${LLVM_VERSION}-dev \
+      ocl-icd-opencl-dev \
+      python3-pip \
+      python3-venv \
+      procps \
+      spirv-tools \
+      shellcheck \
+      strace \
+      time \
+      yamllint \
+      zstd


 . .gitlab-ci/container/container_pre_build.sh
@@ -81,21 +74,31 @@ rm -rf $XORGMACROS_VERSION

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

-. .gitlab-ci/container/build-shader-db.sh
+pushd /usr/local
+git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
+rm -rf shader-db/.git
+cd shader-db
+make
+popd

-. .gitlab-ci/container/build-directx-headers.sh
+git clone https://github.com/microsoft/DirectX-Headers -b v1.711.3-preview --depth 1
+pushd DirectX-Headers
+meson setup build --backend=ninja --buildtype=release -Dbuild-test=false
+meson install -C build
+popd
+rm -rf DirectX-Headers

 python3 -m pip install --break-system-packages -r .gitlab-ci/lava/requirements.txt

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

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

-apt-get purge -y "${EPHEMERAL[@]}"
+apt-get purge -y \
+      $STABLE_EPHEMERAL

 . .gitlab-ci/container/container_post_build.sh
--- a/.gitlab-ci/container/debian/x86_64_mingw-toolchain.cmake
+++ b/.gitlab-ci/container/debian/x86_64_mingw-toolchain.cmake
@@ -0,0 +1,8 @@
+set(CMAKE_SYSTEM_NAME Windows)
+set(CMAKE_SYSTEM_PROCESSOR x86_64)
+
+set(CMAKE_SYSROOT /usr/x86_64-w64-mingw32/)
+set(ENV{PKG_CONFIG} /usr/x86_64-w64-mingw32/bin/pkgconf)
+
+set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc-posix)
+set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++-posix)
--- a/.gitlab-ci/container/debian/x86_64_test-android.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-android.sh
@@ -1,6 +1,7 @@
 #!/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
 set -o xtrace
@@ -8,22 +9,20 @@ set -o xtrace
 export DEBIAN_FRONTEND=noninteractive

 # Ephemeral packages (installed for this script and removed again at the end)
-EPHEMERAL=(
-   build-essential:native
-   ccache
-   cmake
-   config-package-dev
-   debhelper-compat
-   dpkg-dev
-   ninja-build
-   unzip
-)
+STABLE_EPHEMERAL=" \
+      ccache \
+      unzip \
+      dpkg-dev \
+      build-essential:native \
+      config-package-dev \
+      debhelper-compat \
+      cmake \
+      ninja-build \
+      "

-DEPS=(
-    iproute2
-)
 apt-get install -y --no-remove --no-install-recommends \
-      "${DEPS[@]}" "${EPHEMERAL[@]}"
+      $STABLE_EPHEMERAL \
+      iproute2

 ############### Building ...

@@ -34,9 +33,9 @@ apt-get install -y --no-remove --no-install-recommends \
 # Fetch the NDK and extract just the toolchain we want.
 ndk=$ANDROID_NDK
 curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-  -o "$ndk.zip" "https://dl.google.com/android/repository/$ndk-linux.zip"
-unzip -d / "$ndk.zip"
-rm "$ndk.zip"
+  -o $ndk.zip https://dl.google.com/android/repository/$ndk-linux.zip
+unzip -d / $ndk.zip
+rm $ndk.zip

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

@@ -92,6 +91,9 @@ usermod -a -G kvm,cvdnetwork root

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

-apt-get purge -y "${EPHEMERAL[@]}"
+ccache --show-stats

-. .gitlab-ci/container/container_post_build.sh
+apt-get purge -y \
+      $STABLE_EPHEMERAL
+
+apt-get autoremove -y --purge
--- a/.gitlab-ci/container/debian/x86_64_test-base.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-base.sh
@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting

-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BASE_TAG
-
 set -e
 set -o xtrace

@@ -14,92 +10,50 @@ apt-get install -y ca-certificates gnupg2 software-properties-common

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

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

-# Ephemeral packages (installed for this script and removed again at the end)
-EPHEMERAL=(
-    autoconf
-    automake
-    bc
-    bison
-    bzip2
-    ccache
-    cmake
-    "clang-${LLVM_VERSION}"
-    flex
-    glslang-tools
-    g++
-    libasound2-dev
-    libcap-dev
-    "libclang-cpp${LLVM_VERSION}-dev"
-    libdrm-dev
-    libegl-dev
-    libelf-dev
-    libepoxy-dev
-    libgbm-dev
-    libpciaccess-dev
-    libssl-dev
-    libvulkan-dev
-    libwayland-dev
-    libx11-xcb-dev
-    libxext-dev
-    "llvm-${LLVM_VERSION}-dev"
-    make
-    meson
-    openssh-server
-    patch
-    pkgconf
-    protobuf-compiler
-    python3-dev
-    python3-pip
-    python3-setuptools
-    python3-wheel
-    spirv-tools
-    wayland-protocols
-    xz-utils
-)
-
-DEPS=(
-    apt-utils
-    curl
-    git
-    git-lfs
-    inetutils-syslogd
-    iptables
-    jq
-    libasan8
-    libdrm2
-    libexpat1
-    "libllvm${LLVM_VERSION}"
-    liblz4-1
-    libpng16-16
-    libpython3.11
-    libvulkan1
-    libwayland-client0
-    libwayland-server0
-    libxcb-ewmh2
-    libxcb-randr0
-    libxcb-xfixes0
-    libxkbcommon0
-    libxrandr2
-    libxrender1
-    python3-mako
-    python3-numpy
-    python3-packaging
-    python3-pil
-    python3-requests
-    python3-six
-    python3-yaml
-    socat
-    vulkan-tools
-    waffle-utils
-    xauth
-    xvfb
-    zlib1g
-    zstd
-)
+# Ephemeral packages (installed for this script and removed again at
+# the end)
+STABLE_EPHEMERAL=" \
+      autoconf \
+      automake \
+      bc \
+      bison \
+      bzip2 \
+      ccache \
+      cmake \
+      clang-${LLVM_VERSION} \
+      flex \
+      glslang-tools \
+      g++ \
+      libasound2-dev \
+      libcap-dev \
+      libclang-cpp${LLVM_VERSION}-dev \
+      libdrm-dev \
+      libegl-dev \
+      libelf-dev \
+      libepoxy-dev \
+      libgbm-dev \
+      libpciaccess-dev \
+      libvulkan-dev \
+      libwayland-dev \
+      libx11-xcb-dev \
+      libxext-dev \
+      llvm-${LLVM_VERSION}-dev \
+      make \
+      meson \
+      openssh-server \
+      patch \
+      pkgconf \
+      protobuf-compiler \
+      python3-dev \
+      python3-pip \
+      python3-setuptools \
+      python3-wheel \
+      spirv-tools \
+      wayland-protocols \
+      xz-utils \
+      "

 apt-get update
 apt-get dist-upgrade -y
@@ -107,9 +61,48 @@ apt-get dist-upgrade -y
 apt-get install --purge -y \
      sysvinit-core libelogind0

-apt-get install -y --no-remove "${DEPS[@]}"
+apt-get install -y --no-remove \
+      apt-utils \
+      curl \
+      git \
+      git-lfs \
+      inetutils-syslogd \
+      iptables \
+      jq \
+      libasan8 \
+      libdrm2 \
+      libexpat1 \
+      libllvm${LLVM_VERSION} \
+      liblz4-1 \
+      libpng16-16 \
+      libpython3.11 \
+      libvulkan1 \
+      libwayland-client0 \
+      libwayland-server0 \
+      libxcb-ewmh2 \
+      libxcb-randr0 \
+      libxcb-xfixes0 \
+      libxkbcommon0 \
+      libxrandr2 \
+      libxrender1 \
+      python3-mako \
+      python3-numpy \
+      python3-packaging \
+      python3-pil \
+      python3-requests \
+      python3-six \
+      python3-yaml \
+      socat \
+      vulkan-tools \
+      waffle-utils \
+      xauth \
+      xvfb \
+      zlib1g \
+      zstd
+
+apt-get install -y --no-install-recommends \
+      $STABLE_EPHEMERAL

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

 . .gitlab-ci/container/container_pre_build.sh

@@ -130,8 +123,6 @@ pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedeskt
 # Needed for manipulation with traces yaml files.
 pip3 install --break-system-packages yq

-. .gitlab-ci/container/build-mold.sh
-
 ############### Build LLVM-SPIRV translator

 . .gitlab-ci/container/build-llvm-spirv.sh
@@ -152,9 +143,11 @@ pip3 install --break-system-packages yq
 ############### Build dEQP runner
 . .gitlab-ci/container/build-deqp-runner.sh

-
-apt-get purge -y "${EPHEMERAL[@]}"
-
+rm -rf /root/.cargo
 rm -rf /root/.rustup

-. .gitlab-ci/container/container_post_build.sh
+ccache --show-stats
+
+apt-get purge -y $STABLE_EPHEMERAL
+
+apt-get autoremove -y --purge
--- a/.gitlab-ci/container/debian/x86_64_test-gl.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-gl.sh
@@ -10,62 +10,59 @@ export LLVM_VERSION="${LLVM_VERSION:=15}"
 apt-get install -y libelogind0  # this interfere with systemd deps, install separately

 # Ephemeral packages (installed for this script and removed again at the end)
-EPHEMERAL=(
-    bzip2
-    ccache
-    "clang-${LLVM_VERSION}"
-    cmake
-    g++
-    glslang-tools
-    libasound2-dev
-    libcap-dev
-    "libclang-cpp${LLVM_VERSION}-dev"
-    libdrm-dev
-    libgles2-mesa-dev
-    libpciaccess-dev
-    libpng-dev
-    libudev-dev
-    libvulkan-dev
-    libwaffle-dev
-    libwayland-dev
-    libx11-xcb-dev
-    libxcb-dri2-0-dev
-    libxkbcommon-dev
-    libxrandr-dev
-    libxrender-dev
-    "llvm-${LLVM_VERSION}-dev"
-    make
-    meson
-    ocl-icd-opencl-dev
-    patch
-    pkgconf
-    python3-distutils
-    xz-utils
-)
-
-DEPS=(
-    clinfo
-    iptables
-    "libclang-common-${LLVM_VERSION}-dev"
-    "libclang-cpp${LLVM_VERSION}"
-    libcap2
-    libegl1
-    libepoxy0
-    libfdt1
-    libxcb-shm0
-    ocl-icd-libopencl1
-    python3-lxml
-    python3-renderdoc
-    python3-simplejson
-    spirv-tools
-    sysvinit-core
-    weston
-)
+STABLE_EPHEMERAL=" \
+      bzip2 \
+      ccache \
+      clang-${LLVM_VERSION} \
+      cmake \
+      g++ \
+      glslang-tools \
+      libasound2-dev \
+      libcap-dev \
+      libclang-cpp${LLVM_VERSION}-dev \
+      libdrm-dev \
+      libgles2-mesa-dev \
+      libpciaccess-dev \
+      libpng-dev \
+      libudev-dev \
+      libvulkan-dev \
+      libwaffle-dev \
+      libwayland-dev \
+      libx11-xcb-dev \
+      libxcb-dri2-0-dev \
+      libxkbcommon-dev \
+      libxrandr-dev \
+      libxrender-dev \
+      llvm-${LLVM_VERSION}-dev \
+      make \
+      meson \
+      ocl-icd-opencl-dev \
+      patch \
+      pkgconf \
+      python3-distutils \
+      xz-utils \
+      "

 apt-get update

-apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
-      $EXTRA_LOCAL_PACKAGES
+apt-get install -y --no-remove \
+      $STABLE_EPHEMERAL \
+      clinfo \
+      iptables \
+      libclang-common-${LLVM_VERSION}-dev \
+      libclang-cpp${LLVM_VERSION} \
+      libcap2 \
+      libegl1 \
+      libepoxy0 \
+      libfdt1 \
+      libxcb-shm0 \
+      ocl-icd-libopencl1 \
+      python3-lxml \
+      python3-renderdoc \
+      python3-simplejson \
+      spirv-tools \
+      sysvinit-core \
+      weston


 . .gitlab-ci/container/container_pre_build.sh
@@ -88,6 +85,9 @@ DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh

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

-apt-get purge -y "${EPHEMERAL[@]}"
+ccache --show-stats

-. .gitlab-ci/container/container_post_build.sh
+apt-get purge -y \
+      $STABLE_EPHEMERAL
+
+apt-get autoremove -y --purge
--- a/.gitlab-ci/container/debian/x86_64_test-vk.sh
+++ b/.gitlab-ci/container/debian/x86_64_test-vk.sh
@@ -11,63 +11,65 @@ export DEBIAN_FRONTEND=noninteractive
 apt-get install -y libelogind0  # this interfere with systemd deps, install separately

 # Ephemeral packages (installed for this script and removed again at the end)
-EPHEMERAL=(
-    ccache
-    cmake
-    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-ewmh-dev
-    libxcb-keysyms1-dev
-    libxkbcommon-dev
-    libxrandr-dev
-    libxrender-dev
-    libzstd-dev
-    meson
-    p7zip
-    patch
-    pkgconf
-    python3-dev
-    python3-distutils
-    python3-pip
-    python3-setuptools
-    python3-wheel
-    software-properties-common
-    wine64-tools
-    xz-utils
-)
-
-DEPS=(
-    curl
-    libepoxy0
-    libxcb-shm0
-    pciutils
-    python3-lxml
-    python3-simplejson
-    sysvinit-core
-    weston
-    xwayland
-    wine
-    wine64
-    xinit
-    xserver-xorg-video-amdgpu
-    xserver-xorg-video-ati
-)
-
-apt-get update
+STABLE_EPHEMERAL=" \
+      ccache \
+      cmake \
+      g++ \
+      g++-mingw-w64-i686-posix \
+      g++-mingw-w64-x86-64-posix \
+      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-ewmh-dev \
+      libxcb-keysyms1-dev \
+      libxkbcommon-dev \
+      libxrandr-dev \
+      libxrender-dev \
+      libzstd-dev \
+      meson \
+      mingw-w64-i686-dev \
+      mingw-w64-tools \
+      mingw-w64-x86-64-dev \
+      p7zip \
+      patch \
+      pkgconf \
+      python3-dev \
+      python3-distutils \
+      python3-pip \
+      python3-setuptools \
+      python3-wheel \
+      software-properties-common \
+      wine64-tools \
+      xz-utils \
+      "

 apt-get install -y --no-remove --no-install-recommends \
-      "${DEPS[@]}" "${EPHEMERAL[@]}"
+      $STABLE_EPHEMERAL \
+      curl \
+      libepoxy0 \
+      libxcb-shm0 \
+      pciutils \
+      python3-lxml \
+      python3-simplejson \
+      sysvinit-core \
+      weston \
+      xwayland \
+      wine \
+      wine64 \
+      xinit \
+      xserver-xorg-video-amdgpu \
+      xserver-xorg-video-ati
+
+apt-get update -q

 ############### Install DXVK

@@ -121,6 +123,11 @@ PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/container/build-piglit.sh

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

-apt-get purge -y "${EPHEMERAL[@]}"
+ccache --show-stats

-. .gitlab-ci/container/container_post_build.sh
+apt-get purge -y \
+      $STABLE_EPHEMERAL
+
+apt-get autoremove -y --purge
+
+#dpkg -r --force-depends "mesa-vulkan-drivers" "mesa-vdpau-drivers" "mesa-va-drivers" "libgl1-mesa-dri" "libglx-mesa0" "vdpau-driver-all" "va-driver-all" "libglx0" "libgl1" "libvdpau-va-gl1" "libglu1-mesa" "libegl-mesa0" "libgl1-mesa-dri" "libglapi-mesa" "libosmesa6"
--- a/.gitlab-ci/container/fedora/x86_64_build.sh
+++ b/.gitlab-ci/container/fedora/x86_64_build.sh
@@ -1,10 +1,5 @@
 #!/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
 set -o xtrace

@@ -19,7 +14,6 @@ EPHEMERAL=(
        "pkgconfig(epoxy)"
        "pkgconfig(gbm)"
        "pkgconfig(openssl)"
-        python3-pip
        unzip
        xz
 )
@@ -36,7 +30,7 @@ DEPS=(
    glslang
    kernel-headers
    llvm-devel
-    ninja-build
+    meson
    "pkgconfig(LLVMSPIRVLib)"
    "pkgconfig(SPIRV-Tools)"
    "pkgconfig(dri2proto)"
@@ -96,15 +90,19 @@ tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
 cd $XORGMACROS_VERSION; ./configure; make install; cd ..
 rm -rf $XORGMACROS_VERSION

-# We need at least 1.3.1 for rusticl
-pip install meson==1.3.1
-
 . .gitlab-ci/container/build-mold.sh

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

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

+pushd /usr/local
+git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
+rm -rf shader-db/.git
+cd shader-db
+make
+popd
+

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

--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -23,6 +23,10 @@
  variables:
    MESA_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${FDO_DISTRIBUTION_TAG}"

+.use-wine:
+  variables:
+    WINEPATH: "/usr/x86_64-w64-mingw32/bin;/usr/x86_64-w64-mingw32/lib;/usr/lib/gcc/x86_64-w64-mingw32/10-posix;c:/windows;c:/windows/system32"
+
 # Build the CI docker images.
 #
 # MESA_IMAGE_TAG is the tag of the docker image used by later stage jobs. If the
@@ -40,16 +44,14 @@
 # repository's container registry, so that the image from the main
 # repository's registry will be used there as well.

-.debian-container:
-  variables:
-    FDO_DISTRIBUTION_VERSION: bookworm-slim
-
 .container:
  stage: container
  extends:
-    - .container+build-rules
+    - .container-rules
    - .incorporate-templates-commit
+    - .use-wine
  variables:
+    FDO_DISTRIBUTION_VERSION: bookworm-slim
    FDO_REPO_SUFFIX: $CI_JOB_NAME
    FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
    # no need to pull the whole repo to build the container image
@@ -59,24 +61,20 @@
  extends:
    - .container
    - .incorporate-base-tag+templates-commit
+    # Don't want the .container rules
+    - .build-rules

 # Debian based x86_64 build image base
 debian/x86_64_build-base:
  extends:
    - .fdo.container-build@debian
    - .container
-    - .debian-container
  variables:
-    MESA_IMAGE_TAG: &debian-x86_64_build-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
-  rules:
-    # python-test requires debian/x86_64_build, which requires this job
-    - !reference [python-test, rules]
-    - !reference [.container, rules]
+    MESA_IMAGE_TAG: &debian-x86_64_build-base ${DEBIAN_BASE_TAG}

 .use-debian/x86_64_build-base:
  extends:
    - .fdo.container-build@debian
-    - .debian-container
    - .use-base-image
  variables:
    MESA_BASE_IMAGE: ${DEBIAN_X86_64_BUILD_BASE_IMAGE}
@@ -91,10 +89,6 @@ debian/x86_64_build:
    - .use-debian/x86_64_build-base
  variables:
    MESA_IMAGE_TAG: &debian-x86_64_build ${DEBIAN_BUILD_TAG}
-  rules:
-    # python-test requires this job
-    - !reference [python-test, rules]
-    - !reference [.use-debian/x86_64_build-base, rules]

 .use-debian/x86_64_build:
  extends:
@@ -123,6 +117,24 @@ debian/x86_32_build:
  needs:
    - debian/x86_32_build

+# Debian based x86_64-mingw cross main build image
+# FIXME: Until gets fixed on Debian 12, disabled.
+.debian/x86_64_build-mingw:
+  extends:
+    - .use-debian/x86_64_build-base
+  variables:
+    MESA_IMAGE_TAG: &debian-x86_64_build_mingw ${DEBIAN_BUILD_MINGW_TAG}
+
+.use-debian/x86_64_build_mingw:
+  extends:
+    - .set-image-base-tag
+  variables:
+    MESA_BASE_TAG: *debian-x86_64_build-base
+    MESA_IMAGE_PATH: ${DEBIAN_X86_64_BUILD_MINGW_IMAGE_PATH}
+    MESA_IMAGE_TAG: *debian-x86_64_build_mingw
+  needs:
+    - .debian/x86_64_build-mingw
+
 # Debian based ppc64el cross-build image
 debian/ppc64el_build:
  extends:
@@ -180,12 +192,12 @@ debian/android_build:
 debian/x86_64_test-base:
  extends: debian/x86_64_build-base
  variables:
-    MESA_IMAGE_TAG: &debian-x86_64_test-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${KERNEL_TAG}"
+    KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v6.3-for-mesa-ci-43c973a8ff91/linux-v6.3-for-mesa-ci-6fc749a2a59a.tar.bz2"
+    MESA_IMAGE_TAG: &debian-x86_64_test-base ${DEBIAN_BASE_TAG}

 .use-debian/x86_64_test-base:
  extends:
    - .fdo.container-build@debian
-    - .debian-container
    - .use-base-image
  variables:
    MESA_BASE_IMAGE: ${DEBIAN_X86_64_TEST_BASE_IMAGE}
@@ -247,11 +259,10 @@ debian/arm64_build:
  extends:
    - .fdo.container-build@debian
    - .container
-    - .debian-container
  tags:
    - aarch64
  variables:
-    MESA_IMAGE_TAG: &debian-arm64_build "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+    MESA_IMAGE_TAG: &debian-arm64_build ${DEBIAN_BASE_TAG}

 .use-debian/arm64_build:
  extends:
@@ -270,8 +281,7 @@ debian/arm64_build:
    - .fdo.container-build@alpine
    - .container
  variables:
-    FDO_DISTRIBUTION_VERSION: "edge"  # switch to 3.20 when gets released
-    FDO_BASE_IMAGE: alpine:$FDO_DISTRIBUTION_VERSION  # since cbuild ignores it
+    FDO_DISTRIBUTION_VERSION: "3.18"

 # Alpine based x86_64 build image
 alpine/x86_64_build:
@@ -317,13 +327,13 @@ fedora/x86_64_build:

 .kernel+rootfs:
  extends:
-    - .container+build-rules
-    - .debian-container
+    - .build-rules
  stage: container
  variables:
    GIT_STRATEGY: fetch
+    KERNEL_URL: *kernel-rootfs-url
    MESA_ROOTFS_TAG: &kernel-rootfs ${KERNEL_ROOTFS_TAG}
-    DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
+    DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
  script:
    - .gitlab-ci/container/lava_build.sh

@@ -334,7 +344,7 @@ kernel+rootfs_x86_64:
  image: "$FDO_BASE_IMAGE"
  variables:
    DEBIAN_ARCH: "amd64"
-    DISTRIBUTION_TAG: &distribution-tag-x86_64 "${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_ARTIFACTS_BASE_TAG}--${MESA_TEMPLATES_COMMIT}"
+    DISTRIBUTION_TAG: &distribution-tag-x86_64 "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_BASE_TAG}--${MESA_TEMPLATES_COMMIT}"

 kernel+rootfs_arm64:
  extends:
@@ -367,13 +377,12 @@ kernel+rootfs_arm32:
  extends:
    - .fdo.container-build@debian
    - .container
-    - .debian-container
    # Don't want the .container rules
-    - .container+build-rules
+    - .build-rules
  variables:
-    FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
+    FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_TEMPLATES_COMMIT}"
    ARTIFACTS_PREFIX: "https://${S3_HOST}/mesa-lava"
-    ARTIFACTS_SUFFIX: "${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
+    ARTIFACTS_SUFFIX: "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
    MESA_ARTIFACTS_TAG: *debian-arm64_build
    MESA_ROOTFS_TAG: *kernel-rootfs

@@ -383,7 +392,7 @@ debian/arm32_test:
  needs:
    - kernel+rootfs_arm32
  variables:
-    MESA_IMAGE_TAG: &debian-arm32_test "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+    MESA_IMAGE_TAG: &debian-arm32_test ${DEBIAN_BASE_TAG}

 debian/arm64_test:
  extends:
@@ -391,14 +400,14 @@ debian/arm64_test:
  needs:
    - kernel+rootfs_arm64
  variables:
-    MESA_IMAGE_TAG: &debian-arm64_test "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
+    MESA_IMAGE_TAG: &debian-arm64_test ${DEBIAN_BASE_TAG}

 .use-debian/arm_test:
  variables:
    MESA_ROOTFS_TAG: *kernel-rootfs

 .use-debian/arm32_test:
-  image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
+  image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_TEMPLATES_COMMIT}"
  extends:
    - .use-debian/arm_test
  variables:
@@ -408,7 +417,7 @@ debian/arm64_test:
    - debian/arm_test

 .use-debian/arm64_test:
-  image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
+  image: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_TEMPLATES_COMMIT}"
  extends:
    - .use-debian/arm_test
  variables:
@@ -429,92 +438,98 @@ debian/arm64_test:
 # (host PowerShell) in the container stage to build and push the image,
 # then in the build stage by executing inside Docker.

-.windows-docker-msvc:
+.windows-docker-vs2019:
  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
+    - .windows-docker-vs2019
  rules:
    - !reference [.microsoft-farm-container-rules, rules]
-    - !reference [.container+build-rules, rules]
+    - !reference [.container-rules, rules]
  variables:
    GIT_STRATEGY: fetch # we do actually need the full repository though
    MESA_BASE_IMAGE: None
+  tags:
+    - windows
+    - shell
+    - "2022"
+    - mesa
  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:
+windows_vs2019:
  inherit:
    default: [retry]
  extends:
    - .windows_container_build
  variables:
-    MESA_IMAGE_PATH: &windows_msvc_image_path ${WINDOWS_X64_MSVC_PATH}
-    MESA_IMAGE_TAG: ${WINDOWS_X64_MSVC_TAG}
-    DOCKERFILE: Dockerfile_msvc
+    MESA_IMAGE_PATH: &windows_vs_image_path ${WINDOWS_X64_VS_PATH}
+    MESA_IMAGE_TAG: &windows_vs_image_tag ${WINDOWS_X64_VS_TAG}
+    DOCKERFILE: Dockerfile_vs
    MESA_BASE_IMAGE: "mcr.microsoft.com/windows/server:ltsc2022"

-windows_build_msvc:
+windows_build_vs2019:
  inherit:
    default: [retry]
  extends:
    - .windows_container_build
  rules:
    - !reference [.microsoft-farm-rules, rules]
-    - !reference [.container+build-rules, rules]
+    - !reference [.build-rules, rules]
  variables:
    MESA_IMAGE_PATH: &windows_build_image_path ${WINDOWS_X64_BUILD_PATH}
-    MESA_IMAGE_TAG: &windows_build_image_tag ${WINDOWS_X64_MSVC_TAG}--${WINDOWS_X64_BUILD_TAG}
+    MESA_IMAGE_TAG: &windows_build_image_tag ${MESA_BASE_IMAGE_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}"
+    MESA_BASE_IMAGE_PATH: *windows_vs_image_path
+    MESA_BASE_IMAGE_TAG: *windows_vs_image_tag
+    MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_BASE_IMAGE_PATH}:${MESA_BASE_IMAGE_TAG}"
  timeout: 2h 30m # LLVM takes ages
  needs:
-    - windows_msvc
+    - windows_vs2019

-windows_test_msvc:
+windows_test_vs2019:
  inherit:
    default: [retry]
  extends:
    - .windows_container_build
  rules:
    - !reference [.microsoft-farm-rules, rules]
-    - !reference [.container+build-rules, rules]
+    - !reference [.build-rules, rules]
  variables:
    MESA_IMAGE_PATH: &windows_test_image_path ${WINDOWS_X64_TEST_PATH}
-    MESA_IMAGE_TAG: &windows_test_image_tag ${WINDOWS_X64_MSVC_TAG}--${WINDOWS_X64_TEST_TAG}
+    MESA_IMAGE_TAG: &windows_test_image_tag ${MESA_BASE_IMAGE_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}"
+    MESA_BASE_IMAGE_PATH: *windows_vs_image_path
+    MESA_BASE_IMAGE_TAG: *windows_vs_image_tag
+    MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_BASE_IMAGE_PATH}:${MESA_BASE_IMAGE_TAG}"
  timeout: 2h 30m
  needs:
-    - windows_msvc
+    - windows_vs2019

-.use-windows_build_msvc:
+.use-windows_build_vs2019:
  inherit:
    default: [retry]
-  extends: .windows-docker-msvc
+  extends: .windows-docker-vs2019
  image: "$MESA_IMAGE"
  variables:
    MESA_IMAGE_PATH: *windows_build_image_path
    MESA_IMAGE_TAG: *windows_build_image_tag
+    MESA_BASE_IMAGE_TAG: *windows_vs_image_tag
  needs:
-    - windows_build_msvc
+    - windows_build_vs2019

-.use-windows_test_msvc:
+.use-windows_test_vs2019:
  inherit:
    default: [retry]
-  extends: .windows-docker-msvc
+  extends: .windows-docker-vs2019
  image: "$MESA_IMAGE"
  variables:
    MESA_IMAGE_PATH: *windows_test_image_path
    MESA_IMAGE_TAG: *windows_test_image_tag
+    MESA_BASE_IMAGE_TAG: *windows_vs_image_tag
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -35,20 +35,20 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
    KERNEL_ARCH="arm64"
    SKQP_ARCH="arm64"
    DEFCONFIG="arch/arm64/configs/defconfig"
-    DEVICE_TREES="rk3399-gru-kevin.dtb"
-    DEVICE_TREES+=" meson-g12b-a311d-khadas-vim3.dtb"
-    DEVICE_TREES+=" meson-gxl-s805x-libretech-ac.dtb"
-    DEVICE_TREES+=" meson-gxm-khadas-vim2.dtb"
-    DEVICE_TREES+=" sun50i-h6-pine-h64.dtb"
-    DEVICE_TREES+=" imx8mq-nitrogen.dtb"
-    DEVICE_TREES+=" mt8192-asurada-spherion-r0.dtb"
-    DEVICE_TREES+=" mt8183-kukui-jacuzzi-juniper-sku16.dtb"
-    DEVICE_TREES+=" tegra210-p3450-0000.dtb"
-    DEVICE_TREES+=" apq8016-sbc.dtb"
-    DEVICE_TREES+=" apq8096-db820c.dtb"
-    DEVICE_TREES+=" sc7180-trogdor-lazor-limozeen-nots-r5.dtb"
-    DEVICE_TREES+=" sc7180-trogdor-kingoftown.dtb"
-    DEVICE_TREES+=" sm8350-hdk.dtb"
+    DEVICE_TREES="arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper-sku16.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/apq8016-sbc.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/apq8096-db820c.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r1.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/sm8350-hdk.dtb"
    KERNEL_IMAGE_NAME="Image"

 elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then
@@ -56,25 +56,12 @@ elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then
    KERNEL_ARCH="arm"
    SKQP_ARCH="arm"
    DEFCONFIG="arch/arm/configs/multi_v7_defconfig"
-    DEVICE_TREES="rk3288-veyron-jaq.dtb"
-    DEVICE_TREES+=" sun8i-h3-libretech-all-h3-cc.dtb"
-    DEVICE_TREES+=" imx6q-cubox-i.dtb"
-    DEVICE_TREES+=" tegra124-jetson-tk1.dtb"
+    DEVICE_TREES="arch/arm/boot/dts/rk3288-veyron-jaq.dtb"
+    DEVICE_TREES+=" arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dtb"
+    DEVICE_TREES+=" arch/arm/boot/dts/imx6q-cubox-i.dtb"
+    DEVICE_TREES+=" arch/arm/boot/dts/tegra124-jetson-tk1.dtb"
    KERNEL_IMAGE_NAME="zImage"
    . .gitlab-ci/container/create-cross-file.sh armhf
-    CONTAINER_ARCH_PACKAGES=(
-      libegl1-mesa-dev:armhf
-      libelf-dev:armhf
-      libgbm-dev:armhf
-      libgles2-mesa-dev:armhf
-      libpng-dev:armhf
-      libudev-dev:armhf
-      libvulkan-dev:armhf
-      libwaffle-dev:armhf
-      libwayland-dev:armhf
-      libx11-xcb-dev:armhf
-      libxkbcommon-dev:armhf
-    )
 else
    GCC_ARCH="x86_64-linux-gnu"
    KERNEL_ARCH="x86_64"
@@ -82,9 +69,7 @@ else
    DEFCONFIG="arch/x86/configs/x86_64_defconfig"
    DEVICE_TREES=""
    KERNEL_IMAGE_NAME="bzImage"
-    CONTAINER_ARCH_PACKAGES=(
-      libasound2-dev libcap-dev libfdt-dev libva-dev wayland-protocols p7zip wine
-    )
+    ARCH_PACKAGES="libasound2-dev libcap-dev libfdt-dev libva-dev wayland-protocols p7zip"
 fi

 # Determine if we're in a cross build.
@@ -104,57 +89,64 @@ if [[ -e /cross_file-$DEBIAN_ARCH.txt ]]; then
    export CROSS_COMPILE="${GCC_ARCH}-"
 fi

-# no need to remove these at end, image isn't saved at the end
-CONTAINER_EPHEMERAL=(
-    automake
-    bc
-    "clang-${LLVM_VERSION}"
-    cmake
-    curl
-    mmdebstrap
-    git
-    glslang-tools
-    libdrm-dev
-    libegl1-mesa-dev
-    libxext-dev
-    libfontconfig-dev
-    libgbm-dev
-    libgl-dev
-    libgles2-mesa-dev
-    libglu1-mesa-dev
-    libglx-dev
-    libpng-dev
-    libssl-dev
-    libudev-dev
-    libvulkan-dev
-    libwaffle-dev
-    libwayland-dev
-    libx11-xcb-dev
-    libxcb-dri2-0-dev
-    libxkbcommon-dev
-    libwayland-dev
-    ninja-build
-    openssh-server
-    patch
-    protobuf-compiler
-    python-is-python3
-    python3-distutils
-    python3-mako
-    python3-numpy
-    python3-serial
-    python3-venv
-    unzip
-    zstd
-)
-
-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 \
 		   -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' \
-		   "${CONTAINER_EPHEMERAL[@]}" \
-                   "${CONTAINER_ARCH_PACKAGES[@]}" \
-                   ${EXTRA_LOCAL_PACKAGES}
+                   ${ARCH_PACKAGES} \
+                   automake \
+                   bc \
+                   clang-${LLVM_VERSION} \
+                   cmake \
+		   curl \
+                   mmdebstrap \
+                   git \
+                   glslang-tools \
+                   libdrm-dev \
+                   libegl1-mesa-dev \
+                   libxext-dev \
+                   libfontconfig-dev \
+                   libgbm-dev \
+                   libgl-dev \
+                   libgles2-mesa-dev \
+                   libglu1-mesa-dev \
+                   libglx-dev \
+                   libpng-dev \
+                   libssl-dev \
+                   libudev-dev \
+                   libvulkan-dev \
+                   libwaffle-dev \
+                   libwayland-dev \
+                   libx11-xcb-dev \
+                   libxcb-dri2-0-dev \
+                   libxkbcommon-dev \
+                   libwayland-dev \
+                   ninja-build \
+                   openssh-server \
+                   patch \
+                   protobuf-compiler \
+                   python-is-python3 \
+                   python3-distutils \
+                   python3-mako \
+                   python3-numpy \
+                   python3-serial \
+                   unzip \
+                   zstd
+
+
+if [[ "$DEBIAN_ARCH" = "armhf" ]]; then
+    apt-get install -y --no-remove \
+                       libegl1-mesa-dev:armhf \
+                       libelf-dev:armhf \
+                       libgbm-dev:armhf \
+                       libgles2-mesa-dev:armhf \
+                       libpng-dev:armhf \
+                       libudev-dev:armhf \
+                       libvulkan-dev:armhf \
+                       libwaffle-dev:armhf \
+                       libwayland-dev:armhf \
+                       libx11-xcb-dev:armhf \
+                       libxkbcommon-dev:armhf
+fi

 ROOTFS=/lava-files/rootfs-${DEBIAN_ARCH}
 mkdir -p "$ROOTFS"
@@ -196,7 +188,6 @@ PKG_DEP=(
 )
 [ "$DEBIAN_ARCH" = "amd64" ] && PKG_ARCH=(
  firmware-amd-graphics
-  firmware-misc-nonfree
  libgl1 libglu1-mesa
  inetutils-syslogd iptables libcap2
  libfontconfig1
@@ -219,11 +210,7 @@ mmdebstrap \
    --include "${PKG_BASE[*]} ${PKG_CI[*]} ${PKG_DEP[*]} ${PKG_MESA_DEP[*]} ${PKG_ARCH[*]}" \
    bookworm \
    "$ROOTFS/" \
-    "http://deb.debian.org/debian" \
-    "deb [trusted=yes] https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/ ${FDO_DISTRIBUTION_VERSION%-*} main"
-
-############### Install mold
-. .gitlab-ci/container/build-mold.sh
+    "http://deb.debian.org/debian"

 ############### Setuping
 if [ "$DEBIAN_ARCH" = "amd64" ]; then
@@ -303,12 +290,6 @@ if [[ ${DEBIAN_ARCH} = "amd64" ]]; then
    mv /usr/local/libexec/virgl* $ROOTFS/usr/local/libexec/
 fi

-############### Build ci-kdl
-section_start kdl "Prepare a venv for kdl"
-. .gitlab-ci/container/build-kdl.sh
-mv ci-kdl.venv $ROOTFS
-section_end kdl
-
 ############### Build local stuff for use by igt and kernel testing, which
 ############### will reuse most of our container build process from a specific
 ############### hash of the Mesa tree.
@@ -324,11 +305,6 @@ fi
 rm -rf /root/.cargo
 rm -rf /root/.rustup

-############### Delete firmware files we don't need
-if [ "$DEBIAN_ARCH" = "amd64" ]; then
-   dpkg -L firmware-misc-nonfree | grep -v "i915" | xargs rm || true
-fi
-
 ############### Fill rootfs
 cp .gitlab-ci/container/setup-rootfs.sh $ROOTFS/.
 cp .gitlab-ci/container/strip-rootfs.sh $ROOTFS/.
@@ -347,16 +323,25 @@ if [ "${DEBIAN_ARCH}" = "arm64" ]; then
    KERNEL_IMAGE_NAME+=" Image.gz"
 fi

-ROOTFSTAR="lava-rootfs.tar.zst"
 du -ah "$ROOTFS" | sort -h | tail -100
 pushd $ROOTFS
-  tar --zstd -cf /lava-files/${ROOTFSTAR} .
+  tar --zstd -cf /lava-files/lava-rootfs.tar.zst .
 popd

 . .gitlab-ci/container/container_post_build.sh

-ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" /lava-files/"${ROOTFSTAR}" \
-      https://${S3_PATH}/"${ROOTFSTAR}"
+############### Upload the files!
+FILES_TO_UPLOAD="lava-rootfs.tar.zst \
+                 $KERNEL_IMAGE_NAME"
+
+if [[ -n $DEVICE_TREES ]]; then
+    FILES_TO_UPLOAD="$FILES_TO_UPLOAD $(basename -a $DEVICE_TREES)"
+fi
+
+for f in $FILES_TO_UPLOAD; do
+    ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" /lava-files/$f \
+             https://${S3_PATH}/$f
+done

 touch /lava-files/done
 ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" /lava-files/done https://${S3_PATH}/done
--- a/.gitlab-ci/container/patches/build-deqp_Allow-running-on-Android-from-the-command-line.patch
+++ b/.gitlab-ci/container/patches/build-deqp_Allow-running-on-Android-from-the-command-line.patch
@@ -1,4 +1,4 @@
-From dc97ee83a813f6b170079ddf2a04bbb06221a5a7 Mon Sep 17 00:00:00 2001
+From bf8ada0d15f94824ee1643d4e17a66dffdbaf2e5 Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Fri, 26 Aug 2022 18:24:27 +0200
 Subject: [PATCH 1/2] Allow running on Android from the command line
@@ -13,6 +13,7 @@ $ cmake -S . -B build/ -DDEQP_TARGET=android -DDEQP_TARGET_TOOLCHAIN=ndk-modern
 $ ninja -C build modules/egl/deqp-egl

 Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
+Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
 ---
 CMakeLists.txt                                | 36 ++-----------------
 .../android/tcuAndroidNativeActivity.cpp      | 36 ++++++++++---------
@@ -20,11 +21,11 @@ Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 3 files changed, 33 insertions(+), 51 deletions(-)

 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f9c61d0db..d6ad2990b 100644
+index 1ff2bb9..8c76abb 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -272,7 +272,7 @@ include_directories(
- 	external/vulkancts/framework/vulkan
+@@ -249,7 +249,7 @@ include_directories(
+ 	external/vulkancts/framework/vulkan/generated/vulkan
 	)
 
 -if (DE_OS_IS_ANDROID OR DE_OS_IS_IOS)
@@ -32,7 +33,7 @@ index f9c61d0db..d6ad2990b 100644
 	# On Android deqp modules are compiled as libraries and linked into final .so
 	set(DEQP_MODULE_LIBRARIES )
 	set(DEQP_MODULE_ENTRY_POINTS )
-@@ -316,7 +316,7 @@ macro (add_deqp_module MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
+@@ -293,7 +293,7 @@ macro (add_deqp_module MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
 	set(DEQP_MODULE_LIBRARIES		${DEQP_MODULE_LIBRARIES} PARENT_SCOPE)
 	set(DEQP_MODULE_ENTRY_POINTS	${DEQP_MODULE_ENTRY_POINTS} PARENT_SCOPE)
 
@@ -41,8 +42,8 @@ index f9c61d0db..d6ad2990b 100644
 		# Executable target
 		add_executable(${MODULE_NAME} ${PROJECT_SOURCE_DIR}/framework/platform/tcuMain.cpp ${ENTRY})
 		target_link_libraries(${MODULE_NAME} PUBLIC "${EXECLIBS}" "${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}")
-@@ -390,37 +390,7 @@ add_subdirectory(external/vulkancts/vkscpc ${MAYBE_EXCLUDE_FROM_ALL})
- add_subdirectory(external/openglcts ${MAYBE_EXCLUDE_FROM_ALL})
+@@ -367,37 +367,7 @@ add_subdirectory(external/vulkancts/vkscpc)
+ add_subdirectory(external/openglcts)
 
 # Single-binary targets
 -if (DE_OS_IS_ANDROID)
@@ -81,7 +82,7 @@ index f9c61d0db..d6ad2990b 100644
 	set(DEQP_IOS_CODE_SIGN_IDENTITY "drawElements" CACHE STRING "Code sign identity for iOS build")
 
 diff --git a/framework/platform/android/tcuAndroidNativeActivity.cpp b/framework/platform/android/tcuAndroidNativeActivity.cpp
-index 6f8cd8fc5..b83e30f41 100644
+index 6f8cd8f..b83e30f 100644
 --- a/framework/platform/android/tcuAndroidNativeActivity.cpp
 +++ b/framework/platform/android/tcuAndroidNativeActivity.cpp
@@ -116,23 +116,25 @@ namespace Android
@@ -128,7 +129,7 @@ index 6f8cd8fc5..b83e30f41 100644
 
 NativeActivity::~NativeActivity (void)
 diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp
-index b8a35898c..cf02e6b70 100644
+index 69ab384..d7288f6 100644
 --- a/framework/platform/android/tcuAndroidPlatform.cpp
 +++ b/framework/platform/android/tcuAndroidPlatform.cpp
@@ -22,6 +22,7 @@
@@ -148,7 +149,7 @@ index b8a35898c..cf02e6b70 100644
 
 	return new NativeWindow(window, params.width, params.height, format);
 }
-@@ -292,6 +293,9 @@ static size_t getTotalSystemMemory (ANativeActivity* activity)
+@@ -286,6 +287,9 @@ static size_t getTotalSystemMemory (ANativeActivity* activity)
 
 	try
 	{
@@ -158,7 +159,7 @@ index b8a35898c..cf02e6b70 100644
 		const size_t totalMemory = getTotalAndroidSystemMemory(activity);
 		print("Device has %.2f MiB of system memory\n", static_cast<double>(totalMemory) / static_cast<double>(MiB));
 		return totalMemory;
-@@ -388,3 +392,9 @@ bool Platform::hasDisplay (vk::wsi::Type wsiType) const
+@@ -382,3 +386,9 @@ bool Platform::hasDisplay (vk::wsi::Type wsiType) const
 
 } // Android
 } // tcu
@@ -169,5 +170,5 @@ index b8a35898c..cf02e6b70 100644
 +	return new tcu::Android::Platform(activity);
 +}
 -- 
-2.42.0
+2.39.1

--- a/.gitlab-ci/container/patches/build-deqp_Android-prints-to-stdout-instead-of-logcat.patch
+++ b/.gitlab-ci/container/patches/build-deqp_Android-prints-to-stdout-instead-of-logcat.patch
@@ -1,15 +1,16 @@
-From a602822c53e22e985f942f843ccadbfb64613212 Mon Sep 17 00:00:00 2001
+From c2d5252f4a8be94720235feb9e358ecb0a2e8e11 Mon Sep 17 00:00:00 2001
 From: Helen Koike <helen.koike@collabora.com>
 Date: Tue, 27 Sep 2022 12:35:22 -0300
 Subject: [PATCH 2/2] Android prints to stdout instead of logcat

 Signed-off-by: Helen Koike <helen.koike@collabora.com>
+Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
 ---
 framework/qphelper/qpDebugOut.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/framework/qphelper/qpDebugOut.c b/framework/qphelper/qpDebugOut.c
-index 6579e9f48..c200c6f6b 100644
+index 6579e9f..c200c6f 100644
 --- a/framework/qphelper/qpDebugOut.c
 +++ b/framework/qphelper/qpDebugOut.c
@@ -98,7 +98,7 @@ void qpDiev (const char* format, va_list args)
@@ -22,5 +23,5 @@ index 6579e9f48..c200c6f6b 100644
 #include <android/log.h>
 
 -- 
-2.42.0
+2.39.1

--- a/.gitlab-ci/container/x86_64.config
+++ b/.gitlab-ci/container/x86_64.config
@@ -0,0 +1,111 @@
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_DEBUG_KERNEL=y
+
+CONFIG_CRYPTO_ZSTD=y
+CONFIG_ZRAM_MEMORY_TRACKING=y
+CONFIG_ZRAM_WRITEBACK=y
+CONFIG_ZRAM=y
+CONFIG_ZSMALLOC_STAT=y
+
+CONFIG_PWM=y
+CONFIG_PM_DEVFREQ=y
+CONFIG_OF=y
+CONFIG_CROS_EC=y
+
+# abootimg with a 'dummy' rootfs fails with root=/dev/nfs
+CONFIG_BLK_DEV_INITRD=n
+
+CONFIG_DEVFREQ_GOV_PERFORMANCE=y
+CONFIG_DEVFREQ_GOV_POWERSAVE=y
+CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_GOV_PASSIVE=y
+
+CONFIG_DRM=y
+CONFIG_DRM_PANEL_SIMPLE=y
+CONFIG_PWM_CROS_EC=y
+CONFIG_BACKLIGHT_PWM=y
+
+# Strip out some stuff we don't need for graphics testing, to reduce
+# the build.
+CONFIG_CAN=n
+CONFIG_WIRELESS=n
+CONFIG_RFKILL=n
+CONFIG_WLAN=n
+
+CONFIG_REGULATOR_FAN53555=y
+CONFIG_REGULATOR=y
+
+CONFIG_REGULATOR_VCTRL=y
+
+CONFIG_KASAN=n
+CONFIG_KASAN_INLINE=n
+CONFIG_STACKTRACE=n
+
+CONFIG_TMPFS=y
+
+CONFIG_PROVE_LOCKING=n
+CONFIG_DEBUG_LOCKDEP=n
+CONFIG_SOFTLOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
+
+CONFIG_DETECT_HUNG_TASK=y
+
+CONFIG_USB_USBNET=y
+CONFIG_NETDEVICES=y
+CONFIG_USB_NET_DRIVERS=y
+CONFIG_USB_RTL8152=y
+CONFIG_USB_NET_AX8817X=y
+CONFIG_USB_NET_SMSC95XX=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_ETH=y
+
+CONFIG_FW_LOADER_COMPRESS=y
+
+# options for AMD devices
+CONFIG_X86_AMD_PLATFORM_DEVICE=y
+CONFIG_ACPI_VIDEO=y
+CONFIG_X86_AMD_FREQ_SENSITIVITY=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_AMD=y
+CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_AMDGPU_SI=y
+CONFIG_DRM_AMDGPU_USERPTR=y
+CONFIG_DRM_AMD_ACP=n
+CONFIG_ACPI_WMI=y
+CONFIG_MXM_WMI=y
+CONFIG_PARPORT=y
+CONFIG_PARPORT_PC=y
+CONFIG_PARPORT_SERIAL=y
+CONFIG_SERIAL_8250_DW=y
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_KVM_AMD=m
+
+#options for Intel devices
+CONFIG_MFD_INTEL_LPSS_PCI=y
+CONFIG_KVM_INTEL=m
+
+#options for KVM guests
+CONFIG_FUSE_FS=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_KVM=y
+CONFIG_KVM_GUEST=y
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO_FS=y
+CONFIG_DRM_VIRTIO_GPU=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_VIRTIO_NET=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_PARAVIRT=y
+CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_CRYPTO_DEV_VIRTIO=y
+CONFIG_HW_RANDOM_VIRTIO=y
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_TUN=y
+CONFIG_VSOCKETS=y
+CONFIG_VIRTIO_VSOCKETS=y
+CONFIG_VHOST_VSOCK=m
--- a/.gitlab-ci/cuttlefish-runner.sh
+++ b/.gitlab-ci/cuttlefish-runner.sh
@@ -92,7 +92,7 @@ RESULTS=/data/results
 uncollapsed_section_switch cuttlefish_test "cuttlefish: testing"

 set +e
-$ADB shell "mkdir /data/results; cd /data; ./deqp-runner \
+$ADB shell "mkdir /data/results; cd /data; strace -o /data/results/out.strace -f -s 1000 ./deqp-runner \
    suite \
    --suite /data/deqp-$DEQP_SUITE.toml \
    --output $RESULTS \
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -126,15 +126,7 @@ if [ "$PIGLIT_PLATFORM" = "gbm" ]; then
    DEQP_SKIPS="$DEQP_SKIPS $INSTALL/gbm-skips.txt"
 fi

-if [ -n "$VK_DRIVER" ] && [ -z "$DEQP_SUITE" ]; then
-    # Bump the number of tests per group to reduce the startup time of VKCTS.
-    DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --tests-per-group ${DEQP_RUNNER_TESTS_PER_GROUP:-5000}"
-fi
-
 # 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() {
@@ -162,15 +154,13 @@ if [ -z "$DEQP_SUITE" ]; then
        export DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --renderer-check $DEQP_EXPECTED_RENDERER"
    fi
    if [ $DEQP_VER != vk ] && [ $DEQP_VER != egl ]; then
-        VER=$(sed 's/[() ]/./g' "$INSTALL/VERSION")
+	VER=$(sed 's/[() ]/./g' "$INSTALL/VERSION")
        export DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --version-check $VER"
    fi
 fi

 uncollapsed_section_switch deqp "deqp: deqp-runner"

-cat /deqp/version-log
-
 set +e
 if [ -z "$DEQP_SUITE" ]; then
    deqp-runner \
@@ -182,14 +172,10 @@ if [ -z "$DEQP_SUITE" ]; then
        --flakes $INSTALL/$GPU_VERSION-flakes.txt \
        --testlog-to-xml /deqp/executor/testlog-to-xml \
        --jobs ${FDO_CI_CONCURRENT:-4} \
-        $DEQP_RUNNER_OPTIONS \
+	$DEQP_RUNNER_OPTIONS \
        -- \
        $DEQP_OPTIONS
 else
-    # If you change the format of the suite toml filenames or the
-    # $GPU_VERSION-{fails,flakes,skips}.txt filenames, look through the rest
-    # of the tree for other places that need to be kept in sync (e.g.
-    # src/**/ci/gitlab-ci*.yml)
    deqp-runner \
        suite \
        --suite $INSTALL/deqp-$DEQP_SUITE.toml \
@@ -198,13 +184,12 @@ else
        --flakes $INSTALL/$GPU_VERSION-flakes.txt \
        --testlog-to-xml /deqp/executor/testlog-to-xml \
        --fraction-start $CI_NODE_INDEX \
-        --fraction $((CI_NODE_TOTAL * ${DEQP_FRACTION:-1})) \
+	--fraction $((CI_NODE_TOTAL * ${DEQP_FRACTION:-1})) \
        --jobs ${FDO_CI_CONCURRENT:-4} \
-        $DEQP_RUNNER_OPTIONS
+	$DEQP_RUNNER_OPTIONS
 fi

 DEQP_EXITCODE=$?
-set -e

 set +x

@@ -230,7 +215,7 @@ deqp-runner junit \
   --results $RESULTS/failures.csv \
   --output $RESULTS/junit.xml \
   --limit 50 \
-   --template "See $ARTIFACTS_BASE_URL/results/{{testcase}}.xml"
+   --template "See https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/results/{{testcase}}.xml"

 # Report the flakes to the IRC channel for monitoring (if configured):
 if [ -n "$FLAKES_CHANNEL" ]; then
@@ -244,13 +229,13 @@ if [ -n "$FLAKES_CHANNEL" ]; then
         --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
+         --branch-title "${CI_MERGE_REQUEST_TITLE:-$CI_COMMIT_TITLE}"
 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 --rm -T0 -8q "$RESULTS/results.csv" -o "$RESULTS/results.csv.zst"
+zstd --rm -T0 -8qc $RESULTS/results.csv -o $RESULTS/results.csv.zst

 section_end test_post_process

--- a/.gitlab-ci/download-git-cache.sh
+++ b/.gitlab-ci/download-git-cache.sh
@@ -15,7 +15,7 @@ fi

 TMP_DIR=$(mktemp -d)

-echo "$(date +"%F %T") Downloading archived master..."
+echo "Downloading archived master..."
 if ! /usr/bin/wget \
 	      -O "$TMP_DIR/$CI_PROJECT_NAME.tar.gz" \
              "https://${S3_HOST}/git-cache/${FDO_UPSTREAM_REPO}/$CI_PROJECT_NAME.tar.gz";
@@ -27,10 +27,8 @@ fi
 set -e

 rm -rf "$CI_PROJECT_DIR"
-echo "$(date +"%F %T") Extracting tarball into '$CI_PROJECT_DIR'..."
+echo "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"
--- a/.gitlab-ci/farm-rules.yml
+++ b/.gitlab-ci/farm-rules.yml
@@ -1,33 +1,3 @@
-# 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`.
-
 .microsoft-farm-rules:
  rules:
    - exists: [ .ci-farms-disabled/microsoft ]  # 1. Is disabled, never run
@@ -58,41 +28,29 @@
    - exists: [ .ci-farms-disabled/microsoft ]
      when: never
    - changes: [ .ci-farms-disabled/microsoft ]
-      if: '$CI_PROJECT_NAMESPACE == "mesa" && $CI_COMMIT_BRANCH'
+      if: '$CI_PIPELINE_SOURCE != "schedule"'
      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
+    - !reference [.microsoft-farm-rules, rules]


 .collabora-farm-rules:
  rules:
-    - exists: [ .ci-farms-disabled/collabora ]
+    - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      exists: [ .ci-farms-disabled/collabora ]
      when: never
-    - if: '$CI_PIPELINE_SOURCE != "schedule"'
+    - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/ && $CI_PIPELINE_SOURCE != "schedule"'
      changes: [ .ci-farms-disabled/collabora ]
      when: on_success
-    - if: '$CI_PIPELINE_SOURCE != "schedule"'
+    - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/ && $CI_PIPELINE_SOURCE != "schedule"'
      changes: [ .ci-farms-disabled/* ]
      when: never

 .collabora-farm-manual-rules:
  rules:
-    - exists: [ .ci-farms-disabled/collabora ]
+    - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/'
+      exists: [ .ci-farms-disabled/collabora ]
      when: never
-    - if: '$CI_PIPELINE_SOURCE != "schedule"'
+    - if: '$RUNNER_TAG =~ /^mesa-ci-x86-64-lava-/ && $CI_PIPELINE_SOURCE != "schedule"'
      changes: [ .ci-farms-disabled/collabora ]
      when: never
    - !reference [.collabora-farm-rules, rules]
@@ -176,7 +134,6 @@
      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:
@@ -237,82 +194,3 @@
      when: never
    - !reference [.freedreno-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]
-
-
-# Skip container & build jobs when disabling any farm, and run them if any
-# farm gets re-enabled.
-# Only apply these rules in MR context, because otherwise we get a false
-# positive on files being 'created' when pushing to a new branch, and break
-# our pipeline
-.disable-farm-mr-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.
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/microsoft ]
-      exists: [ .ci-farms-disabled/microsoft ]
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/collabora ]
-      exists: [ .ci-farms-disabled/collabora ]
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/igalia ]
-      exists: [ .ci-farms-disabled/igalia ]
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/lima ]
-      exists: [ .ci-farms-disabled/lima ]
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/anholt ]
-      exists: [ .ci-farms-disabled/anholt ]
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/valve-mupuf ]
-      exists: [ .ci-farms-disabled/valve-mupuf ]
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/valve-kws ]
-      exists: [ .ci-farms-disabled/valve-kws ]
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/austriancoder ]
-      exists: [ .ci-farms-disabled/austriancoder ]
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/freedreno ]
-      exists: [ .ci-farms-disabled/freedreno ]
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      changes: [ .ci-farms-disabled/ondracka ]
-      exists: [ .ci-farms-disabled/ondracka ]
-      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
--- a/.gitlab-ci/gtest-runner.sh
+++ b/.gitlab-ci/gtest-runner.sh
@@ -55,7 +55,7 @@ deqp-runner junit \
   --results $RESULTS/failures.csv \
   --output $RESULTS/junit.xml \
   --limit 50 \
-   --template "See $ARTIFACTS_BASE_URL/results/{{testcase}}.xml"
+   --template "See https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/results/{{testcase}}.xml"

 # Report the flakes to the IRC channel for monitoring (if configured):
 if [ -n "$FLAKES_CHANNEL" ]; then
@@ -69,7 +69,7 @@ if [ -n "$FLAKES_CHANNEL" ]; then
         --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
+         --branch-title "${CI_MERGE_REQUEST_TITLE:-$CI_COMMIT_TITLE}"
 fi

 exit $GTEST_EXITCODE
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -1,16 +1,12 @@
-# Keep the tags below under 25-30 chars each, as they end up combined into
-# docker image tags, and docker has a length limit of 128 chars total in tags.
-#
-# 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.
-
 variables:
   DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
-   DEBIAN_BASE_TAG: "2024-01-14-runner24"
+   DEBIAN_BASE_TAG: "2023-07-10-virglrenderer"

   DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "2024-01-04-find"
+   DEBIAN_BUILD_TAG: "2023-06-24-agility-711"
+
+   DEBIAN_X86_64_BUILD_MINGW_IMAGE_PATH: "debian/x86_64_build-mingw"
+   DEBIAN_BUILD_MINGW_TAG: "2023-05-25-bookworm"

   DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"

@@ -18,23 +14,20 @@ variables:
   DEBIAN_X86_64_TEST_IMAGE_VK_PATH: "debian/x86_64_test-vk"
   DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"

-   DEBIAN_X86_64_TEST_ANDROID_TAG: "2024-01-14-runner24"
-   DEBIAN_X86_64_TEST_GL_TAG: "2024-01-14-check24"
-   DEBIAN_X86_64_TEST_VK_TAG: "2024-01-14-check24"
+   DEBIAN_X86_64_TEST_ANDROID_TAG: "2023-06-07-deqp"
+   DEBIAN_X86_64_TEST_GL_TAG: "2023-07-02-apitrace-lto"
+   DEBIAN_X86_64_TEST_VK_TAG: "2023-07-08-weston-0"

-   ALPINE_X86_64_BUILD_TAG: "2023-01-07-libdrm2_4_119"
+   ALPINE_X86_64_BUILD_TAG: "2023-05-01-3.18-bump-1"
   ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version"
-   FEDORA_X86_64_BUILD_TAG: "2024-01-06-libdrm"
-   KERNEL_ROOTFS_TAG: "2024-01-14-runner24"
-   KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb"
-   KERNEL_REPO: "gfx-ci/linux"
-   PKG_REPO_REV: "67f2c46b"
+   FEDORA_X86_64_BUILD_TAG: "2023-05-05-ccache-on"
+   KERNEL_ROOTFS_TAG: "2023-07-10-virglrenderer"

-   WINDOWS_X64_MSVC_PATH: "windows/x86_64_msvc"
-   WINDOWS_X64_MSVC_TAG: "2023-12-22-msvc"
+   WINDOWS_X64_VS_PATH: "windows/x64_vs"
+   WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"

-   WINDOWS_X64_BUILD_PATH: "windows/x86_64_build"
-   WINDOWS_X64_BUILD_TAG: "2023-12-22-msvc"
+   WINDOWS_X64_BUILD_PATH: "windows/x64_build"
+   WINDOWS_X64_BUILD_TAG: "2023-06-24-agility-711"

-   WINDOWS_X64_TEST_PATH: "windows/x86_64_test"
-   WINDOWS_X64_TEST_TAG: "2023-12-22-msvc"
+   WINDOWS_X64_TEST_PATH: "windows/x64_test"
+   WINDOWS_X64_TEST_TAG: "2023-05-30-warp-1.0.7.1"
--- a/.gitlab-ci/lava/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava/lava-gitlab-ci.yml
@@ -116,8 +116,6 @@ variables:
 .lava-traces-base:
  variables:
    HWCI_TEST_SCRIPT: "/install/piglit/piglit-traces.sh"
-    # until we overcome Infrastructure issues, give traces extra 5 min before timeout
-    DEVICE_HANGING_TIMEOUT_SEC: 600
  artifacts:
    reports:
      junit: results/junit.xml
--- a/.gitlab-ci/lava/lava-submit.sh
+++ b/.gitlab-ci/lava/lava-submit.sh
@@ -21,12 +21,12 @@ mkdir -p results/job-rootfs-overlay/
 cp artifacts/ci-common/capture-devcoredump.sh results/job-rootfs-overlay/
 cp artifacts/ci-common/init-*.sh results/job-rootfs-overlay/
 cp artifacts/ci-common/intel-gpu-freq.sh results/job-rootfs-overlay/
-cp artifacts/ci-common/kdl.sh results/job-rootfs-overlay/
 cp "$SCRIPTS_DIR"/setup-test-env.sh results/job-rootfs-overlay/

 # Prepare env vars for upload.
 section_start variables "Variables passed through:"
-artifacts/ci-common/generate-env.sh | tee results/job-rootfs-overlay/set-job-env-vars.sh
+KERNEL_IMAGE_BASE_URL="https://${BASE_SYSTEM_HOST_PATH}" \
+	artifacts/ci-common/generate-env.sh | tee results/job-rootfs-overlay/set-job-env-vars.sh
 section_end variables

 tar zcf job-rootfs-overlay.tar.gz -C results/job-rootfs-overlay/ .
@@ -41,8 +41,7 @@ PYTHONPATH=artifacts/ artifacts/lava/lava_job_submitter.py \
 	--dump-yaml \
 	--pipeline-info "$CI_JOB_NAME: $CI_PIPELINE_URL on $CI_COMMIT_REF_NAME ${CI_NODE_INDEX}/${CI_NODE_TOTAL}" \
 	--rootfs-url-prefix "https://${BASE_SYSTEM_HOST_PATH}" \
-	--kernel-url-prefix "${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}" \
-	--kernel-external "${FORCE_KERNEL_TAG}" \
+	--kernel-url-prefix "https://${BASE_SYSTEM_HOST_PATH}" \
 	--build-url "${ARTIFACT_URL}" \
 	--job-rootfs-overlay-url "${FDO_HTTP_CACHE_URI:-}https://${JOB_ROOTFS_OVERLAY_PATH}" \
 	--job-timeout-min ${JOB_TIMEOUT:-30} \
@@ -59,5 +58,4 @@ PYTHONPATH=artifacts/ artifacts/lava/lava_job_submitter.py \
 	--mesa-job-name "$CI_JOB_NAME" \
 	--structured-log-file "results/lava_job_detail.json" \
 	--ssh-client-image "${LAVA_SSH_CLIENT_IMAGE}" \
-	--project-name "${CI_PROJECT_NAME}" \
 	>> results/lava.log
--- a/.gitlab-ci/lava/lava_job_submitter.py
+++ b/.gitlab-ci/lava/lava_job_submitter.py
@@ -17,32 +17,32 @@ import time
 from collections import defaultdict
 from dataclasses import dataclass, fields
 from datetime import datetime, timedelta
+from io import StringIO
 from os import environ, getenv, path
 from typing import Any, Optional

 import fire
-from lavacli.utils import flow_yaml as lava_yaml
-
 from lava.exceptions import (
    MesaCIException,
    MesaCIParseException,
    MesaCIRetryError,
    MesaCITimeoutError,
 )
+from lava.utils import CONSOLE_LOG
+from lava.utils import DEFAULT_GITLAB_SECTION_TIMEOUTS as GL_SECTION_TIMEOUTS
 from lava.utils import (
-    CONSOLE_LOG,
    GitlabSection,
    LAVAJob,
-    LAVAJobDefinition,
    LogFollower,
    LogSectionType,
    call_proxy,
    fatal_err,
+    generate_lava_job_definition,
    hide_sensitive_data,
    print_log,
    setup_lava_proxy,
 )
-from lava.utils import DEFAULT_GITLAB_SECTION_TIMEOUTS as GL_SECTION_TIMEOUTS
+from lavacli.utils import flow_yaml as lava_yaml

 # Initialize structural logging with a defaultdict, it can be changed for more
 # sophisticated dict-like data abstractions.
@@ -58,7 +58,7 @@ except ImportError as e:

 # Timeout in seconds to decide if the device from the dispatched LAVA job has
 # hung or not due to the lack of new log output.
-DEVICE_HANGING_TIMEOUT_SEC = int(getenv("DEVICE_HANGING_TIMEOUT_SEC",  5*60))
+DEVICE_HANGING_TIMEOUT_SEC = int(getenv("LAVA_DEVICE_HANGING_TIMEOUT_SEC",  5*60))

 # How many seconds the script should wait before try a new polling iteration to
 # check if the dispatched LAVA job is running or waiting in the job queue.
@@ -370,7 +370,6 @@ class LAVAJobSubmitter(PathResolver):
    kernel_image_name: str = None
    kernel_image_type: str = ""
    kernel_url_prefix: str = None
-    kernel_external: str = None
    lava_tags: str = ""  # Comma-separated LAVA tags for the job
    mesa_job_name: str = "mesa_ci_job"
    pipeline_info: str = ""
@@ -380,7 +379,6 @@ class LAVAJobSubmitter(PathResolver):
    job_rootfs_overlay_url: str = None
    structured_log_file: pathlib.Path = None  # Log file path with structured LAVA log
    ssh_client_image: str = None  # x86_64 SSH client image to follow the job's output
-    project_name: str = None  # Project name to be used in the job name
    __structured_log_context = contextlib.nullcontext()  # Structured Logger context

    def __post_init__(self) -> None:
@@ -404,7 +402,7 @@ class LAVAJobSubmitter(PathResolver):
            minutes=self.job_timeout_min
        )

-        job_definition = LAVAJobDefinition(self).generate_lava_job_definition()
+        job_definition = generate_lava_job_definition(self)

        if self.dump_yaml:
            self.dump_job_definition(job_definition)
@@ -458,8 +456,10 @@ class LAVAJobSubmitter(PathResolver):
                self.finish_script(last_attempt_job)

    def print_log_artifact_url(self):
+        base_url = "https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/"
+        artifacts_path = "-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/"
        relative_log_path = self.structured_log_file.relative_to(pathlib.Path.cwd())
-        full_path = f"$ARTIFACTS_BASE_URL/{relative_log_path}"
+        full_path = f"{base_url}{artifacts_path}{relative_log_path}"
        artifact_url = path.expandvars(full_path)

        print_log(f"Structural Logging data available at: {artifact_url}")
--- a/.gitlab-ci/lava/utils/init.py
+++ b/.gitlab-ci/lava/utils/init.py
@@ -1,7 +1,7 @@
 from .console_format import CONSOLE_LOG
 from .gitlab_section import GitlabSection
 from .lava_job import LAVAJob
-from .lava_job_definition import LAVAJobDefinition
+from .lava_job_definition import generate_lava_job_definition
 from .lava_proxy import call_proxy, setup_lava_proxy
 from .log_follower import (
    LogFollower,
--- a/.gitlab-ci/lava/utils/constants.py
+++ b/.gitlab-ci/lava/utils/constants.py
@@ -1,14 +0,0 @@
-from os import getenv
-
-# How many attempts should be made when a timeout happen during LAVA device boot.
-NUMBER_OF_ATTEMPTS_LAVA_BOOT = int(getenv("LAVA_NUMBER_OF_ATTEMPTS_LAVA_BOOT", 3))
-
-
-# Supports any integers in [0, 100].
-# The scheduler considers the job priority when ordering the queue
-# to consider which job should run next.
-JOB_PRIORITY = int(getenv("JOB_PRIORITY", 75))
-
-# Use UART over the default SSH mechanism to follow logs.
-# Caution: this can lead to device silence in some devices in Mesa CI.
-FORCE_UART = bool(getenv("LAVA_FORCE_UART", False))
--- a/.gitlab-ci/lava/utils/lava_job_definition.py
+++ b/.gitlab-ci/lava/utils/lava_job_definition.py
@@ -1,216 +1,150 @@
 from io import StringIO
 from typing import TYPE_CHECKING, Any

-from ruamel.yaml import YAML
-
+import re
 from lava.utils.lava_farm import LavaFarm, get_lava_farm
-from lava.utils.ssh_job_definition import (
-    generate_docker_test,
-    generate_dut_test,
-    wrap_boot_action,
-    wrap_final_deploy_action,
-)
-from lava.utils.uart_job_definition import (
-    fastboot_boot_action,
-    fastboot_deploy_actions,
-    tftp_boot_action,
-    tftp_deploy_actions,
-    uart_test_actions,
-)
+from ruamel.yaml.scalarstring import LiteralScalarString
+from ruamel.yaml import YAML
+from os import getenv

 if TYPE_CHECKING:
    from lava.lava_job_submitter import LAVAJobSubmitter

-from .constants import FORCE_UART, JOB_PRIORITY, NUMBER_OF_ATTEMPTS_LAVA_BOOT
+# How many attempts should be made when a timeout happen during LAVA device boot.
+NUMBER_OF_ATTEMPTS_LAVA_BOOT = int(getenv("LAVA_NUMBER_OF_ATTEMPTS_LAVA_BOOT", 3))
+
+# Supports any integers in [0, 100].
+# The scheduler considers the job priority when ordering the queue
+# to consider which job should run next.
+JOB_PRIORITY = int(getenv("LAVA_JOB_PRIORITY", 75))


-class LAVAJobDefinition:
+def has_ssh_support(job_submitter: "LAVAJobSubmitter") -> bool:
+    force_uart = bool(getenv("LAVA_FORCE_UART", False))
+
+    if force_uart:
+        return False
+
+    # Only Collabora's farm supports to run docker container as a LAVA actions,
+    # which is required to follow the job in a SSH section
+    current_farm = get_lava_farm()
+
+    # SSH job definition still needs to add support for fastboot.
+    job_uses_fastboot: bool = job_submitter.boot_method == "fastboot"
+
+    return current_farm == LavaFarm.COLLABORA and not job_uses_fastboot
+
+
+def generate_lava_yaml_payload(job_submitter: "LAVAJobSubmitter") -> dict[str, Any]:
    """
-    This class is responsible for generating the YAML payload to submit a LAVA
-    job.
+    Bridge function to use the supported job definition depending on some Mesa
+    CI job characteristics.
+
+    The strategy here, is to use LAVA with a containerized SSH session to follow
+    the job output, escaping from dumping data to the UART, which proves to be
+    error prone in some devices.
    """
+    from lava.utils.ssh_job_definition import (
+        generate_lava_yaml_payload as ssh_lava_yaml,
+    )
+    from lava.utils.uart_job_definition import (
+        generate_lava_yaml_payload as uart_lava_yaml,
+    )

-    def __init__(self, job_submitter: "LAVAJobSubmitter") -> None:
-        self.job_submitter: "LAVAJobSubmitter" = job_submitter
+    if has_ssh_support(job_submitter):
+        return ssh_lava_yaml(job_submitter)

-    def has_ssh_support(self) -> bool:
-        if FORCE_UART:
-            return False
+    return uart_lava_yaml(job_submitter)

-        # Only Collabora's farm supports to run docker container as a LAVA actions,
-        # which is required to follow the job in a SSH section
-        current_farm = get_lava_farm()

-        return current_farm == LavaFarm.COLLABORA
+def generate_lava_job_definition(job_submitter: "LAVAJobSubmitter") -> str:
+    job_stream = StringIO()
+    yaml = YAML()
+    yaml.width = 4096
+    yaml.dump(generate_lava_yaml_payload(job_submitter), job_stream)
+    return job_stream.getvalue()

-    def generate_lava_yaml_payload(self) -> dict[str, Any]:
-        """
-        Generates a YAML payload for submitting a LAVA job, based on the provided arguments.

-        Args:
-            None
+def to_yaml_block(steps_array: list[str], escape_vars=[]) -> LiteralScalarString:
+    def escape_envvar(match):
+        return "\\" + match.group(0)

-        Returns:
-            a dictionary containing the values generated by the `generate_metadata` function and the
-            actions for the LAVA job submission.
-        """
-        args = self.job_submitter
-        values = self.generate_metadata()
-        nfsrootfs = {
-            "url": f"{args.rootfs_url_prefix}/lava-rootfs.tar.zst",
-            "compression": "zstd",
-        }
+    filtered_array = [s for s in steps_array if s.strip() and not s.startswith("#")]
+    final_str = "\n".join(filtered_array)

-        init_stage1_steps = self.init_stage1_steps()
-        artifact_download_steps = self.artifact_download_steps()
+    for escape_var in escape_vars:
+        # Find env vars and add '\\' before them
+        final_str = re.sub(rf"\${escape_var}*", escape_envvar, final_str)
+    return LiteralScalarString(final_str)

-        deploy_actions = []
-        boot_action = []
-        test_actions = uart_test_actions(args, init_stage1_steps, artifact_download_steps)

-        if args.boot_method == "fastboot":
-            deploy_actions = fastboot_deploy_actions(self, nfsrootfs)
-            boot_action = fastboot_boot_action(args)
-        else:  # tftp
-            deploy_actions = tftp_deploy_actions(self, nfsrootfs)
-            boot_action = tftp_boot_action(args)
-
-        if self.has_ssh_support():
-            wrap_final_deploy_action(deploy_actions[-1])
-            # SSH jobs use namespaces to differentiate between the DUT and the
-            # docker container. Every LAVA action needs an explicit namespace, when we are not using
-            # the default one.
-            for deploy_action in deploy_actions:
-                deploy_action["namespace"] = "dut"
-            wrap_boot_action(boot_action)
-            test_actions = (
-                generate_dut_test(args, init_stage1_steps),
-                generate_docker_test(args, artifact_download_steps),
-            )
-
-        values["actions"] = [
-            *[{"deploy": d} for d in deploy_actions],
-            {"boot": boot_action},
-            *[{"test": t} for t in test_actions],
-        ]
-
-        return values
-
-    def generate_lava_job_definition(self) -> str:
-        """
-        Generates a LAVA job definition in YAML format and returns it as a string.
-
-        Returns:
-            a string representation of the job definition generated by analysing job submitter
-            arguments and environment variables
-        """
-        job_stream = StringIO()
-        yaml = YAML()
-        yaml.width = 4096
-        yaml.dump(self.generate_lava_yaml_payload(), job_stream)
-        return job_stream.getvalue()
-
-    def generate_metadata(self) -> dict[str, Any]:
-        # General metadata and permissions
-        values = {
-            "job_name": f"{self.job_submitter.project_name}: {self.job_submitter.pipeline_info}",
-            "device_type": self.job_submitter.device_type,
-            "visibility": {"group": [self.job_submitter.visibility_group]},
-            "priority": JOB_PRIORITY,
-            "context": {"extra_nfsroot_args": " init=/init rootwait usbcore.quirks=0bda:8153:k"},
-            "timeouts": {
-                "job": {"minutes": self.job_submitter.job_timeout_min},
-                "actions": {
-                    "depthcharge-retry": {
-                        # Could take between 1 and 1.5 min in slower boots
-                        "minutes": 4
-                    },
-                    "depthcharge-start": {
-                        # Should take less than 1 min.
-                        "minutes": 1,
-                    },
-                    "depthcharge-action": {
-                        # This timeout englobes the entire depthcharge timing,
-                        # including retries
-                        "minutes": 5
-                        * NUMBER_OF_ATTEMPTS_LAVA_BOOT,
-                    },
+def generate_metadata(args) -> dict[str, Any]:
+    # General metadata and permissions
+    values = {
+        "job_name": f"mesa: {args.pipeline_info}",
+        "device_type": args.device_type,
+        "visibility": {"group": [args.visibility_group]},
+        "priority": JOB_PRIORITY,
+        "context": {
+            "extra_nfsroot_args": " init=/init rootwait usbcore.quirks=0bda:8153:k"
+        },
+        "timeouts": {
+            "job": {"minutes": args.job_timeout_min},
+            "actions": {
+                "depthcharge-retry": {
+                    # Could take between 1 and 1.5 min in slower boots
+                    "minutes": 4
+                },
+                "depthcharge-start": {
+                    # Should take less than 1 min.
+                    "minutes": 1,
+                },
+                "depthcharge-action": {
+                    # This timeout englobes the entire depthcharge timing,
+                    # including retries
+                    "minutes": 5
+                    * NUMBER_OF_ATTEMPTS_LAVA_BOOT,
                },
            },
-        }
+        },
+    }

-        if self.job_submitter.lava_tags:
-            values["tags"] = self.job_submitter.lava_tags.split(",")
+    if args.lava_tags:
+        values["tags"] = args.lava_tags.split(",")

-        return values
+    return values

-    def attach_kernel_and_dtb(self, deploy_field):
-        if self.job_submitter.kernel_image_type:
-            deploy_field["kernel"]["type"] = self.job_submitter.kernel_image_type
-        if self.job_submitter.dtb_filename:
-            deploy_field["dtb"] = {
-                "url": f"{self.job_submitter.kernel_url_prefix}/"
-                f"{self.job_submitter.dtb_filename}.dtb"
-            }

-    def attach_external_modules(self, deploy_field):
-        if self.job_submitter.kernel_external:
-            deploy_field["modules"] = {
-                "url": f"{self.job_submitter.kernel_url_prefix}/modules.tar.zst",
-                "compression": "zstd"
-            }
+def artifact_download_steps(args):
+    """
+    This function is responsible for setting up the SSH server in the DUT and to
+    export the first boot environment to a file.
+    """
+    # Putting JWT pre-processing and mesa download, within init-stage1.sh file,
+    # as we do with non-SSH version.
+    download_steps = [
+        "set -ex",
+        "curl -L --retry 4 -f --retry-all-errors --retry-delay 60 "
+        f"{args.job_rootfs_overlay_url} | tar -xz -C /",
+        f"mkdir -p {args.ci_project_dir}",
+        f"curl -L --retry 4 -f --retry-all-errors --retry-delay 60 {args.build_url} | "
+        f"tar --zstd -x -C {args.ci_project_dir}",
+    ]

-    def artifact_download_steps(self):
-        """
-        This function is responsible for setting up the SSH server in the DUT and to
-        export the first boot environment to a file.
-        """
-        # Putting JWT pre-processing and mesa download, within init-stage1.sh file,
-        # as we do with non-SSH version.
-        download_steps = [
-            "set -ex",
-            "curl -L --retry 4 -f --retry-all-errors --retry-delay 60 "
-            f"{self.job_submitter.job_rootfs_overlay_url} | tar -xz -C /",
-            f"mkdir -p {self.job_submitter.ci_project_dir}",
-            f"curl -L --retry 4 -f --retry-all-errors --retry-delay 60 {self.job_submitter.build_url} | "
-            f"tar --zstd -x -C {self.job_submitter.ci_project_dir}",
+    # If the JWT file is provided, we will use it to authenticate with the cloud
+    # storage provider and will hide it from the job output in Gitlab.
+    if args.jwt_file:
+        with open(args.jwt_file) as jwt_file:
+            download_steps += [
+                "set +x  # HIDE_START",
+                f'echo -n "{jwt_file.read()}" > "{args.jwt_file}"',
+                "set -x  # HIDE_END",
+                f'echo "export CI_JOB_JWT_FILE={args.jwt_file}" >> /set-job-env-vars.sh',
+            ]
+    else:
+        download_steps += [
+            "echo Could not find jwt file, disabling S3 requests...",
+            "sed -i '/S3_RESULTS_UPLOAD/d' /set-job-env-vars.sh",
        ]

-        # If the JWT file is provided, we will use it to authenticate with the cloud
-        # storage provider and will hide it from the job output in Gitlab.
-        if self.job_submitter.jwt_file:
-            with open(self.job_submitter.jwt_file) as jwt_file:
-                download_steps += [
-                    "set +x  # HIDE_START",
-                    f'echo -n "{jwt_file.read()}" > "{self.job_submitter.jwt_file}"',
-                    "set -x  # HIDE_END",
-                    f'echo "export CI_JOB_JWT_FILE={self.job_submitter.jwt_file}" >> /set-job-env-vars.sh',
-                ]
-        else:
-            download_steps += [
-                "echo Could not find jwt file, disabling S3 requests...",
-                "sed -i '/S3_RESULTS_UPLOAD/d' /set-job-env-vars.sh",
-            ]
-
-        return download_steps
-
-    def init_stage1_steps(self) -> list[str]:
-        run_steps = []
-        # job execution script:
-        #   - inline .gitlab-ci/common/init-stage1.sh
-        #   - fetch and unpack per-pipeline build artifacts from build job
-        #   - fetch and unpack per-job environment from lava-submit.sh
-        #   - exec .gitlab-ci/common/init-stage2.sh
-
-        with open(self.job_submitter.first_stage_init, "r") as init_sh:
-            run_steps += [x.rstrip() for x in init_sh if not x.startswith("#") and x.rstrip()]
-        # We cannot distribute the Adreno 660 shader firmware inside rootfs,
-        # since the license isn't bundled inside the repository
-        if self.job_submitter.device_type == "sm8350-hdk":
-            run_steps.append(
-                "curl -L --retry 4 -f --retry-all-errors --retry-delay 60 "
-                + "https://github.com/allahjasif1990/hdk888-firmware/raw/main/a660_zap.mbn "
-                + '-o "/lib/firmware/qcom/sm8350/a660_zap.mbn"'
-            )
-
-        return run_steps
+    return download_steps
--- a/.gitlab-ci/lava/utils/ssh_job_definition.py
+++ b/.gitlab-ci/lava/utils/ssh_job_definition.py
@@ -28,15 +28,15 @@ script after sourcing "dut-env-vars.sh" again for the second SSH test case.
 """


-import re
-from typing import TYPE_CHECKING, Any, Iterable
+from pathlib import Path
+from typing import Any

-from ruamel.yaml.scalarstring import LiteralScalarString
-
-from .constants import NUMBER_OF_ATTEMPTS_LAVA_BOOT
-
-if TYPE_CHECKING:
-    from ..lava_job_submitter import LAVAJobSubmitter
+from .lava_job_definition import (
+    NUMBER_OF_ATTEMPTS_LAVA_BOOT,
+    artifact_download_steps,
+    generate_metadata,
+    to_yaml_block,
+)

 # Very early SSH server setup. Uses /dut_ready file to flag it is done.
 SSH_SERVER_COMMANDS = {
@@ -79,23 +79,12 @@ lava_ssh_test_case() {
 ]


-def to_yaml_block(steps_array: Iterable[str], escape_vars=[]) -> LiteralScalarString:
-    def escape_envvar(match):
-        return "\\" + match.group(0)
-
-    filtered_array = [s for s in steps_array if s.strip() and not s.startswith("#")]
-    final_str = "\n".join(filtered_array)
-
-    for escape_var in escape_vars:
-        # Find env vars and add '\\' before them
-        final_str = re.sub(rf"\${escape_var}*", escape_envvar, final_str)
-    return LiteralScalarString(final_str)
-
-
-def generate_dut_test(args: "LAVAJobSubmitter", first_stage_steps: list[str]) -> dict[str, Any]:
+def generate_dut_test(args):
    # Commands executed on DUT.
    # Trying to execute the minimal number of commands, because the console data is
    # retrieved via UART, which is hang-prone in some devices.
+
+    first_stage_steps: list[str] = Path(args.first_stage_init).read_text().splitlines()
    return {
        "namespace": "dut",
        "definitions": [
@@ -120,9 +109,7 @@ def generate_dut_test(args: "LAVAJobSubmitter", first_stage_steps: list[str]) ->
    }


-def generate_docker_test(
-    args: "LAVAJobSubmitter", artifact_download_steps: list[str]
-) -> dict[str, Any]:
+def generate_docker_test(args):
    # This is a growing list of commands that will be executed by the docker
    # guest, which will be the SSH client.
    docker_commands = []
@@ -161,14 +148,14 @@ def generate_docker_test(
            (
                "lava_ssh_test_case 'artifact_download' 'bash --' << EOF",
                "source /dut-env-vars.sh",
-                *artifact_download_steps,
+                *artifact_download_steps(args),
                "EOF",
            )
        ),
        "export SSH_PTY_ARGS=-tt",
        # Putting CI_JOB name as the testcase name, it may help LAVA farm
        # maintainers with monitoring
-        f"lava_ssh_test_case '{args.project_name}_{args.mesa_job_name}' "
+        f"lava_ssh_test_case 'mesa-ci_{args.mesa_job_name}' "
        # Changing directory to /, as the HWCI_SCRIPT expects that
        "'\"cd / && /init-stage2.sh\"'",
    ]
@@ -176,21 +163,46 @@ def generate_docker_test(
    return init_stages_test


-def wrap_final_deploy_action(final_deploy_action: dict):
-    wrap = {
+def generate_lava_yaml_payload(args) -> dict[str, Any]:
+    values = generate_metadata(args)
+
+    # URLs to our kernel rootfs to boot from, both generated by the base
+    # container build
+    deploy = {
        "namespace": "dut",
        "failure_retry": NUMBER_OF_ATTEMPTS_LAVA_BOOT,
        "timeout": {"minutes": 10},
+        "timeouts": {"http-download": {"minutes": 2}},
+        "to": "tftp",
+        "os": "oe",
+        "kernel": {"url": f"{args.kernel_url_prefix}/{args.kernel_image_name}"},
+        "nfsrootfs": {
+            "url": f"{args.rootfs_url_prefix}/lava-rootfs.tar.zst",
+            "compression": "zstd",
+        },
    }
+    if args.kernel_image_type:
+        deploy["kernel"]["type"] = args.kernel_image_type
+    if args.dtb_filename:
+        deploy["dtb"] = {"url": f"{args.kernel_url_prefix}/{args.dtb_filename}.dtb"}

-    final_deploy_action.update(wrap)
-
-
-def wrap_boot_action(boot_action: dict):
-    wrap = {
+    # always boot over NFS
+    boot = {
        "namespace": "dut",
        "failure_retry": NUMBER_OF_ATTEMPTS_LAVA_BOOT,
+        "method": args.boot_method,
+        "commands": "nfs",
+        "prompts": ["lava-shell:"],
        **SSH_SERVER_COMMANDS,
    }

-    boot_action.update(wrap)
+    # only declaring each job as a single 'test' since LAVA's test parsing is
+    # not useful to us
+    values["actions"] = [
+        {"deploy": deploy},
+        {"boot": boot},
+        {"test": generate_dut_test(args)},
+        {"test": generate_docker_test(args)},
+    ]
+
+    return values
--- a/.gitlab-ci/lava/utils/uart_job_definition.py
+++ b/.gitlab-ci/lava/utils/uart_job_definition.py
@@ -1,23 +1,22 @@
-from typing import TYPE_CHECKING, Any
-
-if TYPE_CHECKING:
-    from ..lava_job_submitter import LAVAJobSubmitter
-    from .lava_job_definition import LAVAJobDefinition
-
-from .constants import NUMBER_OF_ATTEMPTS_LAVA_BOOT
-
-# Use the same image that is being used for the hardware enablement and health-checks.
-# They are pretty small (<100MB) and have all the tools we need to run LAVA, so it is a safe choice.
-# You can find the Dockerfile here:
-# https://gitlab.collabora.com/lava/health-check-docker/-/blob/main/Dockerfile
-# And the registry here: https://gitlab.collabora.com/lava/health-check-docker/container_registry/
-DOCKER_IMAGE = "registry.gitlab.collabora.com/lava/health-check-docker"
+from typing import Any
+from .lava_job_definition import (
+    generate_metadata,
+    NUMBER_OF_ATTEMPTS_LAVA_BOOT,
+    artifact_download_steps,
+)


-def fastboot_deploy_actions(
-    job_definition: "LAVAJobDefinition", nfsrootfs
-) -> tuple[dict[str, Any], ...]:
-    args = job_definition.job_submitter
+def generate_lava_yaml_payload(args) -> dict[str, Any]:
+    values = generate_metadata(args)
+
+    # URLs to our kernel rootfs to boot from, both generated by the base
+    # container build
+
+    nfsrootfs = {
+        "url": f"{args.rootfs_url_prefix}/lava-rootfs.tar.zst",
+        "compression": "zstd",
+    }
+
    fastboot_deploy_nfs = {
        "timeout": {"minutes": 10},
        "to": "nfs",
@@ -35,7 +34,7 @@ def fastboot_deploy_actions(
        },
        "postprocess": {
            "docker": {
-                "image": DOCKER_IMAGE,
+                "image": "registry.gitlab.collabora.com/lava/health-check-docker",
                "steps": [
                    f"cat Image.gz {args.dtb_filename}.dtb > Image.gz+dtb",
                    "mkbootimg --kernel Image.gz+dtb"
@@ -45,28 +44,13 @@ def fastboot_deploy_actions(
            }
        },
    }
+    if args.kernel_image_type:
+        fastboot_deploy_prepare["images"]["kernel"]["type"] = args.kernel_image_type
+    if args.dtb_filename:
+        fastboot_deploy_prepare["images"]["dtb"] = {
+            "url": f"{args.kernel_url_prefix}/{args.dtb_filename}.dtb"
+        }

-    fastboot_deploy = {
-        "timeout": {"minutes": 2},
-        "to": "fastboot",
-        "docker": {
-            "image": DOCKER_IMAGE,
-        },
-        "images": {
-            "boot": {"url": "downloads://boot.img"},
-        },
-    }
-
-    # URLs to our kernel rootfs to boot from, both generated by the base
-    # container build
-    job_definition.attach_kernel_and_dtb(fastboot_deploy_prepare["images"])
-    job_definition.attach_external_modules(fastboot_deploy_nfs)
-
-    return (fastboot_deploy_nfs, fastboot_deploy_prepare, fastboot_deploy)
-
-
-def tftp_deploy_actions(job_definition: "LAVAJobDefinition", nfsrootfs) -> tuple[dict[str, Any]]:
-    args = job_definition.job_submitter
    tftp_deploy = {
        "timeout": {"minutes": 5},
        "to": "tftp",
@@ -76,15 +60,40 @@ def tftp_deploy_actions(job_definition: "LAVAJobDefinition", nfsrootfs) -> tuple
        },
        "nfsrootfs": nfsrootfs,
    }
-    job_definition.attach_kernel_and_dtb(tftp_deploy)
-    job_definition.attach_external_modules(tftp_deploy)
+    if args.kernel_image_type:
+        tftp_deploy["kernel"]["type"] = args.kernel_image_type
+    if args.dtb_filename:
+        tftp_deploy["dtb"] = {
+            "url": f"{args.kernel_url_prefix}/{args.dtb_filename}.dtb"
+        }

-    return (tftp_deploy,)
+    fastboot_deploy = {
+        "timeout": {"minutes": 2},
+        "to": "fastboot",
+        "docker": {
+            "image": "registry.gitlab.collabora.com/lava/health-check-docker",
+        },
+        "images": {
+            "boot": {"url": "downloads://boot.img"},
+        },
+    }

+    fastboot_boot = {
+        "timeout": {"minutes": 2},
+        "docker": {"image": "registry.gitlab.collabora.com/lava/health-check-docker"},
+        "failure_retry": NUMBER_OF_ATTEMPTS_LAVA_BOOT,
+        "method": args.boot_method,
+        "prompts": ["lava-shell:"],
+        "commands": ["set_active a"],
+    }
+
+    tftp_boot = {
+        "failure_retry": NUMBER_OF_ATTEMPTS_LAVA_BOOT,
+        "method": args.boot_method,
+        "prompts": ["lava-shell:"],
+        "commands": "nfs",
+    }

-def uart_test_actions(
-    args: "LAVAJobSubmitter", init_stage1_steps: list[str], artifact_download_steps: list[str]
-) -> tuple[dict[str, Any]]:
    # skeleton test definition: only declaring each job as a single 'test'
    # since LAVA's test parsing is not useful to us
    run_steps = []
@@ -111,8 +120,26 @@ def uart_test_actions(
        ],
    }

-    run_steps += init_stage1_steps
-    run_steps += artifact_download_steps
+    # job execution script:
+    #   - inline .gitlab-ci/common/init-stage1.sh
+    #   - fetch and unpack per-pipeline build artifacts from build job
+    #   - fetch and unpack per-job environment from lava-submit.sh
+    #   - exec .gitlab-ci/common/init-stage2.sh
+
+    with open(args.first_stage_init, "r") as init_sh:
+        run_steps += [
+            x.rstrip() for x in init_sh if not x.startswith("#") and x.rstrip()
+        ]
+    # We cannot distribute the Adreno 660 shader firmware inside rootfs,
+    # since the license isn't bundled inside the repository
+    if args.device_type == "sm8350-hdk":
+        run_steps.append(
+            "curl -L --retry 4 -f --retry-all-errors --retry-delay 60 "
+            + "https://github.com/allahjasif1990/hdk888-firmware/raw/main/a660_zap.mbn "
+            + '-o "/lib/firmware/qcom/sm8350/a660_zap.mbn"'
+        )
+
+    run_steps += artifact_download_steps(args)

    run_steps += [
        f"mkdir -p {args.ci_project_dir}",
@@ -123,31 +150,22 @@ def uart_test_actions(
        "sleep 1",
        # Putting CI_JOB name as the testcase name, it may help LAVA farm
        # maintainers with monitoring
-        f"lava-test-case '{args.project_name}_{args.mesa_job_name}' --shell /init-stage2.sh",
+        f"lava-test-case 'mesa-ci_{args.mesa_job_name}' --shell /init-stage2.sh",
    ]

-    return (test,)
+    if args.boot_method == "fastboot":
+        values["actions"] = [
+            {"deploy": fastboot_deploy_nfs},
+            {"deploy": fastboot_deploy_prepare},
+            {"deploy": fastboot_deploy},
+            {"boot": fastboot_boot},
+            {"test": test},
+        ]
+    else:  # tftp
+        values["actions"] = [
+            {"deploy": tftp_deploy},
+            {"boot": tftp_boot},
+            {"test": test},
+        ]

-
-def tftp_boot_action(args: "LAVAJobSubmitter") -> dict[str, Any]:
-    tftp_boot = {
-        "failure_retry": NUMBER_OF_ATTEMPTS_LAVA_BOOT,
-        "method": args.boot_method,
-        "prompts": ["lava-shell:"],
-        "commands": "nfs",
-    }
-
-    return tftp_boot
-
-
-def fastboot_boot_action(args: "LAVAJobSubmitter") -> dict[str, Any]:
-    fastboot_boot = {
-        "timeout": {"minutes": 2},
-        "docker": {"image": DOCKER_IMAGE},
-        "failure_retry": NUMBER_OF_ATTEMPTS_LAVA_BOOT,
-        "method": args.boot_method,
-        "prompts": ["lava-shell:"],
-        "commands": ["set_active a"],
-    }
-
-    return fastboot_boot
+    return values
--- a/.gitlab-ci/meson/build.sh
+++ b/.gitlab-ci/meson/build.sh
@@ -51,8 +51,9 @@ fi

 # Only use GNU time if available, not any shell built-in command
 case $CI_JOB_NAME in
+    # strace and wine don't seem to mix well
    # ASAN leak detection is incompatible with strace
-    *-asan*)
+    debian-mingw32-x86_64|*-asan*)
        if test -f /usr/bin/time; then
            MESON_TEST_ARGS+=--wrapper=$PWD/.gitlab-ci/meson/time.sh
        fi
@@ -70,7 +71,7 @@ rm -rf _build
 meson setup _build \
      --native-file=native.file \
      --wrap-mode=nofallback \
-      --force-fallback-for perfetto,syn \
+      --force-fallback-for perfetto \
      ${CROSS+--cross "$CROSS_FILE"} \
      -D prefix=$PWD/install \
      -D libdir=lib \
@@ -84,10 +85,9 @@ meson setup _build \
      -D libunwind=${UNWIND} \
      ${DRI_LOADERS} \
      ${GALLIUM_ST} \
-      -D gallium-opencl=disabled \
      -D gallium-drivers=${GALLIUM_DRIVERS:-[]} \
      -D vulkan-drivers=${VULKAN_DRIVERS:-[]} \
-      -D video-codecs=all \
+      -D video-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec \
      -D werror=true \
      ${EXTRA_OPTION}
 cd _build
@@ -104,11 +104,10 @@ fi

 uncollapsed_section_switch meson-test "meson: test"
 LC_ALL=C.UTF-8 meson test --num-processes "${FDO_CI_CONCURRENT:-4}" --print-errorlogs ${MESON_TEST_ARGS}
-section_switch meson-install "meson: install"
 if command -V mold &> /dev/null ; then
    mold --run ninja install
 else
    ninja install
 fi
 cd ..
-section_end meson-install
+section_end meson-test
--- a/.gitlab-ci/piglit/piglit-runner.sh
+++ b/.gitlab-ci/piglit/piglit-runner.sh
@@ -106,7 +106,7 @@ deqp-runner junit \
   --results $RESULTS/failures.csv \
   --output $RESULTS/junit.xml \
   --limit 50 \
-   --template "See $ARTIFACTS_BASE_URL/results/{{testcase}}.xml"
+   --template "See https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/results/{{testcase}}.xml"

 # Report the flakes to the IRC channel for monitoring (if configured):
 if [ -n "$FLAKES_CHANNEL" ]; then
@@ -120,7 +120,7 @@ if [ -n "$FLAKES_CHANNEL" ]; then
         --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
+         --branch-title "${CI_MERGE_REQUEST_TITLE:-$CI_COMMIT_TITLE}"
 fi

 # Compress results.csv to save on bandwidth during the upload of artifacts to
--- a/.gitlab-ci/piglit/piglit-traces.sh
+++ b/.gitlab-ci/piglit/piglit-traces.sh
@@ -13,14 +13,9 @@ S3_ARGS="--token-file ${CI_JOB_JWT_FILE}"
 RESULTS=$(realpath -s "$PWD"/results)
 mkdir -p "$RESULTS"

-export PIGLIT_REPLAY_DESCRIPTION_FILE="$INSTALL/$PIGLIT_TRACES_FILE"
-
 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

 # WINE
@@ -127,7 +122,7 @@ if [ -n "$CI_NODE_INDEX" ]; then
 fi

 # shellcheck disable=SC2317
-replay_s3_upload_images() {
+replay_minio_upload_images() {
    find "$RESULTS/$__PREFIX" -type f -name "*.png" -printf "%P\n" \
        | while read -r line; do

@@ -138,7 +133,7 @@ replay_s3_upload_images() {
            fi
            __S3_PATH="$PIGLIT_REPLAY_REFERENCE_IMAGES_BASE"
            __DESTINATION_FILE_PATH="${line##*-}"
-            if curl -L -s -I "https://${__S3_PATH}/${__DESTINATION_FILE_PATH}" | grep -q "content-type: application/octet-stream" 2>/dev/null; then
+            if curl -L -s -X HEAD "https://${__S3_PATH}/${__DESTINATION_FILE_PATH}" 2>/dev/null; then
                continue
            fi
        else
@@ -190,6 +185,8 @@ then
    printf "%s\n" "Found $(cat /tmp/version.txt), expected $MESA_VERSION"
 fi

+ARTIFACTS_BASE_URL="https://${CI_PROJECT_ROOT_NAMESPACE}.${CI_PAGES_DOMAIN}/-/${CI_PROJECT_NAME}/-/jobs/${CI_JOB_ID}/artifacts"
+
 ./piglit summary aggregate "$RESULTS" -o junit.xml

 PIGLIT_RESULTS="${PIGLIT_RESULTS:-replay}"
@@ -206,7 +203,7 @@ __S3_PATH="$PIGLIT_REPLAY_ARTIFACTS_BASE_URL"
 __S3_TRACES_PREFIX="traces"

 if [ "$PIGLIT_REPLAY_SUBCOMMAND" != "profile" ]; then
-    quiet replay_s3_upload_images
+    quiet replay_minio_upload_images
 fi


@@ -224,5 +221,5 @@ find "$RESULTS"/summary -type f -name "*.html" -print0 \

 echo "Failures in traces:"
 cat $RESULTSFILE
-error echo "Review the image changes and get the new checksums at: ${ARTIFACTS_BASE_URL}/results/summary/problems.html "
+error echo "Review the image changes and get the new checksums at: ${ARTIFACTS_BASE_URL}/results/summary/problems.html"
 exit 1
--- a/.gitlab-ci/prepare-artifacts.sh
+++ b/.gitlab-ci/prepare-artifacts.sh
@@ -23,7 +23,7 @@ else
    STRIP="strip"
 fi
 if [ -z "$ARTIFACTS_DEBUG_SYMBOLS" ]; then
-    find install -name \*.so -exec $STRIP --strip-debug {} \;
+    find install -name \*.so -exec $STRIP {} \;
 fi

 # Test runs don't pull down the git tree, so put the dEQP helper
@@ -42,8 +42,6 @@ cp -Rp .gitlab-ci/valve install/
 cp -Rp .gitlab-ci/vkd3d-proton install/
 cp -Rp .gitlab-ci/setup-test-env.sh install/
 cp -Rp .gitlab-ci/*-runner.sh install/
-cp -Rp .gitlab-ci/bin/structured_logger.py install/
-cp -Rp .gitlab-ci/bin/custom_logger.py install/
 find . -path \*/ci/\*.txt \
    -o -path \*/ci/\*.toml \
    -o -path \*/ci/\*traces\*.yml \
--- a/.gitlab-ci/run-shader-db.sh
+++ b/.gitlab-ci/run-shader-db.sh
@@ -19,14 +19,14 @@ for driver in freedreno intel v3d vc4; do
 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
+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
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -16,69 +16,37 @@
    name: "mesa_${CI_JOB_NAME}"
    paths:
      - results/
-  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/x86_64_build
-  variables:
-    GIT_STRATEGY: fetch
-  timeout: 10m
-  script:
-    - git diff --color=always --exit-code  # Fails if there are diffs
-  tags:
-    - placeholder-job

 rustfmt:
+  # Cancel job if a newer commit is pushed to the same branch
+  interruptible: true
+  stage: lint
  extends:
-    - .formatting-check
+    - .use-debian/x86_64_build
    - .lint-rustfmt-rules
-  before_script:
+  variables:
+    GIT_STRATEGY: fetch
+  script:
    - shopt -s globstar
-    - rustfmt --version
-    - rustfmt --verbose src/**/lib.rs
-    - rustfmt --verbose src/**/main.rs
+    - rustfmt --check --verbose src/**/lib.rs

 clang-format:
+  # Cancel job if a newer commit is pushed to the same branch
+  interruptible: true
+  stage: lint
  extends:
-    - .formatting-check
+    - .use-debian/x86_64_build
    - .lint-clang-format-rules
  variables:
+    GIT_STRATEGY: fetch
    LLVM_VERSION: 15
-  before_script:
+  script:
    - shopt -s globstar
    # We need a meson build dir, but its config doesn't actually matter, so
    # let's just use the default.
    - meson setup build
-    - clang-format-${LLVM_VERSION} --version
    - ninja -C build clang-format
-
-.test-check:
-  # Cancel job if a newer commit is pushed to the same branch
-  interruptible: true
-  stage: code-validation
-  extends:
-    - .use-debian/x86_64_build
-  variables:
-    GIT_STRATEGY: fetch
-  timeout: 10m
-
-python-test:
-  extends:
-    - .test-check
-  script:
-    - cd bin/ci
-    - pip install --break-system-packages -r test/requirements.txt
-    - PYTHONPATH=. pytest -v
-  rules:
-    - !reference [.disable-farm-mr-rules, rules]
-    - !reference [.never-post-merge-rules, rules]
-    - changes:
-        - bin/ci/**/*
+    - git diff --color=always --exit-code  # Fails if there are diffs

 .test-gl:
  extends:
@@ -88,8 +56,6 @@ python-test:
    - debian/x86_64_test-gl
    - debian-testing
    - !reference [.required-for-hardware-jobs, needs]
-  variables:
-    DEBIAN_ARCH: amd64

 .test-vk:
  extends:
@@ -99,8 +65,6 @@ python-test:
    - debian-testing
    - debian/x86_64_test-vk
    - !reference [.required-for-hardware-jobs, needs]
-  variables:
-    DEBIAN_ARCH: amd64

 .test-cl:
  extends:
@@ -166,9 +130,7 @@ python-test:
    exclude:
      - results/*.shader_cache
  variables:
-    PIGLIT_REPLAY_EXTRA_ARGS: --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-public --jwt-file=${CI_JOB_JWT_FILE}
-    # until we overcome Infrastructure issues, give traces extra 5 min before timeout
-    DEVICE_HANGING_TIMEOUT_SEC: 600
+    PIGLIT_REPLAY_EXTRA_ARGS: --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-public --jwt-file=${CI_JOB_JWT_FILE}
  script:
    - section_start variables "Variables passed through:"
    - install/common/generate-env.sh
@@ -177,7 +139,6 @@ python-test:

 .deqp-test:
  script:
-    - rm -rf results # Clear out old results if the docker container was cached
    - ./install/deqp-runner.sh
  artifacts:
    exclude:
@@ -216,8 +177,6 @@ python-test:
    - rm -rf install
    - (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
-  variables:
-    BM_ROOTFS: /rootfs-${DEBIAN_ARCH}
  artifacts:
    when: always
    name: "mesa_${CI_JOB_NAME}"
@@ -235,7 +194,7 @@ python-test:
    - .baremetal-test
    - .use-debian/arm32_test
  variables:
-    DEBIAN_ARCH: armhf
+    BM_ROOTFS: /rootfs-armhf
    S3_ARTIFACT_NAME: mesa-arm32-default-debugoptimized
  needs:
    - debian/arm32_test
@@ -249,7 +208,7 @@ python-test:
    - .baremetal-test
    - .use-debian/arm64_test
  variables:
-    DEBIAN_ARCH: arm64
+    BM_ROOTFS: /rootfs-arm64
    S3_ARTIFACT_NAME: mesa-arm64-default-debugoptimized
  needs:
    - debian/arm64_test
@@ -301,16 +260,13 @@ python-test:
  # like FDO_DISTRIBUTION_TAG for *the* image, there is no way to
  # depend on more than one image per job. So, the job container is
  # built as part of the CI in the boot2container project.
-  image: registry.freedesktop.org/gfx-ci/ci-tron/mesa-trigger:2024-01-05.1
+  image: registry.freedesktop.org/mupuf/valve-infra/mesa-trigger:2023-03-08.1
  timeout: 1h 40m
-  rules:
-    - if: $FORCE_KERNEL_TAG != null
-      when: never
  variables:
    # No need by default to pull the whole repo
    GIT_STRATEGY: none
    # boot2container initrd configuration parameters.
-    B2C_KERNEL_URL: 'https://gitlab.freedesktop.org/gfx-ci/ci-tron/-/package_files/519/download'  # Linux 6.1
+    B2C_KERNEL_URL: 'https://gitlab.freedesktop.org/mupuf/valve-infra/-/package_files/519/download'  # Linux 6.1
    B2C_INITRAMFS_URL: 'https://gitlab.freedesktop.org/mupuf/boot2container/-/releases/v0.9.10/downloads/initramfs.linux_amd64.cpio.xz'
    B2C_JOB_SUCCESS_REGEX: '\[.*\]: Execution is over, pipeline status: 0\r$'
    B2C_JOB_WARN_REGEX: '\*ERROR\* ring .* timeout'
@@ -325,7 +281,6 @@ python-test:
    B2C_TIMEOUT_MINUTES: 5
    B2C_TIMEOUT_OVERALL_MINUTES: 90
    B2C_TIMEOUT_RETRIES: 0
-    B2C_JOB_VOLUME_EXCLUSIONS: "*.shader_cache,install/*,*/install/*,*/vkd3d-proton.cache*,vkd3d-proton.cache*,*.qpa"

    # As noted in the top description, we make a distinction between the
    # container used by gitlab-runner to queue the work, and the container
@@ -345,7 +300,7 @@ python-test:
    - !reference [default, before_script]

    - |
-      set -eux
+      set -x

      # Useful as a hook point for runner admins. You may edit the
      # config.toml for the Gitlab runner and use a bind-mount to
@@ -366,17 +321,40 @@ python-test:
      [ -d "$CI_B2C_ARTIFACTS" ] || exit 1
      [ -d "$CI_COMMON_SCRIPTS" ] || exit 1

-      export B2C_CONTAINER_CMD="bash -euc 'tar xf ${INSTALL_TARBALL_NAME}; ./install/common/init-stage2.sh'"
+
+      B2C_TEST_SCRIPT="bash -c 'tar xf ${INSTALL_TARBALL_NAME}; ./install/common/init-stage2.sh'"

      # The Valve CI gateway receives jobs in a YAML format. Create a
      # job description from the CI environment.
-      python3 "$CI_B2C_ARTIFACTS"/generate_b2c.py
+      python3 "$CI_B2C_ARTIFACTS"/generate_b2c.py \
+        --ci-job-id "${CI_JOB_ID}" \
+        --container-cmd "${B2C_TEST_SCRIPT}" \
+        --initramfs-url "${B2C_INITRAMFS_URL}" \
+        --job-success-regex "${B2C_JOB_SUCCESS_REGEX}" \
+        --job-warn-regex "${B2C_JOB_WARN_REGEX}" \
+        --kernel-url "${B2C_KERNEL_URL}" \
+        --log-level "${B2C_LOG_LEVEL}" \
+        --poweroff-delay "${B2C_POWEROFF_DELAY}" \
+        --session-end-regex "${B2C_SESSION_END_REGEX}" \
+        --session-reboot-regex "${B2C_SESSION_REBOOT_REGEX}" \
+        --tags "${CI_RUNNER_TAGS}" \
+        --template "${B2C_JOB_TEMPLATE}" \
+        --timeout-boot-minutes "${B2C_TIMEOUT_BOOT_MINUTES}" \
+        --timeout-boot-retries "${B2C_TIMEOUT_BOOT_RETRIES}" \
+        --timeout-first-minutes "${B2C_TIMEOUT_FIRST_MINUTES}" \
+        --timeout-first-retries "${B2C_TIMEOUT_FIRST_RETRIES}" \
+        --timeout-minutes "${B2C_TIMEOUT_MINUTES}" \
+        --timeout-overall-minutes "${B2C_TIMEOUT_OVERALL_MINUTES}" \
+        --timeout-retries "${B2C_TIMEOUT_RETRIES}" \
+        --job-volume-exclusions "${B2C_JOB_VOLUME_EXCLUSIONS}" \
+        --local-container "${IMAGE_UNDER_TEST}" \
+        ${B2C_EXTRA_VOLUME_ARGS} \
+        --working-dir "$CI_PROJECT_DIR"

      cat b2c.yml.jinja2

      rm -rf ${JOB_FOLDER} || true
      mkdir -v ${JOB_FOLDER}
-
      # Create a script to regenerate the CI environment when this job
      # begins running on the remote DUT.
      set +x
@@ -384,6 +362,7 @@ python-test:
      echo "export SCRIPTS_DIR=./install" >> ${JOB_FOLDER}/set-job-env-vars.sh
      echo "Variables passed through:"
      cat ${JOB_FOLDER}/set-job-env-vars.sh
+      echo "export CI_JOB_JWT=${CI_JOB_JWT}" >> ${JOB_FOLDER}/set-job-env-vars.sh
      set -x

      # Copy the mesa install tarball to the job folder, for later extraction
@@ -399,23 +378,17 @@ python-test:
      env PYTHONUNBUFFERED=1 executorctl \
          run -w b2c.yml.jinja2 -j $(slugify "$CI_JOB_NAME") -s ${JOB_FOLDER} -i "$CI_RUNNER_DESCRIPTION"

-  # 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.
-  after_script:
-    # Keep the results path the same as baremetal and LAVA
-    - mkdir -p "${JOB_FOLDER}"/results
-    - mv "${JOB_FOLDER}"/results results/
-    - !reference [default, after_script]
-
+      # 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: "mesa_${CI_JOB_NAME}"
    paths:
-      - results
+      - ${JOB_FOLDER}/results
    reports:
-      junit: results/**/junit.xml
+      junit: ${JOB_FOLDER}/results/**/junit.xml

 .b2c-test-vk:
  extends:
--- a/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml
+++ b/.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml
@@ -1,142 +0,0 @@
-job_name: 'test-project: my_pipeline_info'
-device_type: my_fastboot_device_type
-visibility:
-  group:
-  - my_visibility_group
-priority: 75
-context:
-  extra_nfsroot_args: ' init=/init rootwait usbcore.quirks=0bda:8153:k'
-timeouts:
-  job:
-    minutes: 10
-  actions:
-    depthcharge-retry:
-      minutes: 4
-    depthcharge-start:
-      minutes: 1
-    depthcharge-action:
-      minutes: 15
-actions:
- deploy:
-    timeout:
-      minutes: 10
-    to: nfs
-    nfsrootfs:
-      url: None/lava-rootfs.tar.zst
-      compression: zstd
-    namespace: dut
- deploy:
-    timeout:
-      minutes: 5
-    to: downloads
-    os: oe
-    images:
-      kernel:
-        url: None/None
-      dtb:
-        url: None/my_dtb_filename.dtb
-    postprocess:
-      docker:
-        image: registry.gitlab.collabora.com/lava/health-check-docker
-        steps:
-        - cat Image.gz my_dtb_filename.dtb > Image.gz+dtb
-        - mkbootimg --kernel Image.gz+dtb --cmdline "root=/dev/nfs rw nfsroot=$NFS_SERVER_IP:$NFS_ROOTFS,tcp,hard
-          rootwait ip=dhcp init=/init" --pagesize 4096 --base 0x80000000 -o boot.img
-    namespace: dut
- deploy:
-    timeout:
-      minutes: 10
-    to: fastboot
-    docker:
-      image: registry.gitlab.collabora.com/lava/health-check-docker
-    images:
-      boot:
-        url: downloads://boot.img
-    namespace: dut
-    failure_retry: 3
- boot:
-    timeout:
-      minutes: 2
-    docker:
-      image: registry.gitlab.collabora.com/lava/health-check-docker
-    failure_retry: 3
-    method: fastboot
-    prompts:
-    - 'lava-shell:'
-    commands:
-    - set_active a
-    namespace: dut
-    auto_login:
-      login_commands:
-      - dropbear -R -B
-      - touch /dut_ready
-      login_prompt: 'ogin:'
-      username: ''
- test:
-    namespace: dut
-    definitions:
-    - from: inline
-      name: setup-ssh-server
-      path: inline-setup-ssh-server
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: dut-env-export
-        run:
-          steps:
-          - |-
-            echo test FASTBOOT
-          - export -p > /dut-env-vars.sh
- test:
-    namespace: container
-    timeout:
-      minutes: 10
-    failure_retry: 3
-    definitions:
-    - name: docker_ssh_client
-      from: inline
-      path: inline/docker_ssh_client.yaml
-      repository:
-        metadata:
-          name: mesa
-          description: Mesa test plan
-          format: Lava-Test Test Definition 1.0
-        run:
-          steps:
-          - |-
-            set -ex
-            timeout 1m bash << EOF
-            while [ -z "$(lava-target-ip)" ]; do
-                echo Waiting for DUT to join LAN;
-                sleep 1;
-            done
-            EOF
-
-            ping -c 5 -w 60 $(lava-target-ip)
-
-            lava_ssh_test_case() {
-                set -x
-                local test_case="${1}"
-                shift
-                lava-test-case "${test_case}" --shell \
-                    ssh ${SSH_PTY_ARGS:--T} \
-                    -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
-                    root@$(lava-target-ip) "${@}"
-            }
-          - lava_ssh_test_case 'wait_for_dut_login' << EOF
-          - while [ ! -e /dut_ready ]; do sleep 1; done;
-          - EOF
-          - |-
-            lava_ssh_test_case 'artifact_download' 'bash --' << EOF
-            source /dut-env-vars.sh
-            set -ex
-            curl -L --retry 4 -f --retry-all-errors --retry-delay 60 None | tar -xz -C /
-            mkdir -p /ci/project/dir
-            curl -L --retry 4 -f --retry-all-errors --retry-delay 60 None | tar --zstd -x -C /ci/project/dir
-            echo Could not find jwt file, disabling S3 requests...
-            sed -i '/S3_RESULTS_UPLOAD/d' /set-job-env-vars.sh
-            EOF
-          - export SSH_PTY_ARGS=-tt
-          - lava_ssh_test_case 'test-project_dut' '"cd / && /init-stage2.sh"'
-    docker:
-      image:
--- a/.gitlab-ci/tests/data/FASTBOOT_force_uart=True_job_definition.yaml
+++ b/.gitlab-ci/tests/data/FASTBOOT_force_uart=True_job_definition.yaml
@@ -1,96 +0,0 @@
-job_name: 'test-project: my_pipeline_info'
-device_type: my_fastboot_device_type
-visibility:
-  group:
-  - my_visibility_group
-priority: 75
-context:
-  extra_nfsroot_args: ' init=/init rootwait usbcore.quirks=0bda:8153:k'
-timeouts:
-  job:
-    minutes: 10
-  actions:
-    depthcharge-retry:
-      minutes: 4
-    depthcharge-start:
-      minutes: 1
-    depthcharge-action:
-      minutes: 15
-actions:
- deploy:
-    timeout:
-      minutes: 10
-    to: nfs
-    nfsrootfs:
-      url: None/lava-rootfs.tar.zst
-      compression: zstd
- deploy:
-    timeout:
-      minutes: 5
-    to: downloads
-    os: oe
-    images:
-      kernel:
-        url: None/None
-      dtb:
-        url: None/my_dtb_filename.dtb
-    postprocess:
-      docker:
-        image: registry.gitlab.collabora.com/lava/health-check-docker
-        steps:
-        - cat Image.gz my_dtb_filename.dtb > Image.gz+dtb
-        - mkbootimg --kernel Image.gz+dtb --cmdline "root=/dev/nfs rw nfsroot=$NFS_SERVER_IP:$NFS_ROOTFS,tcp,hard
-          rootwait ip=dhcp init=/init" --pagesize 4096 --base 0x80000000 -o boot.img
- deploy:
-    timeout:
-      minutes: 2
-    to: fastboot
-    docker:
-      image: registry.gitlab.collabora.com/lava/health-check-docker
-    images:
-      boot:
-        url: downloads://boot.img
- boot:
-    timeout:
-      minutes: 2
-    docker:
-      image: registry.gitlab.collabora.com/lava/health-check-docker
-    failure_retry: 3
-    method: fastboot
-    prompts:
-    - 'lava-shell:'
-    commands:
-    - set_active a
- test:
-    timeout:
-      minutes: 10
-    failure_retry: 1
-    definitions:
-    - name: mesa
-      from: inline
-      lava-signal: kmsg
-      path: inline/mesa.yaml
-      repository:
-        metadata:
-          name: mesa
-          description: Mesa test plan
-          os:
-          - oe
-          scope:
-          - functional
-          format: Lava-Test Test Definition 1.0
-        run:
-          steps:
-          - echo test FASTBOOT
-          - set -ex
-          - curl -L --retry 4 -f --retry-all-errors --retry-delay 60 None | tar -xz
-            -C /
-          - mkdir -p /ci/project/dir
-          - curl -L --retry 4 -f --retry-all-errors --retry-delay 60 None | tar --zstd
-            -x -C /ci/project/dir
-          - echo Could not find jwt file, disabling S3 requests...
-          - sed -i '/S3_RESULTS_UPLOAD/d' /set-job-env-vars.sh
-          - mkdir -p /ci/project/dir
-          - curl None | tar --zstd -x -C /ci/project/dir
-          - sleep 1
-          - lava-test-case 'test-project_dut' --shell /init-stage2.sh
--- a/.gitlab-ci/tests/data/UBOOT_force_uart=False_job_definition.yaml
+++ b/.gitlab-ci/tests/data/UBOOT_force_uart=False_job_definition.yaml
@@ -1,114 +0,0 @@
-job_name: 'test-project: my_pipeline_info'
-device_type: my_uboot_device_type
-visibility:
-  group:
-  - my_visibility_group
-priority: 75
-context:
-  extra_nfsroot_args: ' init=/init rootwait usbcore.quirks=0bda:8153:k'
-timeouts:
-  job:
-    minutes: 10
-  actions:
-    depthcharge-retry:
-      minutes: 4
-    depthcharge-start:
-      minutes: 1
-    depthcharge-action:
-      minutes: 15
-actions:
- deploy:
-    timeout:
-      minutes: 10
-    to: tftp
-    os: oe
-    kernel:
-      url: None/None
-    nfsrootfs:
-      url: None/lava-rootfs.tar.zst
-      compression: zstd
-    dtb:
-      url: None/my_dtb_filename.dtb
-    namespace: dut
-    failure_retry: 3
- boot:
-    failure_retry: 3
-    method: u-boot
-    prompts:
-    - 'lava-shell:'
-    commands: nfs
-    namespace: dut
-    auto_login:
-      login_commands:
-      - dropbear -R -B
-      - touch /dut_ready
-      login_prompt: 'ogin:'
-      username: ''
- test:
-    namespace: dut
-    definitions:
-    - from: inline
-      name: setup-ssh-server
-      path: inline-setup-ssh-server
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: dut-env-export
-        run:
-          steps:
-          - |-
-            echo test UBOOT
-          - export -p > /dut-env-vars.sh
- test:
-    namespace: container
-    timeout:
-      minutes: 10
-    failure_retry: 3
-    definitions:
-    - name: docker_ssh_client
-      from: inline
-      path: inline/docker_ssh_client.yaml
-      repository:
-        metadata:
-          name: mesa
-          description: Mesa test plan
-          format: Lava-Test Test Definition 1.0
-        run:
-          steps:
-          - |-
-            set -ex
-            timeout 1m bash << EOF
-            while [ -z "$(lava-target-ip)" ]; do
-                echo Waiting for DUT to join LAN;
-                sleep 1;
-            done
-            EOF
-
-            ping -c 5 -w 60 $(lava-target-ip)
-
-            lava_ssh_test_case() {
-                set -x
-                local test_case="${1}"
-                shift
-                lava-test-case "${test_case}" --shell \
-                    ssh ${SSH_PTY_ARGS:--T} \
-                    -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
-                    root@$(lava-target-ip) "${@}"
-            }
-          - lava_ssh_test_case 'wait_for_dut_login' << EOF
-          - while [ ! -e /dut_ready ]; do sleep 1; done;
-          - EOF
-          - |-
-            lava_ssh_test_case 'artifact_download' 'bash --' << EOF
-            source /dut-env-vars.sh
-            set -ex
-            curl -L --retry 4 -f --retry-all-errors --retry-delay 60 None | tar -xz -C /
-            mkdir -p /ci/project/dir
-            curl -L --retry 4 -f --retry-all-errors --retry-delay 60 None | tar --zstd -x -C /ci/project/dir
-            echo Could not find jwt file, disabling S3 requests...
-            sed -i '/S3_RESULTS_UPLOAD/d' /set-job-env-vars.sh
-            EOF
-          - export SSH_PTY_ARGS=-tt
-          - lava_ssh_test_case 'test-project_dut' '"cd / && /init-stage2.sh"'
-    docker:
-      image:
--- a/.gitlab-ci/tests/data/UBOOT_force_uart=True_job_definition.yaml
+++ b/.gitlab-ci/tests/data/UBOOT_force_uart=True_job_definition.yaml
@@ -1,70 +0,0 @@
-job_name: 'test-project: my_pipeline_info'
-device_type: my_uboot_device_type
-visibility:
-  group:
-  - my_visibility_group
-priority: 75
-context:
-  extra_nfsroot_args: ' init=/init rootwait usbcore.quirks=0bda:8153:k'
-timeouts:
-  job:
-    minutes: 10
-  actions:
-    depthcharge-retry:
-      minutes: 4
-    depthcharge-start:
-      minutes: 1
-    depthcharge-action:
-      minutes: 15
-actions:
- deploy:
-    timeout:
-      minutes: 5
-    to: tftp
-    os: oe
-    kernel:
-      url: None/None
-    nfsrootfs:
-      url: None/lava-rootfs.tar.zst
-      compression: zstd
-    dtb:
-      url: None/my_dtb_filename.dtb
- boot:
-    failure_retry: 3
-    method: u-boot
-    prompts:
-    - 'lava-shell:'
-    commands: nfs
- test:
-    timeout:
-      minutes: 10
-    failure_retry: 1
-    definitions:
-    - name: mesa
-      from: inline
-      lava-signal: kmsg
-      path: inline/mesa.yaml
-      repository:
-        metadata:
-          name: mesa
-          description: Mesa test plan
-          os:
-          - oe
-          scope:
-          - functional
-          format: Lava-Test Test Definition 1.0
-        run:
-          steps:
-          - echo test UBOOT
-          - set -ex
-          - curl -L --retry 4 -f --retry-all-errors --retry-delay 60 None | tar -xz
-            -C /
-          - mkdir -p /ci/project/dir
-          - curl -L --retry 4 -f --retry-all-errors --retry-delay 60 None | tar --zstd
-            -x -C /ci/project/dir
-          - echo Could not find jwt file, disabling S3 requests...
-          - sed -i '/S3_RESULTS_UPLOAD/d' /set-job-env-vars.sh
-          - mkdir -p /ci/project/dir
-          - curl None | tar --zstd -x -C /ci/project/dir
-          - sleep 1
-          - lava-test-case 'test-project_dut' --shell /init-stage2.sh
--- a/.gitlab-ci/tests/utils/test_lava_job_definition.py
+++ b/.gitlab-ci/tests/utils/test_lava_job_definition.py
@@ -1,197 +0,0 @@
-import importlib
-import os
-import re
-from itertools import chain
-from pathlib import Path
-from typing import Any, Iterable, Literal
-from unittest import mock
-
-import lava.utils.constants
-import pytest
-from lava.lava_job_submitter import LAVAJobSubmitter
-from lava.utils.lava_job_definition import LAVAJobDefinition
-from ruamel.yaml import YAML
-
-
-def flatten(iterable: Iterable[Iterable[Any]]) -> list[Any]:
-    return list(chain.from_iterable(iterable))
-
-
-# mock shell file
-@pytest.fixture(scope="session")
-def shell_file(tmp_path_factory):
-    def create_shell_file(content: str = "# test"):
-        shell_file = tmp_path_factory.mktemp("data") / "shell_file.sh"
-        shell_file.write_text(content)
-        return shell_file
-
-    return create_shell_file
-
-
-# fn to load the data file from $CWD/data using pathlib
-def load_data_file(filename):
-    return Path(__file__).parent.parent / "data" / filename
-
-
-def load_yaml_file(filename) -> dict:
-    with open(load_data_file(filename)) as f:
-        return YAML().load(f)
-
-
-def job_submitter_factory(mode: Literal["UBOOT", "FASTBOOT"], shell_file):
-    if mode == "UBOOT":
-        boot_method = "u-boot"
-        device_type = "my_uboot_device_type"
-    elif mode == "FASTBOOT":
-        boot_method = "fastboot"
-        device_type = "my_fastboot_device_type"
-
-    job_timeout_min = 10
-    mesa_job_name = "dut test"
-    pipeline_info = "my_pipeline_info"
-    project_name = "test-project"
-    visibility_group = "my_visibility_group"
-
-    return LAVAJobSubmitter(
-        boot_method=boot_method,
-        ci_project_dir="/ci/project/dir",
-        device_type=device_type,
-        dtb_filename="my_dtb_filename",
-        first_stage_init=shell_file,
-        job_timeout_min=job_timeout_min,
-        mesa_job_name=mesa_job_name,
-        pipeline_info=pipeline_info,
-        visibility_group=visibility_group,
-        project_name=project_name,
-    )
-
-
-@pytest.fixture
-def clear_env_vars(autouse=True):
-    with mock.patch.dict(os.environ) as environ:
-        # Remove all LAVA-related environment variables to make the test more robust
-        # and deterministic, once a envvar is capable of overriding the default value
-        for key in environ:
-            if any(kw in key for kw in ("LAVA_", "CI_", "JOB_", "RUNNER_", "DEVICE_")):
-                del environ[key]
-        # reload lava.utils.constants to update the JOB_PRIORITY value
-        importlib.reload(lava.utils.constants)
-        importlib.reload(lava.utils.lava_job_definition)
-        yield
-
-
-@pytest.fixture
-def mock_collabora_farm(clear_env_vars, monkeypatch):
-    # Mock a Collabora farm-like device runner tag to enable SSH execution
-    monkeypatch.setenv("RUNNER_TAG", "mesa-ci-1234-lava-collabora")
-
-
-@pytest.mark.parametrize("force_uart", [True, False], ids=["SSH", "UART"])
-@pytest.mark.parametrize("mode", ["UBOOT", "FASTBOOT"])
-def test_generate_lava_job_definition_sanity(
-    force_uart, mode, shell_file, mock_collabora_farm, monkeypatch
-):
-    monkeypatch.setattr(lava.utils.lava_job_definition, "FORCE_UART", force_uart)
-
-    init_script_content = f"echo test {mode}"
-    job_submitter = job_submitter_factory(mode, shell_file(init_script_content))
-    job_definition = LAVAJobDefinition(job_submitter).generate_lava_job_definition()
-
-    # Load the YAML output and check that it contains the expected keys and values
-    yaml = YAML()
-    job_dict = yaml.load(job_definition)
-    yaml.dump(job_dict, Path(f"/tmp/{mode}_force_uart={force_uart}_job_definition.yaml"))
-    assert job_dict["device_type"] == job_submitter.device_type
-    assert job_dict["visibility"]["group"] == [job_submitter.visibility_group]
-    assert job_dict["timeouts"]["job"]["minutes"] == job_submitter.job_timeout_min
-    assert job_dict["context"]["extra_nfsroot_args"]
-    assert job_dict["timeouts"]["actions"]
-
-    assert len(job_dict["actions"]) == 3 if mode == "UART" else 5
-
-    last_test_action = job_dict["actions"][-1]["test"]
-    # TODO: Remove hardcoded "mesa" test name, as this submitter is being used by other projects
-    first_test_name = last_test_action["definitions"][0]["name"]
-    is_running_ssh = "ssh" in first_test_name
-    # if force_uart, is_ssh must be False. If is_ssh, force_uart must be False. Both can be False
-    assert not (is_running_ssh and force_uart)
-    assert last_test_action["failure_retry"] == 3 if is_running_ssh else 1
-
-    run_steps = "".join(last_test_action["definitions"][0]["repository"]["run"]["steps"])
-    # Check for project name in lava-test-case
-    assert re.search(rf"lava.?\S*.test.case.*{job_submitter.project_name}", run_steps)
-
-    action_names = flatten(j.keys() for j in job_dict["actions"])
-    if is_running_ssh:
-        assert action_names == (
-            [
-                "deploy",
-                "boot",
-                "test",  # DUT: SSH server
-                "test",  # Docker: SSH client
-            ]
-            if mode == "UBOOT"
-            else [
-                "deploy",  # NFS
-                "deploy",  # Image generation
-                "deploy",  # Image deployment
-                "boot",
-                "test",  # DUT: SSH server
-                "test",  # Docker: SSH client
-            ]
-        )
-        test_action_server = job_dict["actions"][-2]["test"]
-        # SSH server in the DUT
-        assert test_action_server["namespace"] == "dut"
-        # SSH client via docker
-        assert last_test_action["namespace"] == "container"
-
-        boot_action = next(a["boot"] for a in job_dict["actions"] if "boot" in a)
-        assert boot_action["namespace"] == "dut"
-
-        # SSH server bootstrapping
-        assert "dropbear" in "".join(boot_action["auto_login"]["login_commands"])
-        return
-
-    # ---- Not SSH job
-    assert action_names == (
-        [
-            "deploy",
-            "boot",
-            "test",
-        ]
-        if mode == "UBOOT"
-        else [
-            "deploy",  # NFS
-            "deploy",  # Image generation
-            "deploy",  # Image deployment
-            "boot",
-            "test",
-        ]
-    )
-    assert init_script_content in run_steps
-
-
-# use yaml files from tests/data/ to test the job definition generation
-@pytest.mark.parametrize("force_uart", [False, True], ids=["SSH", "UART"])
-@pytest.mark.parametrize("mode", ["UBOOT", "FASTBOOT"])
-def test_lava_job_definition(mode, force_uart, shell_file, mock_collabora_farm, monkeypatch):
-    monkeypatch.setattr(lava.utils.lava_job_definition, "FORCE_UART", force_uart)
-
-    yaml = YAML()
-    yaml.default_flow_style = False
-
-    # Load the YAML output and check that it contains the expected keys and values
-    expected_job_dict = load_yaml_file(f"{mode}_force_uart={force_uart}_job_definition.yaml")
-
-    init_script_content = f"echo test {mode}"
-    job_submitter = job_submitter_factory(mode, shell_file(init_script_content))
-    job_definition = LAVAJobDefinition(job_submitter).generate_lava_job_definition()
-
-    job_dict = yaml.load(job_definition)
-
-    # Uncomment the following to update the expected YAML files
-    # yaml.dump(job_dict, Path(f"../../data/{mode}_force_uart={force_uart}_job_definition.yaml"))
-
-    # Check that the generated job definition matches the expected one
-    assert job_dict == expected_job_dict
--- a/.gitlab-ci/valve/gl_combined_testing.sh
+++ b/.gitlab-ci/valve/gl_combined_testing.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -eu
+
+function execute_testsuite {
+    local RESULTS_FOLDER EXEC_DONE_FILE
+
+    RESULTS_FOLDER="results/$1"
+    EXEC_DONE_FILE="$RESULTS_FOLDER/.done"
+
+    if [ ! -f "$EXEC_DONE_FILE" ]; then
+        DEQP_RESULTS_DIR="$RESULTS_FOLDER" PIGLIT_RESULTS_DIR="$RESULTS_FOLDER" $2
+        touch "$EXEC_DONE_FILE"
+    else
+        echo "--> Skipped, as it already was executed"
+    fi
+}
+
+echo -e "\n# GL CTS testing"
+DEQP_VER=gl46 execute_testsuite gl ./install/deqp-runner.sh
+
+echo -e "\n# GLES CTS testing"
+DEQP_SUITE=zink-radv execute_testsuite gles ./install/deqp-runner.sh
+
+echo -e "\n# Piglit testing"
+execute_testsuite piglit ./install/piglit/piglit-runner.sh
--- a/.gitlab-ci/vkd3d-proton/run.sh
+++ b/.gitlab-ci/vkd3d-proton/run.sh
@@ -55,11 +55,7 @@ quiet printf "%s\n" "Running vkd3d-proton testsuite..."
 set +e
 if ! /vkd3d-proton-tests/x64/bin/d3d12 > "$RESULTS/vkd3d-proton.log";
 then
-    # Check if the executable finished (ie. no segfault).
-    if ! grep "tests executed" "$RESULTS/vkd3d-proton.log" > /dev/null; then
-        error printf "%s\n" "Failed, see vkd3d-proton.log!"
-        exit 1
-    fi
+    error printf "%s\n" "Failed, see vkd3d-proton.log!"

    # Collect all the failures
    VKD3D_PROTON_RESULTS="${VKD3D_PROTON_RESULTS:-vkd3d-proton-results}"
@@ -79,8 +75,9 @@ then
    if ! diff -q ".gitlab-ci/vkd3d-proton/$VKD3D_PROTON_RESULTS.txt.baseline" "$RESULTSFILE"; then
        error printf "%s\n" "Changes found, see vkd3d-proton.log!"
        quiet diff --color=always -u ".gitlab-ci/vkd3d-proton/$VKD3D_PROTON_RESULTS.txt.baseline" "$RESULTSFILE"
-        exit 1
    fi
+
+    exit 1
 fi

 printf "%s\n" "vkd3d-proton execution: SUCCESS"
--- a/.gitlab-ci/windows/Dockerfile_build
+++ b/.gitlab-ci/windows/Dockerfile_build
@@ -3,10 +3,6 @@
 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_build.ps1 C:\
 RUN C:\mesa_deps_build.ps1

--- a/.gitlab-ci/windows/Dockerfile_test
+++ b/.gitlab-ci/windows/Dockerfile_test
@@ -3,20 +3,5 @@
 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_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
--- a/.gitlab-ci/windows/Dockerfile_msvc
+++ b/.gitlab-ci/windows/Dockerfile_msvc
@@ -12,9 +12,11 @@ RUN powershell -ExecutionPolicy RemoteSigned -Command "$ErrorActionPreference =
 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_vs2019.ps1 C:\
+RUN C:\mesa_deps_vs2019.ps1
+COPY mesa_vs_init.ps1 C:\

+ENV VULKAN_SDK_VERSION='1.3.211.0'
 COPY mesa_deps_choco.ps1 C:\
 RUN C:\mesa_deps_choco.ps1

@@ -23,5 +25,5 @@ RUN C:\mesa_deps_choco.ps1
 # 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_vs --build-arg base_image="mcr.microsoft.com/windows:10.0.19041.1415" .
+# docker build --isolation=hyperv -f .\Dockerfile_vs -t mesa_vs --build-arg base_image="mcr.microsoft.com/windows:10.0.19041.1415" .

--- a/.gitlab-ci/windows/deqp_runner_run.ps1
+++ b/.gitlab-ci/windows/deqp_runner_run.ps1
@@ -27,7 +27,7 @@ deqp-runner suite --suite $($suite) `
 $jobs
 $deqpstatus = $?

-$template = "See $($env:ARTIFACTS_BASE_URL)/results/{{testcase}}.xml"
+$template = "See https://$($env:CI_PROJECT_ROOT_NAMESPACE).pages.freedesktop.org/-/$($env:CI_PROJECT_NAME)/-/jobs/$($env:CI_JOB_ID)/artifacts/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)
--- a/.gitlab-ci/windows/mesa_build.ps1
+++ b/.gitlab-ci/windows/mesa_build.ps1
@@ -30,7 +30,7 @@ Write-Output installdir:$installdir
 Write-Output sourcedir:$sourcedir

 $MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent
-. "$MyPath\mesa_init_msvc.ps1"
+. "$MyPath\mesa_vs_init.ps1"

 $depsInstallPath="C:\mesa-deps"

@@ -50,7 +50,7 @@ meson setup `
 -Dvulkan-drivers="swrast,amd,microsoft-experimental" `
 -Dgallium-drivers="swrast,d3d12,zink" `
 -Dgallium-va=enabled `
-Dvideo-codecs="all" `
+-Dvideo-codecs="h264dec,h264enc,h265dec,h265enc,vc1dec" `
 -Dshared-glapi=enabled `
 -Dgles1=enabled `
 -Dgles2=enabled `
--- a/.gitlab-ci/windows/mesa_deps_build.ps1
+++ b/.gitlab-ci/windows/mesa_deps_build.ps1
@@ -1,6 +1,6 @@

 $MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent
-. "$MyPath\mesa_init_msvc.ps1"
+. "$MyPath\mesa_vs_init.ps1"

 # we want more secure TLS 1.2 for most things, but it breaks SourceForge
 # downloads so must be done after Chocolatey use
@@ -12,7 +12,7 @@ $depsInstallPath="C:\mesa-deps"

 Get-Date
 Write-Host "Cloning DirectX-Headers"
-git clone -b v1.611.0 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
+git clone -b v1.711.3-preview --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
 if (!$?) {
  Write-Host "Failed to clone DirectX-Headers repository"
  Exit 1
--- a/Show More
+++ b/Show More