radeonsi: implement user_data_amd for 5, 6, and 7 components correctly

NIR can't handle those component counts, so we have to split it into 2
SGPR vectors where each has max 4 components.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28725>

.clang-format-include

@@ -1,9 +1,9 @@
 # The following files are opted into `ninja clang-format` and
 # enforcement in the CI.
 
-src/**/asahi/**/*
-src/**/panfrost/**/*
 src/gallium/drivers/i915
+src/gallium/targets/teflon/**/*
 src/amd/vulkan/**/*
 src/amd/compiler/**/*
 src/egl/**/*
+src/etnaviv/isa/**/*

.gitattributes

@@ -4,3 +4,4 @@
 *.png binary
 *.gif binary
 *.ico binary
+*.cl gitlab-language=c

.gitignore

@@ -3,3 +3,4 @@
 *.pyo
 *.out
 /build
+.venv/

.gitlab-ci.yml

@@ -1,24 +1,67 @@
+# 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: $GITLAB_USER_LOGIN == "marge-bot" && $CI_COMMIT_BRANCH == null
+    - if: &is-merge-attempt $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"
       variables:
+        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
         MESA_CI_PERFORMANCE_ENABLED: 1
         VALVE_INFRA_VANGOGH_JOB_PRIORITY: ""  # Empty tags are ignored by gitlab
     # post-merge pipeline
-    - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_COMMIT_BRANCH
+    - if: &is-post-merge $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "push"
-      variables:
+    # nightly pipeline
-        JOB_PRIORITY: 40
+    - if: &is-scheduled-pipeline $CI_PIPELINE_SOURCE == "schedule"
-        VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
-    # any other pipeline
-    - if: $GITLAB_USER_LOGIN != "marge-bot"
       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
+    # 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"
+      variables:
+        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
+        JOB_PRIORITY: 40
+        VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
+    # pre-merge or fork pipeline
+    - if: $FORCE_KERNEL_TAG != null
+      variables:
+        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${FORCE_KERNEL_TAG}
+        JOB_PRIORITY: 50
+        VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
+    - if: $FORCE_KERNEL_TAG == null
+      variables:
+        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
+        JOB_PRIORITY: 50
+        VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
+
 
 variables:
   FDO_UPSTREAM_REPO: mesa/mesa
@@ -35,13 +78,19 @@ variables:
   PIPELINE_ARTIFACTS_BASE: ${S3_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
   # per-job artifact storage on MinIO
   JOB_ARTIFACTS_BASE: ${PIPELINE_ARTIFACTS_BASE}/${CI_JOB_ID}
-  KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/gfx-ci/linux/${KERNEL_TAG}
   # reference images stored for traces
   PIGLIT_REPLAY_REFERENCE_IMAGES_BASE: "${S3_HOST}/mesa-tracie-results/$FDO_UPSTREAM_REPO"
   # For individual CI farm status see .ci-farms folder
   # Disable farm with   `git mv .ci-farms{,-disabled}/$farm_name`
   # Re-enable farm with `git mv .ci-farms{-disabled,}/$farm_name`
   # NEVER MIX FARM MAINTENANCE WITH ANY OTHER CHANGE IN THE SAME MERGE REQUEST!
+  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"
+  # Drop once deqp-runner is upgraded to > 0.18.0
+  MESA_VK_ABORT_ON_DEVICE_LOSS: 1
+  # Avoid the wall of "Unsupported SPIR-V capability" warnings in CI job log, hiding away useful output
+  MESA_SPIRV_LOG_LEVEL: error
 
 default:
   before_script:
@@ -84,7 +133,7 @@ stages:
   - git-archive
   - build-x86_64
   - build-misc
-  - lint
+  - code-validation
   - amd
   - intel
   - nouveau
@@ -115,51 +164,31 @@ include:
   - local: '.gitlab-ci/farm-rules.yml'
   - local: '.gitlab-ci/test-source-dep.yml'
   - local: 'docs/gitlab-ci.yml'
-  - local: 'src/amd/ci/gitlab-ci.yml'
+  - local: 'src/**/ci/gitlab-ci.yml'
-  - local: 'src/broadcom/ci/gitlab-ci.yml'
-  - local: 'src/etnaviv/ci/gitlab-ci.yml'
-  - local: 'src/freedreno/ci/gitlab-ci.yml'
-  - 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/lima/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/nouveau/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/softpipe/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/virgl/ci/gitlab-ci.yml'
-  - local: 'src/gallium/drivers/zink/ci/gitlab-ci.yml'
-  - local: 'src/gallium/frontends/lavapipe/ci/gitlab-ci.yml'
-  - local: 'src/intel/ci/gitlab-ci.yml'
-  - local: 'src/microsoft/ci/gitlab-ci.yml'
-  - local: 'src/panfrost/ci/gitlab-ci.yml'
-  - local: 'src/virtio/ci/gitlab-ci.yml'
 
 
 # YAML anchors for rule conditions
 # --------------------------------
 .rules-anchors:
-  rules:
-    # 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"'
+  - &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"'
+.never-post-merge-rules:
-      when: on_success
+  rules:
+    - if: *is-post-merge
+      when: never
 
 
 .container+build-rules:
   rules:
     # Run when re-enabling a disabled farm, but not when disabling it
     - !reference [.disable-farm-mr-rules, rules]
-    # Run pipeline by default in the main project if any CI pipeline
+    # Never run immediately after merging, as we just ran everything
-    # configuration files were changed, to ensure docker images are up to date
+    - !reference [.never-post-merge-rules, rules]
-    - if: *is-post-merge
+    # 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
@@ -168,33 +197,38 @@ include:
         # GitLab CI
         - .gitlab-ci.yml
         - .gitlab-ci/**/*
+        - .ci-farms/*
         # Meson
         - meson*
         - build-support/**/*
         - subprojects/**/*
+        # clang format
+        - .clang-format
+        - .clang-format-include
+        - .clang-format-ignore
         # Source code
         - include/**/*
         - src/**/*
       when: on_success
-    # Run pipeline by default if it was triggered by Marge Bot, is for a
+    # Same as above, but for pre-merge pipelines
-    # merge request, and any files affecting the pipeline were changed
+    - if: *is-pre-merge
-    - if: *is-pre-merge-for-marge
       changes:
         *all_paths
-      when: on_success
+      when: manual
-    # Run pipeline by default in the main project if it was not triggered by
+    # Skip everything for pre-merge and merge pipelines which don't change
-    # Marge Bot, and any files affecting the pipeline were changed
+    # anything in the build
-    - if: *is-post-merge-not-for-marge
+    - if: *is-merge-attempt
-      changes:
-        *all_paths
-      when: on_success
-    # Just skip everything for MRs which don't actually change anything in the
-    # build - the same rules as above, but without the file-change rules
-    - if: *is-pre-merge-for-marge
       when: never
-    - if: *is-post-merge
+    - if: *is-pre-merge
       when: never
-    # Always allow user branches etc to trigger jobs manually
+    # 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
 
 
@@ -240,18 +274,62 @@ sanity:
   rules:
     - if: *is-pre-merge
       when: on_success
-    # Other cases default to never
+    - when: never
   variables:
     GIT_STRATEGY: none
   script:
     # ci-fairy check-commits --junit-xml=check-commits.xml
     - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=check-merge-request.xml
+    - |
+      set -eu
+      image_tags=(
+        DEBIAN_BASE_TAG
+        DEBIAN_BUILD_TAG
+        DEBIAN_X86_64_TEST_ANDROID_TAG
+        DEBIAN_X86_64_TEST_GL_TAG
+        DEBIAN_X86_64_TEST_VK_TAG
+        ALPINE_X86_64_BUILD_TAG
+        ALPINE_X86_64_LAVA_SSH_TAG
+        FEDORA_X86_64_BUILD_TAG
+        KERNEL_ROOTFS_TAG
+        KERNEL_TAG
+        PKG_REPO_REV
+        WINDOWS_X64_MSVC_TAG
+        WINDOWS_X64_BUILD_TAG
+        WINDOWS_X64_TEST_TAG
+      )
+      for var in "${image_tags[@]}"
+      do
+        if [ "$(echo -n "${!var}" | wc -c)" -gt 20 ]
+        then
+          echo "$var is too long; please make sure it is at most 20 chars."
+          exit 1
+        fi
+      done
   artifacts:
     when: on_failure
     reports:
       junit: check-*.xml
+  tags:
+    - placeholder-job
 
 
+mr-label-maker-test:
+  extends:
+    - .fdo.ci-fairy
+  stage: sanity
+  rules:
+    - !reference [.mr-label-maker-rules, rules]
+  variables:
+    GIT_STRATEGY: fetch
+  timeout: 10m
+  script:
+    - set -eu
+    - python3 -m venv .venv
+    - source .venv/bin/activate
+    - pip install git+https://gitlab.freedesktop.org/freedesktop/mr-label-maker
+    - mr-label-maker --dry-run --mr $CI_MERGE_REQUEST_IID
+
 # Jobs that need to pass before spending hardware resources on further testing
 .required-for-hardware-jobs:
   needs:

.gitlab-ci/all-skips.txt

@@ -9,6 +9,9 @@
 # submission, so skip it in the regular CI.
 dEQP-VK.api.driver_properties.conformance_version
 
+# Exclude this test which might fail when a new extension is implemented.
+dEQP-VK.info.device_extensions
+
 # These are tremendously slow (pushing toward a minute), and aren't
 # reliable to be run in parallel with other tests due to CPU-side timing.
 dEQP-GLES[0-9]*.functional.flush_finish.*
@@ -36,3 +39,44 @@ 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

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

@@ -2,12 +2,7 @@ version: 1
 
 # Rules to match for a machine to qualify
 target:
-{% if tags %}
+  id: '{{ ci_runner_id }}'
-  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
@@ -59,10 +54,14 @@ 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 cmdline_extras is defined %}
+        {% if kernel_cmdline_extras is defined %}
-        {{ cmdline_extras }}
+        {{ kernel_cmdline_extras }}
         {% endif %}
 
     initramfs:
       url: '{{ initramfs_url }}'
 
+{% if dtb_url is defined %}
+    dtb:
+      url: '{{ dtb_url }}'
+{% endif %}

.gitlab-ci/b2c/generate_b2c.py

@@ -22,86 +22,34 @@
 # IN THE SOFTWARE.
 
 from jinja2 import Environment, FileSystemLoader
-from argparse import ArgumentParser
 from os import environ, path
-import json
 
 
-parser = ArgumentParser()
+# Pass all the environment variables prefixed by B2C_
-parser.add_argument('--ci-job-id')
+values = {
-parser.add_argument('--container-cmd')
+    key.removeprefix("B2C_").lower(): environ[key]
-parser.add_argument('--initramfs-url')
+    for key in environ if key.startswith("B2C_")
-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(args.template)),
+env = Environment(loader=FileSystemLoader(path.dirname(values['job_template'])),
                   trim_blocks=True, lstrip_blocks=True)
 
-template = env.get_template(path.basename(args.template))
+template = env.get_template(path.basename(values['job_template']))
 
-values = {}
+values['ci_job_id'] = environ['CI_JOB_ID']
-values['ci_job_id'] = args.ci_job_id
+values['ci_runner_id'] = environ['CI_RUNNER_ID']
-values['container_cmd'] = args.container_cmd
+values['job_volume_exclusions'] = [excl for excl in values['job_volume_exclusions'].split(",") if excl]
-values['initramfs_url'] = args.initramfs_url
+values['working_dir'] = environ['CI_PROJECT_DIR']
-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'] = args.local_container
+values['local_container'] = environ['IMAGE_UNDER_TEST']
-for url, replacement in [('registry.freedesktop.org', '{{ fdo_proxy_registry }}'),
+values['local_container'] = values['local_container'].replace(
-                         ('harbor.freedesktop.org', '{{ harbor_fdo_registry }}')]:
+    'registry.freedesktop.org',
-    values['local_container'] = values['local_container'].replace(url, replacement)
+    '{{ fdo_proxy_registry }}'
+)
 
-if 'B2C_KERNEL_CMDLINE_EXTRAS' in environ:
+if 'kernel_cmdline_extras' not in values:
-    values['cmdline_extras'] = environ['B2C_KERNEL_CMDLINE_EXTRAS']
+    values['kernel_cmdline_extras'] = ''
 
-f = open(path.splitext(path.basename(args.template))[0], "w")
+with open(path.splitext(path.basename(values['job_template']))[0], "w") as f:
-f.write(template.render(values))
+    f.write(template.render(values))
-f.close()

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

@@ -9,6 +9,7 @@
 # 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
@@ -85,21 +86,39 @@ rm -rf /tftp/*
 if echo "$BM_KERNEL" | grep -q http; then
   curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
       $BM_KERNEL -o /tftp/vmlinuz
+elif [ -n "${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
 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

.gitlab-ci/bare-metal/cros_servo_run.py

@@ -7,11 +7,12 @@ import argparse
 import re
 import sys
 
+from custom_logger import CustomLogger
 from serial_buffer import SerialBuffer
 
 
 class CrosServoRun:
-    def __init__(self, cpu, ec, test_timeout):
+    def __init__(self, cpu, ec, test_timeout, logger):
         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
@@ -19,6 +20,7 @@ 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()
@@ -36,6 +38,7 @@ 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.
@@ -43,6 +46,7 @@ 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
@@ -79,9 +83,10 @@ class CrosServoRun:
                 return 1
 
         if not bootloader_done:
-            print("Failed to make it through bootloader, abandoning run.")
+            self.print_error("Failed to make it through bootloader, abandoning run.")
             return 1
 
+        self.logger.create_job_phase("test")
         for line in self.cpu_ser.lines(timeout=self.test_timeout, phase="test"):
             if re.search("---. end Kernel panic", line):
                 return 1
@@ -125,8 +130,10 @@ class CrosServoRun:
             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(
@@ -144,11 +151,14 @@ def main():
         '--test-timeout', type=int, help='Test phase timeout (minutes)', required=True)
     args = parser.parse_args()
 
-    servo = CrosServoRun(args.cpu, args.ec, args.test_timeout * 60)
+    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()
 
     # power down the CPU on the device
     servo.ec_write("power off\n")
+    logger.update_dut_time("end", None)
     servo.close()
 
     sys.exit(retval)

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

@@ -96,22 +96,30 @@ 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
   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

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

@@ -12,6 +12,7 @@
 # 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
@@ -60,8 +61,8 @@ if [ -z "$BM_ROOTFS" ]; then
   exit 1
 fi
 
-if [ -z "$BM_BOOTFS" ]; then
+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"
+  echo "Must set /boot files for the TFTP boot in the job's variables or set kernel and dtb"
   exit 1
 fi
 
@@ -70,11 +71,6 @@ 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'
@@ -99,23 +95,50 @@ 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)
-[ -d $BM_BOOTFS/usr/lib/modules ] && rsync -a $BM_BOOTFS/usr/lib/modules/ /nfs/usr/lib/modules/
+if [ -n "${FORCE_KERNEL_TAG}" ]; then
-[ -d $BM_BOOTFS/lib/modules ] && rsync -a $BM_BOOTFS/lib/modules/ /nfs/lib/modules/
+  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
+
 
 date +'%F %T'
 
 # Install kernel image + bootloader files
-rsync -aL --delete $BM_BOOTFS/boot/ /tftp/
+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
 
 date +'%F %T'
 
@@ -147,19 +170,31 @@ 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 required options in config.txt
+# Add some options in config.txt, if defined
-printf "$BM_BOOTCONFIG" >> /tftp/config.txt
+if [ -n "$BM_BOOTCONFIG" ]; then
+  printf "$BM_BOOTCONFIG" >> /tftp/config.txt
+fi
 
 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
 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" \
@@ -169,10 +204,14 @@ 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'
@@ -180,6 +219,10 @@ 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'
 

.gitlab-ci/bare-metal/poe_run.py

@@ -24,23 +24,26 @@
 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):
+    def __init__(self, args, test_timeout, logger):
         self.powerup = args.powerup
         self.powerdown = args.powerdown
         self.ser = SerialBuffer(
             args.dev, "results/serial-output.txt", "")
         self.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))
@@ -48,9 +51,11 @@ 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
@@ -61,8 +66,10 @@ class PoERun:
                 "Something wrong; couldn't detect the boot start up sequence")
             return 1
 
+        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
@@ -82,8 +89,10 @@ class PoERun:
             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(
@@ -103,10 +112,13 @@ def main():
         '--test-timeout', type=int, help='Test phase timeout (minutes)', required=True)
     args = parser.parse_args()
 
-    poe = PoERun(args, args.test_timeout * 60)
+    logger = CustomLogger("job_detail.json")
+    logger.update_dut_time("start", None)
+    poe = PoERun(args, args.test_timeout * 60, logger)
     retval = poe.run()
 
     poe.logged_system(args.powerdown)
+    logger.update_dut_time("end", None)
 
     sys.exit(retval)
 

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

@@ -17,7 +17,6 @@
     paths:
       - _build/meson-logs/*.txt
       - _build/meson-logs/strace
-      - shader-db
       - artifacts
 
 # Just Linux
@@ -61,15 +60,6 @@
   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
@@ -80,12 +70,15 @@ debian-testing:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
+      -D glvnd=disabled
       -D platforms=x11,wayland
     GALLIUM_ST: >
       -D dri3=enabled
+      -D gallium-nine=true
       -D gallium-va=enabled
-    GALLIUM_DRIVERS: "swrast,virgl,radeonsi,zink,crocus,iris,i915"
+      -D gallium-rusticl=true
-    VULKAN_DRIVERS: "swrast,amd,intel,intel_hasvk,virtio,nouveau-experimental"
+    GALLIUM_DRIVERS: "swrast,virgl,radeonsi,zink,crocus,iris,i915,r300,svga"
+    VULKAN_DRIVERS: "swrast,amd,intel,intel_hasvk,virtio,nouveau"
     BUILDTYPE: "debugoptimized"
     EXTRA_OPTION: >
       -D spirv-to-dxil=true
@@ -111,8 +104,22 @@ debian-testing-asan:
       -D b_sanitize=address
       -D valgrind=disabled
       -D tools=dlclose-skip
+      -D intel-clc=system
     S3_ARTIFACT_NAME: ""
     ARTIFACTS_DEBUG_SYMBOLS: 1
+    # Do a host build for intel-clc (asan complains not being loaded
+    # as the first library)
+    HOST_BUILD_OPTIONS: >
+      -D build-tests=false
+      -D enable-glcpp-tests=false
+      -D gallium-opencl=disabled
+      -D gallium-drivers=
+      -D vulkan-drivers=
+      -D video-codecs=
+      -D glx=disabled
+      -D platforms=
+      -D intel-clc=enabled
+      -D install-intel-clc=true
 
 debian-testing-msan:
   # https://github.com/google/sanitizers/wiki/MemorySanitizerLibcxxHowTo
@@ -124,6 +131,7 @@ debian-testing-msan:
     EXTRA_OPTION:
       -D b_sanitize=memory
       -D b_lundef=false
+      -D intel-clc=system
     S3_ARTIFACT_NAME: ""
     ARTIFACTS_DEBUG_SYMBOLS: 1
     # Don't run all the tests yet:
@@ -132,33 +140,19 @@ debian-testing-msan:
     MESON_TEST_ARGS: "--suite glcpp --suite format"
     GALLIUM_DRIVERS: "freedreno,iris,nouveau,kmsro,r300,r600,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus"
     VULKAN_DRIVERS: intel,amd,broadcom,virtio
-
+    # Do a host build for intel-clc (msan complains about
-.debian-cl-testing:
+    # uninitialized values in the LLVM libs)
-  extends:
+    HOST_BUILD_OPTIONS: >
-    - .meson-build
+      -D build-tests=false
-    - .ci-deqp-artifacts
+      -D enable-glcpp-tests=false
-  variables:
+      -D gallium-opencl=disabled
-    LLVM_VERSION: 15
+      -D gallium-drivers=
-    UNWIND: "enabled"
+      -D vulkan-drivers=
-    DRI_LOADERS: >
+      -D video-codecs=
       -D glx=disabled
-      -D egl=disabled
+      -D platforms=
-      -D gbm=disabled
+      -D intel-clc=enabled
-    GALLIUM_DRIVERS: "swrast"
+      -D install-intel-clc=true
-    BUILDTYPE: "debugoptimized"
-    EXTRA_OPTION: >
-      -D valgrind=disabled
-  script:
-    - .gitlab-ci/meson/build.sh
-    - .gitlab-ci/prepare-artifacts.sh
-
-debian-rusticl-testing:
-  extends:
-    - .debian-cl-testing
-  variables:
-    GALLIUM_ST: >
-      -D gallium-rusticl=true
-      -D opencl-spirv=true
 
 debian-build-testing:
   extends: .meson-build
@@ -169,6 +163,7 @@ debian-build-testing:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
+      -D glvnd=disabled
       -D platforms=x11,wayland
     GALLIUM_ST: >
       -D dri3=enabled
@@ -178,7 +173,6 @@ 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
@@ -188,6 +182,7 @@ debian-build-testing:
       -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,lima,panfrost,asahi
       -D b_lto=true
     LLVM_VERSION: 15
+    S3_ARTIFACT_NAME: debian-build-testing
   script: |
     section_start lava-pytest "lava-pytest"
     .gitlab-ci/lava/lava-pytest.sh
@@ -197,9 +192,27 @@ debian-build-testing:
     .gitlab-ci/run-yamllint.sh
     section_switch meson "meson"
     .gitlab-ci/meson/build.sh
+    .gitlab-ci/prepare-artifacts.sh
+  timeout: 15m
+
+shader-db:
+  stage: code-validation
+  extends:
+    - .use-debian/x86_64_build
+    - .container+build-rules
+  needs:
+    - debian-build-testing
+  variables:
+    S3_ARTIFACT_NAME: debian-build-testing
+  before_script:
+    - !reference [.download_s3, before_script]
+  script: |
     section_switch shader-db "shader-db"
     .gitlab-ci/run-shader-db.sh
-  timeout: 30m
+  artifacts:
+    paths:
+      - shader-db
+  timeout: 15m
 
 # Test a release build with -Werror so new warnings don't sneak in.
 debian-release:
@@ -213,6 +226,7 @@ debian-release:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
+      -D glvnd=disabled
       -D platforms=x11,wayland
     GALLIUM_ST: >
       -D dri3=enabled
@@ -222,7 +236,6 @@ 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"
@@ -232,6 +245,7 @@ debian-release:
       -D osmesa=true
       -D tools=all
       -D intel-clc=enabled
+      -D intel-rt=enabled
       -D imagination-srv=true
     BUILDTYPE: "release"
     S3_ARTIFACT_NAME: "mesa-x86_64-default-${BUILDTYPE}"
@@ -254,9 +268,9 @@ alpine-build-testing:
       -D glx=disabled
       -D gbm=enabled
       -D egl=enabled
-      -D glvnd=false
+      -D glvnd=disabled
       -D platforms=wayland
-    LLVM_VERSION: ""
+    LLVM_VERSION: "16"
     GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,iris,kmsro,lima,nouveau,panfrost,r300,r600,radeonsi,svga,swrast,tegra,v3d,vc4,virgl,zink"
     GALLIUM_ST: >
       -D dri3=enabled
@@ -274,8 +288,6 @@ 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:
@@ -296,7 +308,7 @@ fedora-release:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
-      -D glvnd=true
+      -D glvnd=enabled
       -D platforms=x11,wayland
     EXTRA_OPTION: >
       -D b_lto=true
@@ -304,8 +316,9 @@ fedora-release:
       -D selinux=true
       -D tools=drm-shim,etnaviv,freedreno,glsl,intel,nir,nouveau,lima,panfrost,imagination
       -D vulkan-layers=device-select,overlay
-      -D intel-clc=enabled
+      -D intel-rt=enabled
       -D imagination-srv=true
+      -D teflon=true
     GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,i915,iris,kmsro,lima,nouveau,panfrost,r300,r600,radeonsi,svga,swrast,tegra,v3d,vc4,virgl,zink"
     GALLIUM_ST: >
       -D dri3=enabled
@@ -315,7 +328,6 @@ 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
@@ -325,8 +337,6 @@ 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:
@@ -351,6 +361,7 @@ debian-android:
       -D glx=disabled
       -D gbm=disabled
       -D egl=enabled
+      -D glvnd=disabled
       -D platforms=android
     EXTRA_OPTION: >
       -D android-stub=true
@@ -358,6 +369,7 @@ debian-android:
       -D platform-sdk-version=33
       -D valgrind=disabled
       -D android-libbacktrace=disabled
+      -D intel-clc=system
     GALLIUM_ST: >
       -D dri3=disabled
       -D gallium-vdpau=disabled
@@ -365,10 +377,20 @@ debian-android:
       -D gallium-va=disabled
       -D gallium-xa=disabled
       -D gallium-nine=false
-      -D gallium-opencl=disabled
       -D gallium-rusticl=false
-    LLVM_VERSION: ""
+    LLVM_VERSION: "15"
     PKG_CONFIG_LIBDIR: "/disable/non/android/system/pc/files"
+    HOST_BUILD_OPTIONS: >
+      -D build-tests=false
+      -D enable-glcpp-tests=false
+      -D gallium-opencl=disabled
+      -D gallium-drivers=
+      -D vulkan-drivers=
+      -D video-codecs=
+      -D glx=disabled
+      -D platforms=
+      -D intel-clc=enabled
+      -D install-intel-clc=true
     ARTIFACTS_DEBUG_SYMBOLS: 1
     S3_ARTIFACT_NAME: mesa-x86_64-android-${BUILDTYPE}
   script:
@@ -420,6 +442,8 @@ debian-arm32:
     - .ci-deqp-artifacts
   variables:
     CROSS: armhf
+    DRI_LOADERS:
+      -D glvnd=disabled
     EXTRA_OPTION: >
       -D llvm=disabled
       -D valgrind=disabled
@@ -435,6 +459,8 @@ debian-arm32-asan:
   extends:
     - debian-arm32
   variables:
+    DRI_LOADERS:
+      -D glvnd=disabled
     EXTRA_OPTION: >
       -D llvm=disabled
       -D b_sanitize=address
@@ -453,12 +479,15 @@ debian-arm64:
       -Wno-error=array-bounds
       -Wno-error=stringop-truncation
     VULKAN_DRIVERS: "freedreno,broadcom,panfrost,imagination-experimental"
+    DRI_LOADERS:
+      -D glvnd=disabled
     EXTRA_OPTION: >
       -D llvm=disabled
       -D valgrind=disabled
       -D imagination-srv=true
       -D perfetto=true
       -D freedreno-kmds=msm,virtio
+      -D teflon=true
     S3_ARTIFACT_NAME: mesa-arm64-default-${BUILDTYPE}
   script:
     - .gitlab-ci/meson/build.sh
@@ -468,6 +497,8 @@ debian-arm64-asan:
   extends:
     - debian-arm64
   variables:
+    DRI_LOADERS:
+      -D glvnd=disabled
     EXTRA_OPTION: >
       -D llvm=disabled
       -D b_sanitize=address
@@ -483,10 +514,10 @@ debian-arm64-build-test:
     - .ci-deqp-artifacts
   variables:
     VULKAN_DRIVERS: "amd"
+    DRI_LOADERS:
+      -D glvnd=disabled
     EXTRA_OPTION: >
       -Dtools=panfrost,imagination
-  script:
-    - .gitlab-ci/meson/build.sh
 
 debian-arm64-release:
   extends:
@@ -508,12 +539,12 @@ 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=initializer-overrides
       -Wno-error=sometimes-uninitialized
+      -Werror=misleading-indentation
     CPP_ARGS: >
       -Wno-error=c99-designator
       -Wno-error=overloaded-virtual
@@ -523,7 +554,7 @@ debian-clang:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
-      -D glvnd=true
+      -D glvnd=enabled
       -D platforms=x11,wayland
     GALLIUM_ST: >
       -D dri3=enabled
@@ -533,7 +564,6 @@ 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
@@ -542,7 +572,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
+    VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio,swrast,panfrost,imagination-experimental,microsoft-experimental,nouveau
     EXTRA_OPTION:
       -D spirv-to-dxil=true
       -D osmesa=true
@@ -551,7 +581,9 @@ debian-clang:
       -D vulkan-layers=device-select,overlay
       -D build-aco-tests=true
       -D intel-clc=enabled
+      -D intel-rt=enabled
       -D imagination-srv=true
+      -D teflon=true
     CC: clang-${LLVM_VERSION}
     CXX: clang++-${LLVM_VERSION}
 
@@ -570,7 +602,6 @@ 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
@@ -579,10 +610,10 @@ debian-clang-release:
       -D opencl-spirv=true
       -D shared-glapi=disabled
 
-windows-vs2019:
+windows-msvc:
   extends:
     - .build-windows
-    - .use-windows_build_vs2019
+    - .use-windows_build_msvc
     - .windows-build-rules
   stage: build-misc
   script:
@@ -592,34 +623,6 @@ windows-vs2019:
       - _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
-
-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:
@@ -630,6 +633,10 @@ debian-vulkan:
       -D glx=disabled
       -D gbm=disabled
       -D egl=disabled
+      -D opengl=false
+      -D gles1=disabled
+      -D gles2=disabled
+      -D glvnd=disabled
       -D platforms=x11,wayland
       -D osmesa=false
     GALLIUM_ST: >
@@ -639,17 +646,16 @@ 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: amd,broadcom,freedreno,intel,intel_hasvk,panfrost,virtio,imagination-experimental,microsoft-experimental,nouveau
     EXTRA_OPTION: >
       -D vulkan-layers=device-select,overlay
       -D build-aco-tests=true
-      -D intel-clc=disabled
+      -D intel-rt=disabled
       -D imagination-srv=true
 
 debian-x86_32:
@@ -660,10 +666,24 @@ debian-x86_32:
     BUILDTYPE: debug
     CROSS: i386
     VULKAN_DRIVERS: intel,amd,swrast,virtio
-    GALLIUM_DRIVERS: "iris,nouveau,r300,r600,radeonsi,swrast,virgl,zink,crocus"
+    GALLIUM_DRIVERS: "iris,nouveau,r300,r600,radeonsi,swrast,virgl,zink,crocus,d3d12"
     LLVM_VERSION: 15
+    DRI_LOADERS:
+      -D glvnd=disabled
     EXTRA_OPTION: >
       -D vulkan-layers=device-select,overlay
+      -D intel-clc=system
+    HOST_BUILD_OPTIONS: >
+      -D build-tests=false
+      -D enable-glcpp-tests=false
+      -D gallium-opencl=disabled
+      -D gallium-drivers=
+      -D vulkan-drivers=
+      -D video-codecs=
+      -D glx=disabled
+      -D platforms=
+      -D intel-clc=enabled
+      -D install-intel-clc=true
 
 debian-s390x:
   extends:
@@ -677,6 +697,8 @@ debian-s390x:
     GALLIUM_DRIVERS: "swrast,zink"
     LLVM_VERSION: 15
     VULKAN_DRIVERS: "swrast"
+    DRI_LOADERS:
+      -D glvnd=disabled
 
 debian-ppc64el:
   extends:
@@ -688,41 +710,5 @@ debian-ppc64el:
     CROSS: ppc64el
     GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl,zink"
     VULKAN_DRIVERS: "amd,swrast"
-
+    DRI_LOADERS:
-# Disabled as it hangs with winedbg on shared runners
+      -D glvnd=disabled
-.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

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

@@ -1,127 +1,135 @@
 #!/bin/bash
 
-for var in \
+VARS=(
-    ACO_DEBUG \
+    ACO_DEBUG
-    ASAN_OPTIONS \
+    ARTIFACTS_BASE_URL
-    BASE_SYSTEM_FORK_HOST_PREFIX \
+    ASAN_OPTIONS
-    BASE_SYSTEM_MAINLINE_HOST_PREFIX \
+    BASE_SYSTEM_FORK_HOST_PREFIX
-    CI_COMMIT_BRANCH \
+    BASE_SYSTEM_MAINLINE_HOST_PREFIX
-    CI_COMMIT_REF_NAME \
+    CI_COMMIT_BRANCH
-    CI_COMMIT_TITLE \
+    CI_COMMIT_REF_NAME
-    CI_JOB_ID \
+    CI_COMMIT_TITLE
-    CI_JOB_JWT_FILE \
+    CI_JOB_ID
-    CI_JOB_STARTED_AT \
+    CI_JOB_JWT_FILE
-    CI_JOB_NAME \
+    CI_JOB_STARTED_AT
-    CI_JOB_URL \
+    CI_JOB_NAME
-    CI_MERGE_REQUEST_SOURCE_BRANCH_NAME \
+    CI_JOB_URL
-    CI_MERGE_REQUEST_TITLE \
+    CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
-    CI_NODE_INDEX \
+    CI_MERGE_REQUEST_TITLE
-    CI_NODE_TOTAL \
+    CI_NODE_INDEX
-    CI_PAGES_DOMAIN \
+    CI_NODE_TOTAL
-    CI_PIPELINE_ID \
+    CI_PAGES_DOMAIN
-    CI_PIPELINE_URL \
+    CI_PIPELINE_ID
-    CI_PROJECT_DIR \
+    CI_PIPELINE_URL
-    CI_PROJECT_NAME \
+    CI_PROJECT_DIR
-    CI_PROJECT_PATH \
+    CI_PROJECT_NAME
-    CI_PROJECT_ROOT_NAMESPACE \
+    CI_PROJECT_PATH
-    CI_RUNNER_DESCRIPTION \
+    CI_PROJECT_ROOT_NAMESPACE
-    CI_SERVER_URL \
+    CI_RUNNER_DESCRIPTION
-    CROSVM_GALLIUM_DRIVER \
+    CI_SERVER_URL
-    CROSVM_GPU_ARGS \
+    CROSVM_GALLIUM_DRIVER
-    CURRENT_SECTION \
+    CROSVM_GPU_ARGS
-    DEQP_BIN_DIR \
+    CURRENT_SECTION
-    DEQP_CONFIG \
+    DEQP_BIN_DIR
-    DEQP_EXPECTED_RENDERER \
+    DEQP_CONFIG
-    DEQP_FRACTION \
+    DEQP_EXPECTED_RENDERER
-    DEQP_HEIGHT \
+    DEQP_FRACTION
-    DEQP_RESULTS_DIR \
+    DEQP_HEIGHT
-    DEQP_RUNNER_OPTIONS \
+    DEQP_RESULTS_DIR
-    DEQP_SUITE \
+    DEQP_RUNNER_OPTIONS
-    DEQP_TEMP_DIR \
+    DEQP_SUITE
-    DEQP_VARIANT \
+    DEQP_TEMP_DIR
-    DEQP_VER \
+    DEQP_VER
-    DEQP_WIDTH \
+    DEQP_WIDTH
-    DEVICE_NAME \
+    DEVICE_NAME
-    DRIVER_NAME \
+    DRIVER_NAME
-    EGL_PLATFORM \
+    EGL_PLATFORM
-    ETNA_MESA_DEBUG \
+    ETNA_MESA_DEBUG
-    FDO_CI_CONCURRENT \
+    FDO_CI_CONCURRENT
-    FDO_UPSTREAM_REPO \
+    FDO_UPSTREAM_REPO
-    FD_MESA_DEBUG \
+    FD_MESA_DEBUG
-    FLAKES_CHANNEL \
+    FLAKES_CHANNEL
-    FREEDRENO_HANGCHECK_MS \
+    FREEDRENO_HANGCHECK_MS
-    GALLIUM_DRIVER \
+    GALLIUM_DRIVER
-    GALLIVM_PERF \
+    GALLIVM_PERF
-    GPU_VERSION \
+    GPU_VERSION
-    GTEST \
+    GTEST
-    GTEST_FAILS \
+    GTEST_FAILS
-    GTEST_FRACTION \
+    GTEST_FRACTION
-    GTEST_RESULTS_DIR \
+    GTEST_RESULTS_DIR
-    GTEST_RUNNER_OPTIONS \
+    GTEST_RUNNER_OPTIONS
-    GTEST_SKIPS \
+    GTEST_SKIPS
-    HWCI_FREQ_MAX \
+    HWCI_FREQ_MAX
-    HWCI_KERNEL_MODULES \
+    HWCI_KERNEL_MODULES
-    HWCI_KVM \
+    HWCI_KVM
-    HWCI_START_WESTON \
+    HWCI_START_WESTON
-    HWCI_START_XORG \
+    HWCI_START_XORG
-    HWCI_TEST_SCRIPT \
+    HWCI_TEST_SCRIPT
-    IR3_SHADER_DEBUG \
+    IR3_SHADER_DEBUG
-    JOB_ARTIFACTS_BASE \
+    JOB_ARTIFACTS_BASE
-    JOB_RESULTS_PATH \
+    JOB_RESULTS_PATH
-    JOB_ROOTFS_OVERLAY_PATH \
+    JOB_ROOTFS_OVERLAY_PATH
-    KERNEL_IMAGE_BASE \
+    KERNEL_IMAGE_BASE
-    KERNEL_IMAGE_NAME \
+    KERNEL_IMAGE_NAME
-    LD_LIBRARY_PATH \
+    LD_LIBRARY_PATH
-    LP_NUM_THREADS \
+    LIBGL_ALWAYS_SOFTWARE
-    MESA_BASE_TAG \
+    LP_NUM_THREADS
-    MESA_BUILD_PATH \
+    MESA_BASE_TAG
-    MESA_DEBUG \
+    MESA_BUILD_PATH
-    MESA_GLES_VERSION_OVERRIDE \
+    MESA_DEBUG
-    MESA_GLSL_VERSION_OVERRIDE \
+    MESA_GLES_VERSION_OVERRIDE
-    MESA_GL_VERSION_OVERRIDE \
+    MESA_GLSL_VERSION_OVERRIDE
-    MESA_IMAGE \
+    MESA_GL_VERSION_OVERRIDE
-    MESA_IMAGE_PATH \
+    MESA_IMAGE
-    MESA_IMAGE_TAG \
+    MESA_IMAGE_PATH
-    MESA_LOADER_DRIVER_OVERRIDE \
+    MESA_IMAGE_TAG
-    MESA_TEMPLATES_COMMIT \
+    MESA_LOADER_DRIVER_OVERRIDE
-    MESA_VK_IGNORE_CONFORMANCE_WARNING \
+    MESA_TEMPLATES_COMMIT
-    S3_HOST \
+    MESA_VK_IGNORE_CONFORMANCE_WARNING
-    S3_RESULTS_UPLOAD \
+    S3_HOST
-    NIR_DEBUG \
+    S3_RESULTS_UPLOAD
-    PAN_I_WANT_A_BROKEN_VULKAN_DRIVER \
+    NIR_DEBUG
-    PAN_MESA_DEBUG \
+    PAN_I_WANT_A_BROKEN_VULKAN_DRIVER
-    PIGLIT_FRACTION \
+    PAN_MESA_DEBUG
-    PIGLIT_NO_WINDOW \
+    PANVK_DEBUG
-    PIGLIT_OPTIONS \
+    PIGLIT_FRACTION
-    PIGLIT_PLATFORM \
+    PIGLIT_NO_WINDOW
-    PIGLIT_PROFILES \
+    PIGLIT_OPTIONS
-    PIGLIT_REPLAY_ARTIFACTS_BASE_URL \
+    PIGLIT_PLATFORM
-    PIGLIT_REPLAY_DESCRIPTION_FILE \
+    PIGLIT_PROFILES
-    PIGLIT_REPLAY_DEVICE_NAME \
+    PIGLIT_REPLAY_ANGLE_TAG
-    PIGLIT_REPLAY_EXTRA_ARGS \
+    PIGLIT_REPLAY_ARTIFACTS_BASE_URL
-    PIGLIT_REPLAY_LOOP_TIMES \
+    PIGLIT_REPLAY_DEVICE_NAME
-    PIGLIT_REPLAY_REFERENCE_IMAGES_BASE \
+    PIGLIT_REPLAY_EXTRA_ARGS
-    PIGLIT_REPLAY_SUBCOMMAND \
+    PIGLIT_REPLAY_LOOP_TIMES
-    PIGLIT_RESULTS \
+    PIGLIT_REPLAY_REFERENCE_IMAGES_BASE
-    PIGLIT_TESTS \
+    PIGLIT_REPLAY_SUBCOMMAND
-    PIPELINE_ARTIFACTS_BASE \
+    PIGLIT_RESULTS
-    RADV_DEBUG \
+    PIGLIT_TESTS
-    RADV_PERFTEST \
+    PIGLIT_TRACES_FILE
-    SKQP_ASSETS_DIR \
+    PIPELINE_ARTIFACTS_BASE
-    SKQP_BACKENDS \
+    RADEON_DEBUG
-    TU_DEBUG \
+    RADV_DEBUG
-    USE_ANGLE \
+    RADV_PERFTEST
-    VIRGL_HOST_API \
+    SKQP_ASSETS_DIR
-    WAFFLE_PLATFORM \
+    SKQP_BACKENDS
-    VK_CPU \
+    TU_DEBUG
-    VK_DRIVER \
+    USE_ANGLE
-    VK_ICD_FILENAMES \
+    VIRGL_HOST_API
-    VKD3D_PROTON_RESULTS \
+    WAFFLE_PLATFORM
-    VKD3D_CONFIG \
+    VK_CPU
-    ZINK_DESCRIPTORS \
+    VK_DRIVER
-    ZINK_DEBUG \
+    # required by virglrender CI
-    LVP_POISON_MEMORY \
+    VK_DRIVER_FILES
-    ; do
+    VKD3D_PROTON_RESULTS
+    VKD3D_CONFIG
+    VKD3D_TEST_EXCLUDE
+    ZINK_DESCRIPTORS
+    ZINK_DEBUG
+    LVP_POISON_MEMORY
+)
+
+for var in "${VARS[@]}"; do
   if [ -n "${!var+x}" ]; then
     echo "export $var=${!var@Q}"
   fi

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

@@ -7,10 +7,10 @@ set -ex
 
 cd /
 
-mount -t proc none /proc
+findmnt --mountpoint /proc || mount -t proc none /proc
-mount -t sysfs none /sys
+findmnt --mountpoint /sys || mount -t sysfs none /sys
 mount -t debugfs none /sys/kernel/debug
-mount -t devtmpfs none /dev || echo possibly already mounted
+findmnt --mountpoint /dev || mount -t devtmpfs none /dev
 mkdir -p /dev/pts
 mount -t devpts devpts /dev/pts
 mkdir /dev/shm

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

@@ -7,6 +7,8 @@
 # Second-stage init, used to set up devices and our job environment before
 # running tests.
 
+shopt -s extglob
+
 # Make sure to kill itself and all the children process from this script on
 # exiting, since any console output may interfere with LAVA signals handling,
 # which based on the log console.
@@ -106,6 +108,13 @@ export XDG_CACHE_HOME=/tmp
 # Make sure Python can find all our imports
 export PYTHONPATH=$(python3 -c "import sys;print(\":\".join(sys.path))")
 
+# If we need to specify a driver, it means several drivers could pick up this gpu;
+# ensure that the other driver can't accidentally be used
+if [ -n "$MESA_LOADER_DRIVER_OVERRIDE" ]; then
+  rm /install/lib/dri/!($MESA_LOADER_DRIVER_OVERRIDE)_dri.so
+fi
+ls -1 /install/lib/dri/*_dri.so || true
+
 if [ "$HWCI_FREQ_MAX" = "true" ]; then
   # Ensure initialization of the DRM device (needed by MSM)
   head -0 /dev/dri/renderD128
@@ -156,7 +165,7 @@ fi
 if [ -n "$HWCI_START_XORG" ]; then
   echo "touch /xorg-started; sleep 100000" > /xorg-script
   env \
-    VK_ICD_FILENAMES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
+    VK_DRIVER_FILES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
     xinit /bin/sh /xorg-script -- /usr/bin/Xorg -noreset -s 0 -dpms -logfile /Xorg.0.log &
   BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
 
@@ -183,7 +192,7 @@ if [ -n "$HWCI_START_WESTON" ]; then
   mkdir -p /tmp/.X11-unix
 
   env \
-    VK_ICD_FILENAMES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
+    VK_DRIVER_FILES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
     weston -Bheadless-backend.so --use-gl -Swayland-0 --xwayland --idle-time=0 &
   BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
 

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

@@ -8,6 +8,8 @@
 set -e
 set -o xtrace
 
+export LLVM_VERSION="${LLVM_VERSION:=16}"
+
 EPHEMERAL=(
 )
 
@@ -16,6 +18,7 @@ DEPS=(
     bash
     bison
     ccache
+    clang16-dev
     cmake
     clang-dev
     coreutils
@@ -27,6 +30,7 @@ DEPS=(
     gettext
     glslang
     linux-headers
+    llvm16-static
     llvm16-dev
     meson
     expat-dev
@@ -37,6 +41,7 @@ DEPS=(
     libpciaccess-dev
     zlib-dev
     python3-dev
+    py3-cparser
     py3-mako
     py3-ply
     vulkan-headers
@@ -46,7 +51,11 @@ DEPS=(
     wayland-protocols
 )
 
-apk add "${DEPS[@]}" "${EPHEMERAL[@]}"
+apk --no-cache add "${DEPS[@]}" "${EPHEMERAL[@]}"
+
+. .gitlab-ci/container/build-llvm-spirv.sh
+
+. .gitlab-ci/container/build-libclc.sh
 
 . .gitlab-ci/container/container_pre_build.sh
 

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

@@ -18,7 +18,7 @@ DEPS=(
 )
 
 
-apk add "${DEPS[@]}" "${EPHEMERAL[@]}"
+apk --no-cache add "${DEPS[@]}" "${EPHEMERAL[@]}"
 
 . .gitlab-ci/container/container_pre_build.sh
 

.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=1641c55bcc922588e24de73e9cca7b5e4005bd6d
 git clone --single-branch -b main --no-checkout https://chromium.googlesource.com/crosvm/crosvm /platform/crosvm
 pushd /platform/crosvm
 git checkout "$CROSVM_VERSION"
 git submodule update --init
 
-VIRGLRENDERER_VERSION=10120c0d9ebdc00eae1b5c9f7c98fc0d198ba602
+VIRGLRENDERER_VERSION=d9c002fac153b834a2c17731f2b85c36e333e102
 rm -rf third_party/virglrenderer
 git clone --single-branch -b main --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer
 pushd third_party/virglrenderer
@@ -31,10 +31,10 @@ RUSTFLAGS='-L native=/usr/local/lib' cargo install \
   --version 0.65.1 \
   $EXTRA_CARGO_ARGS
 
-CROSVM_USE_SYSTEM_VIRGLRENDERER=1 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
+CROSVM_USE_SYSTEM_MINIGBM=1 CROSVM_USE_SYSTEM_VIRGLRENDERER=1 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
   -j ${FDO_CI_CONCURRENT:-4} \
   --locked \
-  --features 'default-no-sandbox gpu x virgl_renderer virgl_renderer_next' \
+  --features 'default-no-sandbox gpu x virgl_renderer' \
   --path . \
   --root /usr/local \
   $EXTRA_CARGO_ARGS

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

@@ -1,25 +1,39 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting
 
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_X86_64_TEST_ANDROID_TAG
+# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_X86_64_TEST_VK_TAG
+# KERNEL_ROOTFS_TAG
+
 set -ex
 
+DEQP_RUNNER_VERSION=0.18.0
+
+DEQP_RUNNER_GIT_URL="${DEQP_RUNNER_GIT_URL:-https://gitlab.freedesktop.org/mesa/deqp-runner.git}"
+
 if [ -n "${DEQP_RUNNER_GIT_TAG}${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}"
+    DEQP_RUNNER_CARGO_ARGS="--git $DEQP_RUNNER_GIT_URL"
 
     if [ -n "${DEQP_RUNNER_GIT_TAG}" ]; then
         DEQP_RUNNER_CARGO_ARGS="--tag ${DEQP_RUNNER_GIT_TAG} ${DEQP_RUNNER_CARGO_ARGS}"
+        DEQP_RUNNER_GIT_CHECKOUT="$DEQP_RUNNER_GIT_TAG"
     else
         DEQP_RUNNER_CARGO_ARGS="--rev ${DEQP_RUNNER_GIT_REV} ${DEQP_RUNNER_CARGO_ARGS}"
+        DEQP_RUNNER_GIT_CHECKOUT="$DEQP_RUNNER_GIT_REV"
     fi
 
     DEQP_RUNNER_CARGO_ARGS="${DEQP_RUNNER_CARGO_ARGS} ${EXTRA_CARGO_ARGS}"
 else
     # Install from package registry
-    DEQP_RUNNER_CARGO_ARGS="--version 0.16.0 ${EXTRA_CARGO_ARGS} -- deqp-runner"
+    DEQP_RUNNER_CARGO_ARGS="--version ${DEQP_RUNNER_VERSION} ${EXTRA_CARGO_ARGS} -- deqp-runner"
+    DEQP_RUNNER_GIT_CHECKOUT="v$DEQP_RUNNER_VERSION"
 fi
 
-if [ -z "$ANDROID_NDK_HOME" ]; then
+if [[ "$RUST_TARGET" != *-android ]]; then
     cargo install --locked  \
         -j ${FDO_CI_CONCURRENT:-4} \
         --root /usr/local \
@@ -27,7 +41,7 @@ if [ -z "$ANDROID_NDK_HOME" ]; then
 else
     mkdir -p /deqp-runner
     pushd /deqp-runner
-    git clone --branch v0.16.1 --depth 1 https://gitlab.freedesktop.org/anholt/deqp-runner.git deqp-runner-git
+    git clone --branch "$DEQP_RUNNER_GIT_CHECKOUT" --depth 1 "$DEQP_RUNNER_GIT_URL" deqp-runner-git
     pushd deqp-runner-git
 
     cargo install --locked  \
@@ -35,10 +49,10 @@ else
         --root /usr/local --version 2.10.0 \
         cargo-ndk
 
-    rustup target add x86_64-linux-android
+    rustup target add $RUST_TARGET
-    RUSTFLAGS='-C target-feature=+crt-static' cargo ndk --target x86_64-linux-android build
+    RUSTFLAGS='-C target-feature=+crt-static' cargo ndk --target $RUST_TARGET build --release
 
-    mv target/x86_64-linux-android/debug/deqp-runner /deqp-runner
+    mv target/$RUST_TARGET/release/deqp-runner /deqp-runner
 
     cargo uninstall --locked  \
         --root /usr/local \

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

@@ -8,16 +8,17 @@
 # DEBIAN_X86_64_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG
 
-set -ex
+set -ex -o pipefail
 
-git config --global user.email "mesa@example.com"
+# See `deqp_build_targets` below for which release is used to produce which
-git config --global user.name "Mesa CI"
+# binary. Unless this comment has bitrotten:
-git clone \
+# - the VK release produces `deqp-vk`,
-    https://github.com/KhronosGroup/VK-GL-CTS.git \
+# - the GL release produces `glcts`, and
-    -b vulkan-cts-1.3.7.0 \
+# - the GLES release produces `deqp-gles*` and `deqp-egl`
-    --depth 1 \
+
-    /VK-GL-CTS
+DEQP_VK_VERSION=1.3.8.2
-pushd /VK-GL-CTS
+DEQP_GL_VERSION=4.6.4.0
+DEQP_GLES_VERSION=3.2.10.0
 
 # Patches to VulkanCTS may come from commits in their repo (listed in
 # cts_commits_to_backport) or patch files stored in our repo (in the patch
@@ -25,95 +26,209 @@ pushd /VK-GL-CTS
 # Both list variables would have comments explaining the reasons behind the
 # patches.
 
-cts_commits_to_backport=(
+# shellcheck disable=SC2034
+vk_cts_commits_to_backport=(
+    # Fix more ASAN errors due to missing virtual destructors
+    dd40bcfef1b4035ea55480b6fd4d884447120768
+
+    # Remove "unused shader stages" tests
+    7dac86c6bbd15dec91d7d9a98cd6dd57c11092a7
 )
 
-for commit in "${cts_commits_to_backport[@]}"
+# shellcheck disable=SC2034
+vk_cts_patch_files=(
+)
+
+if [ "${DEQP_TARGET}" = 'android' ]; then
+  vk_cts_patch_files+=(
+    build-deqp-vk_Allow-running-on-Android-from-the-command-line.patch
+    build-deqp-vk_Android-prints-to-stdout-instead-of-logcat.patch
+  )
+fi
+
+# shellcheck disable=SC2034
+gl_cts_commits_to_backport=(
+)
+
+# shellcheck disable=SC2034
+gl_cts_patch_files=(
+)
+
+if [ "${DEQP_TARGET}" = 'android' ]; then
+  gl_cts_patch_files+=(
+    build-deqp-gl_Allow-running-on-Android-from-the-command-line.patch
+    build-deqp-gl_Android-prints-to-stdout-instead-of-logcat.patch
+  )
+fi
+
+# shellcheck disable=SC2034
+# GLES builds also EGL
+gles_cts_commits_to_backport=(
+  # Implement support for the EGL_EXT_config_select_group extension
+  88ba9ac270db5be600b1ecacbc6d9db0c55d5be4
+)
+
+# shellcheck disable=SC2034
+gles_cts_patch_files=(
+)
+
+if [ "${DEQP_TARGET}" = 'android' ]; then
+  gles_cts_patch_files+=(
+    build-deqp-gles_Allow-running-on-Android-from-the-command-line.patch
+    build-deqp-gles_Android-prints-to-stdout-instead-of-logcat.patch
+  )
+fi
+
+
+### Careful editing anything below this line
+
+
+git config --global user.email "mesa@example.com"
+git config --global user.name "Mesa CI"
+
+# shellcheck disable=SC2153
+case "${DEQP_API}" in
+  VK) DEQP_VERSION="vulkan-cts-$DEQP_VK_VERSION";;
+  GL) DEQP_VERSION="opengl-cts-$DEQP_GL_VERSION";;
+  GLES) DEQP_VERSION="opengl-es-cts-$DEQP_GLES_VERSION";;
+esac
+
+git clone \
+    https://github.com/KhronosGroup/VK-GL-CTS.git \
+    -b $DEQP_VERSION \
+    --depth 1 \
+    /VK-GL-CTS
+pushd /VK-GL-CTS
+
+mkdir -p /deqp
+
+# shellcheck disable=SC2153
+deqp_api=${DEQP_API,,}
+
+cts_commits_to_backport="${deqp_api}_cts_commits_to_backport[@]"
+for commit in "${!cts_commits_to_backport}"
 do
   PATCH_URL="https://github.com/KhronosGroup/VK-GL-CTS/commit/$commit.patch"
-  echo "Apply patch to VK-GL-CTS from $PATCH_URL"
+  echo "Apply patch to ${DEQP_API} CTS from $PATCH_URL"
   curl -L --retry 4 -f --retry-all-errors --retry-delay 60 $PATCH_URL | \
     git am -
 done
 
-cts_patch_files=(
+cts_patch_files="${deqp_api}_cts_patch_files[@]"
-  # Android specific patches.
+for patch in "${!cts_patch_files}"
-  build-deqp_Allow-running-on-Android-from-the-command-line.patch
-  build-deqp_Android-prints-to-stdout-instead-of-logcat.patch
-)
-
-for patch in "${cts_patch_files[@]}"
 do
-  echo "Apply patch to VK-GL-CTS from $patch"
+  echo "Apply patch to ${DEQP_API} CTS from $patch"
   git am < $OLDPWD/.gitlab-ci/container/patches/$patch
 done
 
+{
+  echo "dEQP base version $DEQP_VERSION"
+  echo "The following local patches are applied on top:"
+  git log --reverse --oneline $DEQP_VERSION.. --format=%s | sed 's/^/- /'
+} > /deqp/version-$deqp_api
+
 # --insecure is due to SSL cert failures hitting sourceforge for zlib and
 # libpng (sigh).  The archives get their checksums checked anyway, and git
 # always goes through ssh or https.
 python3 external/fetch_sources.py --insecure
 
-mkdir -p /deqp
-
 # Save the testlog stylesheets:
 cp doc/testlog-stylesheet/testlog.{css,xsl} /deqp
 popd
 
 pushd /deqp
 
-if [ "${DEQP_TARGET}" != 'android' ]; then
+if [ "${DEQP_API}" = 'GLES' ]; then
+  if [ "${DEQP_TARGET}" = 'android' ]; then
+    cmake -S /VK-GL-CTS -B . -G Ninja \
+        -DDEQP_TARGET=android \
+        -DCMAKE_BUILD_TYPE=Release \
+        $EXTRA_CMAKE_ARGS
+    mold --run ninja modules/egl/deqp-egl
+    mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-android
+  else
     # When including EGL/X11 testing, do that build first and save off its
     # deqp-egl binary.
     cmake -S /VK-GL-CTS -B . -G Ninja \
         -DDEQP_TARGET=x11_egl_glx \
         -DCMAKE_BUILD_TYPE=Release \
         $EXTRA_CMAKE_ARGS
-    ninja modules/egl/deqp-egl
+    mold --run ninja modules/egl/deqp-egl
     mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-x11
 
     cmake -S /VK-GL-CTS -B . -G Ninja \
         -DDEQP_TARGET=wayland \
         -DCMAKE_BUILD_TYPE=Release \
         $EXTRA_CMAKE_ARGS
-    ninja modules/egl/deqp-egl
+    mold --run ninja modules/egl/deqp-egl
     mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-wayland
+  fi
 fi
 
 cmake -S /VK-GL-CTS -B . -G Ninja \
-      -DDEQP_TARGET=${DEQP_TARGET:-x11_glx} \
+      -DDEQP_TARGET=${DEQP_TARGET} \
       -DCMAKE_BUILD_TYPE=Release \
       $EXTRA_CMAKE_ARGS
-mold --run ninja
 
-if [ "${DEQP_TARGET}" = 'android' ]; then
+# Make sure `default` doesn't silently stop detecting one of the platforms we care about
-    mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-android
+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
 
-git -C /VK-GL-CTS describe --long > /deqp/version
+deqp_build_targets=()
+case "${DEQP_API}" in
+  VK)
+    deqp_build_targets+=(deqp-vk)
+    ;;
+  GL)
+    deqp_build_targets+=(glcts)
+    ;;
+  GLES)
+    deqp_build_targets+=(deqp-gles{2,3,31})
+    # deqp-egl also comes from this build, but it is handled separately above.
+    ;;
+esac
+if [ "${DEQP_TARGET}" != 'android' ]; then
+  deqp_build_targets+=(testlog-to-xml)
+  deqp_build_targets+=(testlog-to-csv)
+  deqp_build_targets+=(testlog-to-junit)
+fi
 
-# Copy out the mustpass lists we want.
+mold --run ninja "${deqp_build_targets[@]}"
-mkdir /deqp/mustpass
-for mustpass in $(< /VK-GL-CTS/external/vulkancts/mustpass/main/vk-default.txt) ; do
-    cat /VK-GL-CTS/external/vulkancts/mustpass/main/$mustpass \
-        >> /deqp/mustpass/vk-master.txt
-done
 
 if [ "${DEQP_TARGET}" != 'android' ]; then
+    # Copy out the mustpass lists we want.
+    mkdir -p /deqp/mustpass
+
+    if [ "${DEQP_API}" = 'VK' ]; then
+        for mustpass in $(< /VK-GL-CTS/external/vulkancts/mustpass/main/vk-default.txt) ; do
+            cat /VK-GL-CTS/external/vulkancts/mustpass/main/$mustpass \
+                >> /deqp/mustpass/vk-main.txt
+        done
+    fi
+
+    if [ "${DEQP_API}" = 'GL' ]; then
         cp \
-        /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/aosp_mustpass/3.2.6.x/*.txt \
+            /VK-GL-CTS/external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.1.x/*-main.txt \
-        /deqp/mustpass/.
+            /deqp/mustpass/
         cp \
-        /deqp/external/openglcts/modules/gl_cts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-master.txt \
+            /VK-GL-CTS/external/openglcts/data/mustpass/gl/khronos_mustpass_single/4.6.1.x/*-single.txt \
-        /deqp/mustpass/.
+            /deqp/mustpass/
+    fi
+
+    if [ "${DEQP_API}" = 'GLES' ]; then
         cp \
-        /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/khronos_mustpass/3.2.6.x/*-master.txt \
+            /VK-GL-CTS/external/openglcts/data/mustpass/gles/aosp_mustpass/3.2.6.x/*.txt \
-        /deqp/mustpass/.
+            /deqp/mustpass/
         cp \
-        /deqp/external/openglcts/modules/gl_cts/data/mustpass/gl/khronos_mustpass/4.6.1.x/*-master.txt \
+            /VK-GL-CTS/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-main.txt \
-        /deqp/mustpass/.
+            /deqp/mustpass/
         cp \
-        /deqp/external/openglcts/modules/gl_cts/data/mustpass/gl/khronos_mustpass_single/4.6.1.x/*-single.txt \
+            /VK-GL-CTS/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.6.x/*-main.txt \
-        /deqp/mustpass/.
+            /deqp/mustpass/
+    fi
 
     # Save *some* executor utils, but otherwise strip things down
     # to reduct deqp build size:
@@ -124,19 +239,24 @@ if [ "${DEQP_TARGET}" != 'android' ]; then
 fi
 
 # Remove other mustpass files, since we saved off the ones we wanted to conventient locations above.
-rm -rf /deqp/external/openglcts/modules/gl_cts/data/mustpass
+rm -rf /deqp/external/**/mustpass/
-rm -rf /deqp/external/vulkancts/modules/vulkan/vk-master*
+rm -rf /deqp/external/vulkancts/modules/vulkan/vk-main*
 rm -rf /deqp/external/vulkancts/modules/vulkan/vk-default
 
 rm -rf /deqp/external/openglcts/modules/cts-runner
 rm -rf /deqp/modules/internal
 rm -rf /deqp/execserver
 rm -rf /deqp/framework
-# shellcheck disable=SC2038,SC2185 # TODO: rewrite find
+find . -depth \( -iname '*cmake*' -o -name '*ninja*' -o -name '*.o' -o -name '*.a' \) -exec rm -rf {} \;
-find -iname '*cmake*' -o -name '*ninja*' -o -name '*.o' -o -name '*.a' | xargs rm -rf
+if [ "${DEQP_API}" = 'VK' ]; then
-${STRIP_CMD:-strip} external/vulkancts/modules/vulkan/deqp-vk
+  ${STRIP_CMD:-strip} external/vulkancts/modules/vulkan/deqp-vk
-${STRIP_CMD:-strip} external/openglcts/modules/glcts
+fi
-${STRIP_CMD:-strip} modules/*/deqp-*
+if [ "${DEQP_API}" = 'GL' ]; then
+  ${STRIP_CMD:-strip} external/openglcts/modules/glcts
+fi
+if [ "${DEQP_API}" = 'GLES' ]; then
+  ${STRIP_CMD:-strip} modules/*/deqp-*
+fi
 du -sh ./*
 rm -rf /VK-GL-CTS
 popd

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

@@ -0,0 +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
+
+git clone https://github.com/microsoft/DirectX-Headers -b v1.613.1 --depth 1
+pushd DirectX-Headers
+meson setup build --backend=ninja --buildtype=release -Dbuild-test=false $EXTRA_MESON_ARGS
+meson install -C build
+popd
+rm -rf DirectX-Headers

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

@@ -5,12 +5,12 @@ set -ex
 
 KDL_REVISION="5056f71b100a68b72b285c6fc845a66a2ed25985"
 
-git clone \
+mkdir ci-kdl.git
-    https://gitlab.freedesktop.org/gfx-ci/ci-kdl.git \
-    --depth 1 \
-    ci-kdl.git
 pushd ci-kdl.git
-git checkout ${KDL_REVISION}
+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

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

@@ -1,9 +1,10 @@
 #!/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.114
+export LIBDRM_VERSION=libdrm-2.4.119
 
 curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \
     https://dri.freedesktop.org/libdrm/"$LIBDRM_VERSION".tar.xz

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

@@ -2,7 +2,14 @@
 
 set -ex
 
-MOLD_VERSION="1.11.0"
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_BASE_TAG
+# DEBIAN_BUILD_TAG
+# FEDORA_X86_64_BUILD_TAG
+# KERNEL_ROOTFS_TAG
+
+MOLD_VERSION="2.4.1"
 
 git clone -b v"$MOLD_VERSION" --single-branch --depth 1 https://github.com/rui314/mold.git
 pushd mold

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

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_X86_64_TEST_GL_TAG
+
+set -ex -o pipefail
+
+### Careful editing anything below this line
+
+git config --global user.email "mesa@example.com"
+git config --global user.name "Mesa CI"
+git clone https://github.com/axeldavy/Xnine.git /Xnine
+mkdir /Xnine/build
+pushd /Xnine/build
+git checkout c64753d224c08006bcdcfa7880ada826f27164b1
+
+cmake .. -DBUILD_TESTS=1 -DWITH_DRI3=1 -DD3DADAPTER9_LOCATION=/install/lib/d3d/d3dadapter9.so
+make
+
+mkdir -p /NineTests/
+mv NineTests/NineTests /NineTests/
+
+popd
+rm -rf /Xnine

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

@@ -8,7 +8,7 @@ set -ex
 # DEBIAN_X86_64_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG
 
-REV="f7db20b03de6896d013826c0a731bc4417c1a5a0"
+REV="f7ece74a107a2f99b2f494d978c84f8d51faa703"
 
 git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
 pushd /piglit
@@ -16,18 +16,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
-# shellcheck disable=SC2038,SC2185 # TODO: rewrite find
+find . -depth \( -name .git -o -name '*ninja*' -o -iname '*cmake*' -o -name '*.[chao]' \) -exec rm -rf {} \;
-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
-    # shellcheck disable=SC2038,SC2185 # TODO: rewrite find
+    find . -depth \
-    find ! -regex "^\.$" \
+         ! -regex "^\.$" \
          ! -regex "^\.\/piglit.*" \
          ! -regex "^\.\/framework.*" \
          ! -regex "^\.\/bin$" \
          ! -regex "^\.\/bin\/replayer\.py" \
          ! -regex "^\.\/templates.*" \
          ! -regex "^\.\/tests$" \
-         ! -regex "^\.\/tests\/replay\.py" 2>/dev/null | xargs rm -rf
+         ! -regex "^\.\/tests\/replay\.py" \
+         -exec rm -rf {} \; 2>/dev/null
 fi
 popd

.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
+# Rusticl requires at least Rust 1.66.0 and NAK requires 1.73.0
 #
 # Also, pick a specific snapshot from rustup so the compiler doesn't drift on
 # us.
-RUST_VERSION=1.66.1-2023-01-10
+RUST_VERSION=1.73.0-2023-10-05
 
 # For rust in Mesa, we use rustup to install.  This lets us pick an arbitrary
 # version of the compiler, rather than whatever the container's Debian comes

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

@@ -6,7 +6,7 @@
 # KERNEL_ROOTFS_TAG
 set -ex
 
-VKD3D_PROTON_COMMIT="2ad6cfdeaacdf47e2689e30a8fb5ac8193725f0d"
+VKD3D_PROTON_COMMIT="c3b385606a93baed42482d822805e0d9c2f3f603"
 
 VKD3D_PROTON_DST_DIR="/vkd3d-proton-tests"
 VKD3D_PROTON_SRC_DIR="/vkd3d-proton-src"

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

@@ -7,7 +7,7 @@
 
 set -ex
 
-VALIDATION_TAG="v1.3.263"
+VALIDATION_TAG="v1.3.281"
 
 git clone -b "$VALIDATION_TAG" --single-branch --depth 1 https://github.com/KhronosGroup/Vulkan-ValidationLayers.git
 pushd Vulkan-ValidationLayers

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

@@ -3,8 +3,17 @@
 
 set -ex
 
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_BUILD_TAG
+# DEBIAN_X86_64_TEST_ANDROID_TAG
+# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_X86_64_TEST_VK_TAG
+# FEDORA_X86_64_BUILD_TAG
+# KERNEL_ROOTFS_TAG
+
 export LIBWAYLAND_VERSION="1.21.0"
-export WAYLAND_PROTOCOLS_VERSION="1.31"
+export WAYLAND_PROTOCOLS_VERSION="1.34"
 
 git clone https://gitlab.freedesktop.org/wayland/wayland
 cd wayland

.gitlab-ci/container/container_post_build.sh

@@ -1,10 +1,12 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 if test -f /etc/debian_version; then
     apt-get autoremove -y --purge
 fi
 
-# Clean up any build cache for rust.
+# Clean up any build cache
+rm -rf /root/.cache
+rm -rf /root/.cargo
 rm -rf /.cargo
 
 if test -x /usr/bin/ccache; then

.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.  ming fails meson builds
+# lld because we're on old debian and it's buggy.  mingw fails meson builds
 # with it with "meson.build:21:0: ERROR: Unable to determine dynamic linker"
 find /usr/bin -name \*-ld -o -name ld | \
     grep -v mingw | \

.gitlab-ci/container/cross_build.sh

@@ -8,56 +8,62 @@ export DEBIAN_FRONTEND=noninteractive
 export LLVM_VERSION="${LLVM_VERSION:=15}"
 
 # Ephemeral packages (installed for this script and removed again at the end)
-STABLE_EPHEMERAL=" \
+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"
+)
 
 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 \
+apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
-        $EXTRA_LOCAL_PACKAGES \
+    $EXTRA_LOCAL_PACKAGES
-        $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-${LLVM_VERSION}-runtime" "llvm-${LLVM_VERSION}-linker-tools"
 
     # llvm-*-tools:$arch conflicts with python3:amd64. Install dependencies only
     # with apt-get, then force-install llvm-*-{dev,tools}:$arch with dpkg to get
     # around this.
     apt-get install -y --no-remove --no-install-recommends \
-            libclang-cpp${LLVM_VERSION}:$arch \
+            "libclang-cpp${LLVM_VERSION}:$arch" \
-            libgcc-s1:$arch \
+            "libgcc-s1:$arch" \
-            libtinfo-dev:$arch \
+            "libtinfo-dev:$arch" \
-            libz3-dev:$arch \
+            "libz3-dev:$arch" \
-            llvm-${LLVM_VERSION}:$arch \
+            "llvm-${LLVM_VERSION}:$arch" \
             zlib1g
 fi
 
@@ -68,19 +74,19 @@ fi
 
 
 # dependencies where we want a specific version
-EXTRA_MESON_ARGS="--cross-file=/cross_file-${arch}.txt -D libdir=lib/$(dpkg-architecture -A $arch -qDEB_TARGET_MULTIARCH)"
+MULTIARCH_PATH=$(dpkg-architecture -A $arch -qDEB_TARGET_MULTIARCH)
-. .gitlab-ci/container/build-libdrm.sh
+export EXTRA_MESON_ARGS="--cross-file=/cross_file-${arch}.txt -D libdir=lib/${MULTIARCH_PATH}"
-
 . .gitlab-ci/container/build-wayland.sh
 
-apt-get purge -y \
+. .gitlab-ci/container/build-directx-headers.sh
-        $STABLE_EPHEMERAL
+
+apt-get purge -y "${EPHEMERAL[@]}"
 
 . .gitlab-ci/container/container_post_build.sh
 
 # This needs to be done after container_post_build.sh, or apt-get breaks in there
 if [[ $arch != "armhf" ]]; then
-    apt-get download llvm-${LLVM_VERSION}-{dev,tools}:$arch
+    apt-get download llvm-"${LLVM_VERSION}"-{dev,tools}:"$arch"
-    dpkg -i --force-depends llvm-${LLVM_VERSION}-*_${arch}.deb
+    dpkg -i --force-depends llvm-"${LLVM_VERSION}"-*_"${arch}".deb
-    rm llvm-${LLVM_VERSION}-*_${arch}.deb
+    rm llvm-"${LLVM_VERSION}"-*_"${arch}".deb
 fi

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

@@ -1,15 +1,19 @@
 #!/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="\
+EPHEMERAL=(
-         autoconf \
+    autoconf
-         rdfind \
+    rdfind
-         unzip \
+    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
@@ -21,7 +25,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 | grep -E -i "clang-check|clang-tidy|lldb" | xargs rm -f
+find /${ndk}/ -type f \( -iname '*clang-check*' -o -iname '*clang-tidy*' -o -iname '*lldb*' \) -exec rm -f {} \;
 
 sh .gitlab-ci/container/create-android-ndk-pc.sh /$ndk zlib.pc "" "-lz" "1.2.3" $ANDROID_SDK_VERSION
 
@@ -30,33 +34,13 @@ 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" \
-    cd $LIBDRM_VERSION
+    . .gitlab-ci/container/build-libdrm.sh
-    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
@@ -106,4 +90,4 @@ done
 cd ..
 rm -rf $LIBELF_VERSION
 
-apt-get purge -y $EPHEMERAL
+apt-get purge -y "${EPHEMERAL[@]}"

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

@@ -8,67 +8,72 @@ 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
+# Ephemeral packages (installed for this script and removed again at the end)
-# the end)
+EPHEMERAL=(
-STABLE_EPHEMERAL=" \
+    libssl-dev
-        libssl-dev \
+)
-        "
 
-apt-get -y install \
+DEPS=(
-	${STABLE_EPHEMERAL} \
+    apt-utils
-	apt-utils \
+    android-libext4-utils
-	android-libext4-utils \
+    autoconf
-	autoconf \
+    automake
-	automake \
+    bc
-	bc \
+    bison
-	bison \
+    ccache
-	ccache \
+    cmake
-	cmake \
+    curl
-	curl \
+    fastboot
-	debootstrap \
+    flatbuffers-compiler
-	fastboot \
+    flex
-	flex \
+    g++
-	g++ \
+    git
-	git \
+    glslang-tools
-	glslang-tools \
+    kmod
-	kmod \
+    libasan8
-	libasan8 \
+    libdrm-dev
-	libdrm-dev \
+    libelf-dev
-	libelf-dev \
+    libexpat1-dev
-	libexpat1-dev \
+    libflatbuffers-dev
-	libvulkan-dev \
+    libvulkan-dev
-	libx11-dev \
+    libx11-dev
-	libx11-xcb-dev \
+    libx11-xcb-dev
-	libxcb-dri2-0-dev \
+    libxcb-dri2-0-dev
-	libxcb-dri3-dev \
+    libxcb-dri3-dev
-	libxcb-glx0-dev \
+    libxcb-glx0-dev
-	libxcb-present-dev \
+    libxcb-present-dev
-	libxcb-randr0-dev \
+    libxcb-randr0-dev
-	libxcb-shm0-dev \
+    libxcb-shm0-dev
-	libxcb-xfixes0-dev \
+    libxcb-xfixes0-dev
-	libxdamage-dev \
+    libxdamage-dev
-	libxext-dev \
+    libxext-dev
-	libxrandr-dev \
+    libxrandr-dev
-	libxshmfence-dev \
+    libxshmfence-dev
-	libxxf86vm-dev \
+    libxtensor-dev
-	libwayland-dev \
+    libxxf86vm-dev
-	libwayland-egl-backend-dev \
+    libwayland-dev
-	llvm-${LLVM_VERSION}-dev \
+    libwayland-egl-backend-dev
-	ninja-build \
+    "llvm-${LLVM_VERSION}-dev"
-	meson \
+    ninja-build
-	openssh-server \
+    meson
-	pkgconf \
+    openssh-server
-	python3-mako \
+    pkgconf
-	python3-pil \
+    python3-mako
-	python3-pip \
+    python3-pil
-	python3-requests \
+    python3-pip
-	python3-setuptools \
+    python3-pycparser
-	u-boot-tools \
+    python3-requests
-	xz-utils \
+    python3-setuptools
-	zlib1g-dev \
+    u-boot-tools
+    xz-utils
+    zlib1g-dev
     zstd
+)
+
+apt-get -y install "${DEPS[@]}" "${EPHEMERAL[@]}"
 
 pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
 
@@ -81,6 +86,6 @@ arch=armhf
 
 . .gitlab-ci/container/build-wayland.sh
 
-apt-get purge -y $STABLE_EPHEMERAL
+apt-get purge -y "${EPHEMERAL[@]}"
 
 . .gitlab-ci/container/container_post_build.sh

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

@@ -9,23 +9,29 @@ 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 \
+apt-get install -y --no-remove "${DEPS[@]}"
-        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 \

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

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 arch=ppc64el
 

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

@@ -1,16 +1,18 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
 arch=s390x
 
 # Ephemeral packages (installed for this script and removed again at the end)
-STABLE_EPHEMERAL="libssl-dev"
+EPHEMERAL=(
+    libssl-dev
+)
 
-apt-get -y install "$STABLE_EPHEMERAL"
+apt-get -y install "${EPHEMERAL[@]}"
 
 . .gitlab-ci/container/build-mold.sh
 
-apt-get purge -y "$STABLE_EPHEMERAL"
+apt-get purge -y "${EPHEMERAL[@]}"
 
 . .gitlab-ci/container/cross_build.sh

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

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 arch=i386
 

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

@@ -1,15 +0,0 @@
-#!/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

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

@@ -1,6 +1,10 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting
 
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_BUILD_TAG
+
 set -e
 set -o xtrace
 
@@ -9,85 +13,95 @@ 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)
-STABLE_EPHEMERAL=" \
+EPHEMERAL=(
-        "
+)
+
+DEPS=(
+    apt-utils
+    bison
+    ccache
+    curl
+    "clang-${LLVM_VERSION}"
+    "clang-format-${LLVM_VERSION}"
+    dpkg-cross
+    findutils
+    flex
+    flatbuffers-compiler
+    g++
+    cmake
+    gcc
+    git
+    glslang-tools
+    kmod
+    "libclang-${LLVM_VERSION}-dev"
+    "libclang-cpp${LLVM_VERSION}-dev"
+    "libclang-common-${LLVM_VERSION}-dev"
+    libelf-dev
+    libepoxy-dev
+    libexpat1-dev
+    libflatbuffers-dev
+    libgtk-3-dev
+    "libllvm${LLVM_VERSION}"
+    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
+    libxtensor-dev
+    libxxf86vm-dev
+    libwayland-egl-backend-dev
+    make
+    ninja-build
+    openssh-server
+    pkgconf
+    python3-mako
+    python3-pil
+    python3-pip
+    python3-ply
+    python3-pycparser
+    python3-requests
+    python3-setuptools
+    qemu-user
+    valgrind
+    x11proto-dri2-dev
+    x11proto-gl-dev
+    x11proto-randr-dev
+    xz-utils
+    zlib1g-dev
+    zstd
+)
 
 apt-get update
 
-apt-get install -y --no-remove \
+apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
-        $EXTRA_LOCAL_PACKAGES \
+        $EXTRA_LOCAL_PACKAGES
-        $STABLE_EPHEMERAL \
+
-        apt-utils \
+. .gitlab-ci/container/build-llvm-spirv.sh
-        bison \
+
-        ccache \
+. .gitlab-ci/container/build-libclc.sh
-        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
 
 # 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.2 for Rust's `debug_assertions`
+# We need at least 1.3.1 for rusticl
-pip3 install --break-system-packages meson==1.2.0
+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 $STABLE_EPHEMERAL
+apt-get purge -y "${EPHEMERAL[@]}"
 
 . .gitlab-ci/container/container_post_build.sh

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

@@ -1,78 +0,0 @@
-#!/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

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

@@ -1,125 +0,0 @@
-#!/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

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

@@ -1,13 +0,0 @@
-#!/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

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

@@ -12,49 +12,52 @@ export DEBIAN_FRONTEND=noninteractive
 export LLVM_VERSION="${LLVM_VERSION:=15}"
 
 # Ephemeral packages (installed for this script and removed again at the end)
-STABLE_EPHEMERAL=" \
+EPHEMERAL=(
-      autoconf \
+    autoconf
-      automake \
+    automake
-      autotools-dev \
+    autotools-dev
-      bzip2 \
+    bzip2
-      libtool \
+    libtool
-      libssl-dev \
+    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
+)
 
 apt-get update
 
 apt-get install -y --no-remove \
-      $STABLE_EPHEMERAL \
+      "${DEPS[@]}" "${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
@@ -72,20 +75,11 @@ tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
 cd $XORGMACROS_VERSION; ./configure; make install; cd ..
 rm -rf $XORGMACROS_VERSION
 
-. .gitlab-ci/container/build-llvm-spirv.sh
-
-. .gitlab-ci/container/build-libclc.sh
-
 . .gitlab-ci/container/build-wayland.sh
 
 . .gitlab-ci/container/build-shader-db.sh
 
-git clone https://github.com/microsoft/DirectX-Headers -b v1.711.3-preview --depth 1
+. .gitlab-ci/container/build-directx-headers.sh
-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
 
@@ -96,9 +90,15 @@ RUSTFLAGS='-L native=/usr/local/lib' cargo install \
   -j ${FDO_CI_CONCURRENT:-4} \
   --root /usr/local
 
+# install cbindgen
+RUSTFLAGS='-L native=/usr/local/lib' cargo install \
+  cbindgen --version 0.26.0 \
+  --locked \
+  -j ${FDO_CI_CONCURRENT:-4} \
+  --root /usr/local
+
 ############### Uninstall the build software
 
-apt-get purge -y \
+apt-get purge -y "${EPHEMERAL[@]}"
-      $STABLE_EPHEMERAL
 
 . .gitlab-ci/container/container_post_build.sh

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

@@ -1,8 +0,0 @@
-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)

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

@@ -1,7 +1,6 @@
 #!/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
@@ -9,20 +8,22 @@ set -o xtrace
 export DEBIAN_FRONTEND=noninteractive
 
 # Ephemeral packages (installed for this script and removed again at the end)
-STABLE_EPHEMERAL=" \
+EPHEMERAL=(
-      ccache \
+   build-essential:native
-      unzip \
+   ccache
-      dpkg-dev \
+   cmake
-      build-essential:native \
+   config-package-dev
-      config-package-dev \
+   debhelper-compat
-      debhelper-compat \
+   dpkg-dev
-      cmake \
+   ninja-build
-      ninja-build \
+   unzip
-      "
+)
 
-apt-get install -y --no-remove --no-install-recommends \
+DEPS=(
-      $STABLE_EPHEMERAL \
     iproute2
+)
+apt-get install -y --no-remove --no-install-recommends \
+      "${DEPS[@]}" "${EPHEMERAL[@]}"
 
 ############### Building ...
 
@@ -33,13 +34,14 @@ 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
+  -o "$ndk.zip" "https://dl.google.com/android/repository/$ndk-linux.zip"
-unzip -d / $ndk.zip
+unzip -d / "$ndk.zip"
-rm $ndk.zip
+rm "$ndk.zip"
 
 ############### Build dEQP runner
 
 export ANDROID_NDK_HOME=/$ndk
+export RUST_TARGET=x86_64-linux-android
 . .gitlab-ci/container/build-rust.sh
 . .gitlab-ci/container/build-deqp-runner.sh
 
@@ -48,6 +50,12 @@ rm -rf /root/.rustup
 
 ############### Build dEQP GL
 
+DEQP_API=GL \
+DEQP_TARGET="android" \
+EXTRA_CMAKE_ARGS="-DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=x86_64 -DDE_ANDROID_API=28" \
+. .gitlab-ci/container/build-deqp.sh
+
+DEQP_API=GLES \
 DEQP_TARGET="android" \
 EXTRA_CMAKE_ARGS="-DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=x86_64 -DDE_ANDROID_API=28" \
 . .gitlab-ci/container/build-deqp.sh
@@ -72,8 +80,14 @@ popd
 
 ############### Building and installing Debian package ...
 
-git clone --depth 1 https://github.com/google/android-cuttlefish.git
+ANDROID_CUTTLEFISH_VERSION=f6494d9fbeaa9974b56923e3029909e5d5f440dd
+
+mkdir android-cuttlefish
 pushd android-cuttlefish
+git init
+git remote add origin https://github.com/google/android-cuttlefish.git
+git fetch --depth 1 origin "$ANDROID_CUTTLEFISH_VERSION"
+git checkout FETCH_HEAD
 
 pushd base
 dpkg-buildpackage -uc -us
@@ -91,9 +105,6 @@ usermod -a -G kvm,cvdnetwork root
 
 rm -rf "/${ndk:?}"
 
-ccache --show-stats
+apt-get purge -y "${EPHEMERAL[@]}"
 
-apt-get purge -y \
+. .gitlab-ci/container/container_post_build.sh
-      $STABLE_EPHEMERAL
-
-apt-get autoremove -y --purge

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

@@ -14,51 +14,92 @@ 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
+# Ephemeral packages (installed for this script and removed again at the end)
-# the end)
+EPHEMERAL=(
-STABLE_EPHEMERAL=" \
+    autoconf
-      autoconf \
+    automake
-      automake \
+    bc
-      bc \
+    bison
-      bison \
+    bzip2
-      bzip2 \
+    ccache
-      ccache \
+    cmake
-      cmake \
+    "clang-${LLVM_VERSION}"
-      clang-${LLVM_VERSION} \
+    flex
-      flex \
+    glslang-tools
-      glslang-tools \
+    g++
-      g++ \
+    libasound2-dev
-      libasound2-dev \
+    libcap-dev
-      libcap-dev \
+    "libclang-cpp${LLVM_VERSION}-dev"
-      libclang-cpp${LLVM_VERSION}-dev \
+    libdrm-dev
-      libdrm-dev \
+    libegl-dev
-      libegl-dev \
+    libelf-dev
-      libelf-dev \
+    libepoxy-dev
-      libepoxy-dev \
+    libgbm-dev
-      libgbm-dev \
+    libpciaccess-dev
-      libpciaccess-dev \
     libssl-dev
-      libvulkan-dev \
+    libvulkan-dev
-      libwayland-dev \
+    libwayland-dev
-      libx11-xcb-dev \
+    libx11-xcb-dev
-      libxext-dev \
+    libxext-dev
-      llvm-${LLVM_VERSION}-dev \
+    "llvm-${LLVM_VERSION}-dev"
-      make \
+    make
-      meson \
+    meson
-      openssh-server \
+    openssh-server
-      patch \
+    patch
-      pkgconf \
+    pkgconf
-      protobuf-compiler \
+    protobuf-compiler
-      python3-dev \
+    python3-dev
-      python3-pip \
+    python3-pip
-      python3-setuptools \
+    python3-setuptools
-      python3-wheel \
+    python3-wheel
-      spirv-tools \
+    spirv-tools
-      wayland-protocols \
+    wayland-protocols
-      xz-utils \
+    xz-utils
-      "
+)
+
+DEPS=(
+    apt-utils
+    curl
+    git
+    git-lfs
+    inetutils-syslogd
+    iptables
+    jq
+    libasan8
+    libdrm2
+    libexpat1
+    "libllvm${LLVM_VERSION}"
+    liblz4-1
+    libpng16-16
+    libpython3.11
+    libvulkan1
+    libwayland-client0
+    libwayland-server0
+    libxcb-ewmh2
+    libxcb-randr0
+    libxcb-xfixes0
+    libxkbcommon0
+    libxrandr2
+    libxrender1
+    python3-mako
+    python3-numpy
+    python3-packaging
+    python3-pil
+    python3-requests
+    python3-six
+    python3-yaml
+    socat
+    vulkan-tools
+    waffle-utils
+    xauth
+    xvfb
+    zlib1g
+    zstd
+)
 
 apt-get update
 apt-get dist-upgrade -y
@@ -66,48 +107,9 @@ apt-get dist-upgrade -y
 apt-get install --purge -y \
       sysvinit-core libelogind0
 
-apt-get install -y --no-remove \
+apt-get install -y --no-remove "${DEPS[@]}"
-      apt-utils \
-      curl \
-      git \
-      git-lfs \
-      inetutils-syslogd \
-      iptables \
-      jq \
-      libasan8 \
-      libdrm2 \
-      libexpat1 \
-      libllvm${LLVM_VERSION} \
-      liblz4-1 \
-      libpng16-16 \
-      libpython3.11 \
-      libvulkan1 \
-      libwayland-client0 \
-      libwayland-server0 \
-      libxcb-ewmh2 \
-      libxcb-randr0 \
-      libxcb-xfixes0 \
-      libxkbcommon0 \
-      libxrandr2 \
-      libxrender1 \
-      python3-mako \
-      python3-numpy \
-      python3-packaging \
-      python3-pil \
-      python3-requests \
-      python3-six \
-      python3-yaml \
-      socat \
-      vulkan-tools \
-      waffle-utils \
-      xauth \
-      xvfb \
-      zlib1g \
-      zstd
-
-apt-get install -y --no-install-recommends \
-      $STABLE_EPHEMERAL
 
+apt-get install -y --no-install-recommends "${EPHEMERAL[@]}"
 
 . .gitlab-ci/container/container_pre_build.sh
 
@@ -150,11 +152,9 @@ pip3 install --break-system-packages yq
 ############### Build dEQP runner
 . .gitlab-ci/container/build-deqp-runner.sh
 
-rm -rf /root/.cargo
+
+apt-get purge -y "${EPHEMERAL[@]}"
+
 rm -rf /root/.rustup
 
-ccache --show-stats
+. .gitlab-ci/container/container_post_build.sh
-
-apt-get purge -y $STABLE_EPHEMERAL
-
-apt-get autoremove -y --purge

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

@@ -10,60 +10,68 @@ export LLVM_VERSION="${LLVM_VERSION:=15}"
 apt-get install -y libelogind0  # this interfere with systemd deps, install separately
 
 # Ephemeral packages (installed for this script and removed again at the end)
-STABLE_EPHEMERAL=" \
+EPHEMERAL=(
-      bzip2 \
+    bzip2
-      ccache \
+    ccache
-      clang-${LLVM_VERSION} \
+    "clang-${LLVM_VERSION}"
-      cmake \
+    cmake
-      g++ \
+    g++
-      glslang-tools \
+    glslang-tools
-      libasound2-dev \
+    libasound2-dev
-      libcap-dev \
+    libcap-dev
-      libclang-cpp${LLVM_VERSION}-dev \
+    "libclang-cpp${LLVM_VERSION}-dev"
-      libdrm-dev \
+    libdrm-dev
-      libgles2-mesa-dev \
+    libgles2-mesa-dev
-      libpciaccess-dev \
+    libgtest-dev
-      libpng-dev \
+    libpciaccess-dev
-      libudev-dev \
+    libpng-dev
-      libvulkan-dev \
+    libudev-dev
-      libwaffle-dev \
+    libvulkan-dev
-      libwayland-dev \
+    libwaffle-dev
-      libx11-xcb-dev \
+    libwayland-dev
-      libxcb-dri2-0-dev \
+    libx11-xcb-dev
-      libxkbcommon-dev \
+    libxcb-dri2-0-dev
-      libxrandr-dev \
+    libxcb-dri3-dev
-      libxrender-dev \
+    libxcb-present-dev
-      llvm-${LLVM_VERSION}-dev \
+    libxfixes-dev
-      make \
+    libxkbcommon-dev
-      meson \
+    libxrandr-dev
-      ocl-icd-opencl-dev \
+    libxrender-dev
-      patch \
+    "llvm-${LLVM_VERSION}-dev"
-      pkgconf \
+    make
-      python3-distutils \
+    meson
-      xz-utils \
+    ocl-icd-opencl-dev
-      "
+    patch
+    pkgconf
+    python3-distutils
+    xz-utils
+)
+
+DEPS=(
+    clinfo
+    iptables
+    kmod
+    "libclang-common-${LLVM_VERSION}-dev"
+    "libclang-cpp${LLVM_VERSION}"
+    libcap2
+    libegl1
+    libepoxy0
+    libfdt1
+    libxcb-shm0
+    ocl-icd-libopencl1
+    python3-lxml
+    python3-renderdoc
+    python3-simplejson
+    spirv-tools
+    sysvinit-core
+    weston
+    xwayland
+)
 
 apt-get update
 
-apt-get install -y --no-remove \
+apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
-      $EXTRA_LOCAL_PACKAGES \
+      $EXTRA_LOCAL_PACKAGES
-      $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
@@ -74,7 +82,13 @@ PIGLIT_OPTS="-DPIGLIT_BUILD_GLX_TESTS=ON -DPIGLIT_BUILD_CL_TESTS=ON -DPIGLIT_BUI
 
 ############### Build dEQP GL
 
-DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh
+DEQP_API=GL \
+DEQP_TARGET=surfaceless \
+. .gitlab-ci/container/build-deqp.sh
+
+DEQP_API=GLES \
+DEQP_TARGET=surfaceless \
+. .gitlab-ci/container/build-deqp.sh
 
 ############### Build apitrace
 
@@ -84,11 +98,12 @@ DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh
 
 . .gitlab-ci/container/build-vulkan-validation.sh
 
+############### Build nine tests
+
+. .gitlab-ci/container/build-ninetests.sh
+
 ############### Uninstall the build software
 
-ccache --show-stats
+apt-get purge -y "${EPHEMERAL[@]}"
 
-apt-get purge -y \
+. .gitlab-ci/container/container_post_build.sh
-      $STABLE_EPHEMERAL
-
-apt-get autoremove -y --purge

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

@@ -11,65 +11,64 @@ export DEBIAN_FRONTEND=noninteractive
 apt-get install -y libelogind0  # this interfere with systemd deps, install separately
 
 # Ephemeral packages (installed for this script and removed again at the end)
-STABLE_EPHEMERAL=" \
+EPHEMERAL=(
-      ccache \
+    ccache
-      cmake \
+    cmake
-      g++ \
+    g++
-      g++-mingw-w64-i686-posix \
+    glslang-tools
-      g++-mingw-w64-x86-64-posix \
+    libexpat1-dev
-      glslang-tools \
+    gnupg2
-      libexpat1-dev \
+    libdrm-dev
-      gnupg2 \
+    libgbm-dev
-      libdrm-dev \
+    libgles2-mesa-dev
-      libgbm-dev \
+    liblz4-dev
-      libgles2-mesa-dev \
+    libpciaccess-dev
-      liblz4-dev \
+    libudev-dev
-      libpciaccess-dev \
+    libvulkan-dev
-      libudev-dev \
+    libwaffle-dev
-      libvulkan-dev \
+    libx11-xcb-dev
-      libwaffle-dev \
+    libxcb-dri2-0-dev
-      libx11-xcb-dev \
+    libxcb-ewmh-dev
-      libxcb-ewmh-dev \
+    libxcb-keysyms1-dev
-      libxcb-keysyms1-dev \
+    libxkbcommon-dev
-      libxkbcommon-dev \
+    libxrandr-dev
-      libxrandr-dev \
+    libxrender-dev
-      libxrender-dev \
+    libzstd-dev
-      libzstd-dev \
+    meson
-      meson \
+    p7zip
-      mingw-w64-i686-dev \
+    patch
-      mingw-w64-tools \
+    pkgconf
-      mingw-w64-x86-64-dev \
+    python3-dev
-      p7zip \
+    python3-distutils
-      patch \
+    python3-pip
-      pkgconf \
+    python3-setuptools
-      python3-dev \
+    python3-wheel
-      python3-distutils \
+    software-properties-common
-      python3-pip \
+    wine64-tools
-      python3-setuptools \
+    xz-utils
-      python3-wheel \
+)
-      software-properties-common \
+
-      wine64-tools \
+DEPS=(
-      xz-utils \
+    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
 
 apt-get install -y --no-remove --no-install-recommends \
-      $STABLE_EPHEMERAL \
+      "${DEPS[@]}" "${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
 
@@ -105,6 +104,8 @@ PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/container/build-piglit.sh
 
 ############### Build dEQP VK
 
+DEQP_API=VK \
+DEQP_TARGET=default \
 . .gitlab-ci/container/build-deqp.sh
 
 ############### Build apitrace
@@ -123,11 +124,6 @@ PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/container/build-piglit.sh
 
 ############### Uninstall the build software
 
-ccache --show-stats
+apt-get purge -y "${EPHEMERAL[@]}"
 
-apt-get purge -y \
+. .gitlab-ci/container/container_post_build.sh
-      $STABLE_EPHEMERAL
-
-apt-get autoremove -y --purge
-
-#dpkg -r --force-depends "mesa-vulkan-drivers" "mesa-vdpau-drivers" "mesa-va-drivers" "libgl1-mesa-dri" "libglx-mesa0" "vdpau-driver-all" "va-driver-all" "libglx0" "libgl1" "libvdpau-va-gl1" "libglu1-mesa" "libegl-mesa0" "libgl1-mesa-dri" "libglapi-mesa" "libosmesa6"

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

@@ -27,9 +27,11 @@ EPHEMERAL=(
 DEPS=(
     bindgen
     bison
+    cbindgen
     ccache
     clang-devel
     flex
+    flatbuffers-compiler
     gcc
     gcc-c++
     gettext
@@ -41,6 +43,7 @@ DEPS=(
     "pkgconfig(SPIRV-Tools)"
     "pkgconfig(dri2proto)"
     "pkgconfig(expat)"
+    "pkgconfig(flatbuffers)"
     "pkgconfig(glproto)"
     "pkgconfig(libclc)"
     "pkgconfig(libelf)"
@@ -66,6 +69,7 @@ DEPS=(
     "pkgconfig(xfixes)"
     "pkgconfig(xrandr)"
     "pkgconfig(xshmfence)"
+    "pkgconfig(xtensor)"
     "pkgconfig(xxf86vm)"
     "pkgconfig(zlib)"
     procps-ng
@@ -73,6 +77,7 @@ DEPS=(
     python3-devel
     python3-mako
     python3-ply
+    python3-pycparser
     rust-packaging
     vulkan-headers
     spirv-tools-devel
@@ -96,8 +101,8 @@ 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.2 for Rust's `debug_assertions`
+# We need at least 1.3.1 for rusticl
-pip install meson==1.2.0
+pip install meson==1.3.1
 
 . .gitlab-ci/container/build-mold.sh
 

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

@@ -23,10 +23,6 @@
   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
@@ -44,14 +40,16 @@
 # 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
     - .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
@@ -67,12 +65,18 @@ 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}
+    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]
 
 .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}
@@ -87,6 +91,10 @@ 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:
@@ -115,24 +123,6 @@ 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:
@@ -190,11 +180,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}--${KERNEL_TAG}"
+    MESA_IMAGE_TAG: &debian-x86_64_test-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}--${KERNEL_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}
@@ -235,7 +226,7 @@ debian/x86_64_test-vk:
     - debian/x86_64_test-vk
 
 # Debian based x86_64 test image for Android
-debian/x86_64_test-android:
+.debian/x86_64_test-android:
   extends: .use-debian/x86_64_test-base
   variables:
     MESA_IMAGE_TAG: &debian-x86_64_test-android ${DEBIAN_X86_64_TEST_ANDROID_TAG}
@@ -256,10 +247,11 @@ debian/arm64_build:
   extends:
     - .fdo.container-build@debian
     - .container
+    - .debian-container
   tags:
     - aarch64
   variables:
-    MESA_IMAGE_TAG: &debian-arm64_build ${DEBIAN_BASE_TAG}
+    MESA_IMAGE_TAG: &debian-arm64_build "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
 
 .use-debian/arm64_build:
   extends:
@@ -278,7 +270,8 @@ debian/arm64_build:
     - .fdo.container-build@alpine
     - .container
   variables:
-    FDO_DISTRIBUTION_VERSION: "3.18"
+    FDO_DISTRIBUTION_VERSION: "edge"  # switch to 3.20 when gets released
+    FDO_BASE_IMAGE: alpine:$FDO_DISTRIBUTION_VERSION  # since cbuild ignores it
 
 # Alpine based x86_64 build image
 alpine/x86_64_build:
@@ -325,6 +318,7 @@ fedora/x86_64_build:
 .kernel+rootfs:
   extends:
     - .container+build-rules
+    - .debian-container
   stage: container
   variables:
     GIT_STRATEGY: fetch
@@ -373,6 +367,7 @@ kernel+rootfs_arm32:
   extends:
     - .fdo.container-build@debian
     - .container
+    - .debian-container
     # Don't want the .container rules
     - .container+build-rules
   variables:
@@ -388,7 +383,7 @@ debian/arm32_test:
   needs:
     - kernel+rootfs_arm32
   variables:
-    MESA_IMAGE_TAG: &debian-arm32_test ${DEBIAN_BASE_TAG}
+    MESA_IMAGE_TAG: &debian-arm32_test "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
 
 debian/arm64_test:
   extends:
@@ -396,7 +391,7 @@ debian/arm64_test:
   needs:
     - kernel+rootfs_arm64
   variables:
-    MESA_IMAGE_TAG: &debian-arm64_test ${DEBIAN_BASE_TAG}
+    MESA_IMAGE_TAG: &debian-arm64_test "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}"
 
 .use-debian/arm_test:
   variables:
@@ -434,7 +429,7 @@ 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-vs2019:
+.windows-docker-msvc:
   variables:
     MESA_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}"
     MESA_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MESA_IMAGE_PATH:${MESA_IMAGE_TAG}"
@@ -446,7 +441,7 @@ debian/arm64_test:
     default: [retry]
   extends:
     - .container
-    - .windows-docker-vs2019
+    - .windows-docker-msvc
     - .windows-shell-tags
   rules:
     - !reference [.microsoft-farm-container-rules, rules]
@@ -457,18 +452,18 @@ debian/arm64_test:
   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_vs2019:
+windows_msvc:
   inherit:
     default: [retry]
   extends:
     - .windows_container_build
   variables:
-    MESA_IMAGE_PATH: &windows_vs_image_path ${WINDOWS_X64_VS_PATH}
+    MESA_IMAGE_PATH: &windows_msvc_image_path ${WINDOWS_X64_MSVC_PATH}
-    MESA_IMAGE_TAG: &windows_vs_image_tag ${WINDOWS_X64_VS_TAG}
+    MESA_IMAGE_TAG: ${WINDOWS_X64_MSVC_TAG}
-    DOCKERFILE: Dockerfile_vs
+    DOCKERFILE: Dockerfile_msvc
     MESA_BASE_IMAGE: "mcr.microsoft.com/windows/server:ltsc2022"
 
-windows_build_vs2019:
+windows_build_msvc:
   inherit:
     default: [retry]
   extends:
@@ -478,16 +473,15 @@ windows_build_vs2019:
     - !reference [.container+build-rules, rules]
   variables:
     MESA_IMAGE_PATH: &windows_build_image_path ${WINDOWS_X64_BUILD_PATH}
-    MESA_IMAGE_TAG: &windows_build_image_tag ${MESA_BASE_IMAGE_TAG}--${WINDOWS_X64_BUILD_TAG}
+    MESA_IMAGE_TAG: &windows_build_image_tag ${WINDOWS_X64_MSVC_TAG}--${WINDOWS_X64_BUILD_TAG}
     DOCKERFILE: Dockerfile_build
-    MESA_BASE_IMAGE_PATH: *windows_vs_image_path
+    MESA_BASE_IMAGE_PATH: *windows_msvc_image_path
-    MESA_BASE_IMAGE_TAG: *windows_vs_image_tag
+    MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_BASE_IMAGE_PATH}:${WINDOWS_X64_MSVC_TAG}"
-    MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_BASE_IMAGE_PATH}:${MESA_BASE_IMAGE_TAG}"
   timeout: 2h 30m # LLVM takes ages
   needs:
-    - windows_vs2019
+    - windows_msvc
 
-windows_test_vs2019:
+windows_test_msvc:
   inherit:
     default: [retry]
   extends:
@@ -497,33 +491,30 @@ windows_test_vs2019:
     - !reference [.container+build-rules, rules]
   variables:
     MESA_IMAGE_PATH: &windows_test_image_path ${WINDOWS_X64_TEST_PATH}
-    MESA_IMAGE_TAG: &windows_test_image_tag ${MESA_BASE_IMAGE_TAG}--${WINDOWS_X64_TEST_TAG}
+    MESA_IMAGE_TAG: &windows_test_image_tag ${WINDOWS_X64_MSVC_TAG}--${WINDOWS_X64_TEST_TAG}
     DOCKERFILE: Dockerfile_test
-    MESA_BASE_IMAGE_PATH: *windows_vs_image_path
+    MESA_BASE_IMAGE_PATH: *windows_msvc_image_path
-    MESA_BASE_IMAGE_TAG: *windows_vs_image_tag
+    MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_BASE_IMAGE_PATH}:${WINDOWS_X64_MSVC_TAG}"
-    MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_BASE_IMAGE_PATH}:${MESA_BASE_IMAGE_TAG}"
   timeout: 2h 30m
   needs:
-    - windows_vs2019
+    - windows_msvc
 
-.use-windows_build_vs2019:
+.use-windows_build_msvc:
   inherit:
     default: [retry]
-  extends: .windows-docker-vs2019
+  extends: .windows-docker-msvc
   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_vs2019
+    - windows_build_msvc
 
-.use-windows_test_vs2019:
+.use-windows_test_msvc:
   inherit:
     default: [retry]
-  extends: .windows-docker-vs2019
+  extends: .windows-docker-msvc
   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

.gitlab-ci/container/lava_build.sh

@@ -62,6 +62,19 @@ elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then
     DEVICE_TREES+=" 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"
@@ -69,7 +82,9 @@ else
     DEFCONFIG="arch/x86/configs/x86_64_defconfig"
     DEVICE_TREES=""
     KERNEL_IMAGE_NAME="bzImage"
-    ARCH_PACKAGES="libasound2-dev libcap-dev libfdt-dev libva-dev wayland-protocols p7zip"
+    CONTAINER_ARCH_PACKAGES=(
+      libasound2-dev libcap-dev libfdt-dev libva-dev wayland-protocols p7zip wine
+    )
 fi
 
 # Determine if we're in a cross build.
@@ -89,66 +104,57 @@ 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' \
-                   ${EXTRA_LOCAL_PACKAGES} \
+		   "${CONTAINER_EPHEMERAL[@]}" \
-                   ${ARCH_PACKAGES} \
+                   "${CONTAINER_ARCH_PACKAGES[@]}" \
-                   automake \
+                   ${EXTRA_LOCAL_PACKAGES}
-                   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
-
-
-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"
@@ -190,6 +196,7 @@ PKG_DEP=(
 )
 [ "$DEBIAN_ARCH" = "amd64" ] && PKG_ARCH=(
   firmware-amd-graphics
+  firmware-misc-nonfree
   libgl1 libglu1-mesa
   inetutils-syslogd iptables libcap2
   libfontconfig1
@@ -212,7 +219,8 @@ mmdebstrap \
     --include "${PKG_BASE[*]} ${PKG_CI[*]} ${PKG_DEP[*]} ${PKG_MESA_DEP[*]} ${PKG_ARCH[*]}" \
     bookworm \
     "$ROOTFS/" \
-    "http://deb.debian.org/debian"
+    "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
@@ -264,7 +272,17 @@ mv /usr/local/bin/*-runner $ROOTFS/usr/bin/.
 
 
 ############### Build dEQP
-DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh
+DEQP_API=GL \
+DEQP_TARGET=surfaceless \
+. .gitlab-ci/container/build-deqp.sh
+
+DEQP_API=GLES \
+DEQP_TARGET=surfaceless \
+. .gitlab-ci/container/build-deqp.sh
+
+DEQP_API=VK \
+DEQP_TARGET=default \
+. .gitlab-ci/container/build-deqp.sh
 
 mv /deqp $ROOTFS/.
 
@@ -316,6 +334,11 @@ 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/.

.gitlab-ci/container/patches/build-deqp-gl_Allow-running-on-Android-from-the-command-line.patch

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

.gitlab-ci/container/patches/build-deqp-gles_Allow-running-on-Android-from-the-command-line.patch

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

.gitlab-ci/container/patches/build-deqp-gles_Android-prints-to-stdout-instead-of-logcat.patch

@@ -0,0 +1,26 @@
+From a602822c53e22e985f942f843ccadbfb64613212 Mon Sep 17 00:00:00 2001
+From: Helen Koike <helen.koike@collabora.com>
+Date: Tue, 27 Sep 2022 12:35:22 -0300
+Subject: [PATCH 2/2] Android prints to stdout instead of logcat
+
+Signed-off-by: Helen Koike <helen.koike@collabora.com>
+---
+ framework/qphelper/qpDebugOut.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/framework/qphelper/qpDebugOut.c b/framework/qphelper/qpDebugOut.c
+index 6579e9f48..c200c6f6b 100644
+--- a/framework/qphelper/qpDebugOut.c
++++ b/framework/qphelper/qpDebugOut.c
+@@ -98,7 +98,7 @@ void qpDiev (const char* format, va_list args)
+ }
+ 
+ /* print() implementation. */
+-#if (DE_OS == DE_OS_ANDROID)
++#if (0)
+ 
+ #include <android/log.h>
+ 
+-- 
+2.42.0
+

.gitlab-ci/container/patches/build-deqp-vk_Android-prints-to-stdout-instead-of-logcat.patch

@@ -0,0 +1,26 @@
+From a602822c53e22e985f942f843ccadbfb64613212 Mon Sep 17 00:00:00 2001
+From: Helen Koike <helen.koike@collabora.com>
+Date: Tue, 27 Sep 2022 12:35:22 -0300
+Subject: [PATCH 2/2] Android prints to stdout instead of logcat
+
+Signed-off-by: Helen Koike <helen.koike@collabora.com>
+---
+ framework/qphelper/qpDebugOut.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/framework/qphelper/qpDebugOut.c b/framework/qphelper/qpDebugOut.c
+index 6579e9f48..c200c6f6b 100644
+--- a/framework/qphelper/qpDebugOut.c
++++ b/framework/qphelper/qpDebugOut.c
+@@ -98,7 +98,7 @@ void qpDiev (const char* format, va_list args)
+ }
+ 
+ /* print() implementation. */
+-#if (DE_OS == DE_OS_ANDROID)
++#if (0)
+ 
+ #include <android/log.h>
+ 
+-- 
+2.42.0
+

.gitlab-ci/crosvm-runner.sh

@@ -96,7 +96,7 @@ set +e -x
 NIR_DEBUG="novalidate" \
 LIBGL_ALWAYS_SOFTWARE=${CROSVM_LIBGL_ALWAYS_SOFTWARE} \
 GALLIUM_DRIVER=${CROSVM_GALLIUM_DRIVER} \
-VK_ICD_FILENAMES=$CI_PROJECT_DIR/install/share/vulkan/icd.d/${CROSVM_VK_DRIVER}_icd.x86_64.json \
+VK_DRIVER_FILES=$CI_PROJECT_DIR/install/share/vulkan/icd.d/${CROSVM_VK_DRIVER}_icd.x86_64.json \
 crosvm --no-syslog run \
     --gpu "${CROSVM_GPU_ARGS}" --gpu-render-server "path=/usr/local/libexec/virgl_render_server" \
     -m "${CROSVM_MEMORY:-4096}" -c "${CROSVM_CPU:-2}" --disable-sandbox \

.gitlab-ci/cuttlefish-runner.sh

@@ -48,7 +48,7 @@ $ADB shell setenforce 0
 # deqp
 
 $ADB push /deqp/modules/egl/deqp-egl-android /data/.
-$ADB push /deqp/assets/gl_cts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-master.txt /data/.
+$ADB push /deqp/assets/gl_cts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-main.txt /data/
 $ADB push /deqp-runner/deqp-runner /data/.
 
 # download Android Mesa from S3

.gitlab-ci/deqp-runner.sh

@@ -18,7 +18,7 @@ INSTALL=$(realpath -s "$PWD"/install)
 # Set up the driver environment.
 export LD_LIBRARY_PATH="$INSTALL"/lib/:$LD_LIBRARY_PATH
 export EGL_PLATFORM=surfaceless
-export VK_ICD_FILENAMES="$PWD"/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.${VK_CPU:-$(uname -m)}.json
+export VK_DRIVER_FILES="$PWD"/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.${VK_CPU:-$(uname -m)}.json
 export OCL_ICD_VENDORS="$PWD"/install/etc/OpenCL/vendors/
 
 if [ -n "$USE_ANGLE" ]; then
@@ -46,7 +46,6 @@ if [ -z "$DEQP_SUITE" ]; then
     DEQP_WIDTH=${DEQP_WIDTH:-256}
     DEQP_HEIGHT=${DEQP_HEIGHT:-256}
     DEQP_CONFIG=${DEQP_CONFIG:-rgba8888d24s8ms0}
-    DEQP_VARIANT=${DEQP_VARIANT:-master}
 
     DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-width=$DEQP_WIDTH --deqp-surface-height=$DEQP_HEIGHT"
     DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-type=${DEQP_SURFACE_TYPE:-pbuffer}"
@@ -60,16 +59,16 @@ if [ -z "$DEQP_SUITE" ]; then
 
     # Generate test case list file.
     if [ "$DEQP_VER" = "vk" ]; then
-       MUSTPASS=/deqp/mustpass/vk-$DEQP_VARIANT.txt
+       MUSTPASS=/deqp/mustpass/vk-main.txt
        DEQP=/deqp/external/vulkancts/modules/vulkan/deqp-vk
     elif [ "$DEQP_VER" = "gles2" ] || [ "$DEQP_VER" = "gles3" ] || [ "$DEQP_VER" = "gles31" ] || [ "$DEQP_VER" = "egl" ]; then
-       MUSTPASS=/deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt
+       MUSTPASS=/deqp/mustpass/$DEQP_VER-main.txt
        DEQP=/deqp/modules/$DEQP_VER/deqp-$DEQP_VER
     elif [ "$DEQP_VER" = "gles2-khr" ] || [ "$DEQP_VER" = "gles3-khr" ] || [ "$DEQP_VER" = "gles31-khr" ] || [ "$DEQP_VER" = "gles32-khr" ]; then
-       MUSTPASS=/deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt
+       MUSTPASS=/deqp/mustpass/$DEQP_VER-main.txt
        DEQP=/deqp/external/openglcts/modules/glcts
     else
-       MUSTPASS=/deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt
+       MUSTPASS=/deqp/mustpass/$DEQP_VER-main.txt
        DEQP=/deqp/external/openglcts/modules/glcts
     fi
 
@@ -132,6 +131,9 @@ if [ -n "$VK_DRIVER" ] && [ -z "$DEQP_SUITE" ]; then
 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() {
@@ -166,7 +168,13 @@ fi
 
 uncollapsed_section_switch deqp "deqp: deqp-runner"
 
-echo "deqp $(cat /deqp/version)"
+# Print the detailed version with the list of backports and local patches
+for api in vk gl gles; do
+  deqp_version_log=/deqp/version-$api
+  if [ -r "$deqp_version_log" ]; then
+    cat "$deqp_version_log"
+  fi
+done
 
 set +e
 if [ -z "$DEQP_SUITE" ]; then
@@ -183,6 +191,10 @@ if [ -z "$DEQP_SUITE" ]; then
         -- \
         $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 \
@@ -223,7 +235,7 @@ deqp-runner junit \
    --results $RESULTS/failures.csv \
    --output $RESULTS/junit.xml \
    --limit 50 \
-   --template "See https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/results/{{testcase}}.xml"
+   --template "See $ARTIFACTS_BASE_URL/results/{{testcase}}.xml"
 
 # Report the flakes to the IRC channel for monitoring (if configured):
 if [ -n "$FLAKES_CHANNEL" ]; then

.gitlab-ci/farm-rules.yml

@@ -237,6 +237,46 @@
       when: never
     - !reference [.freedreno-farm-rules, rules]
 
+.vmware-farm-rules:
+  rules:
+    - exists: [ .ci-farms-disabled/vmware ]
+      when: never
+    - changes: [ .ci-farms-disabled/vmware ]
+      if: '$CI_PIPELINE_SOURCE != "schedule"'
+      when: on_success
+    - changes: [ .ci-farms-disabled/* ]
+      if: '$CI_PIPELINE_SOURCE != "schedule"'
+      when: never
+
+.vmware-farm-manual-rules:
+  rules:
+    - exists: [ .ci-farms-disabled/vmware ]
+      when: never
+    - changes: [ .ci-farms-disabled/vmware ]
+      if: '$CI_PIPELINE_SOURCE != "schedule"'
+      when: never
+    - !reference [.vmware-farm-rules, rules]
+
+.ondracka-farm-rules:
+  rules:
+    - exists: [ .ci-farms-disabled/ondracka ]
+      when: never
+    - changes: [ .ci-farms-disabled/ondracka ]
+      if: '$CI_PIPELINE_SOURCE != "schedule"'
+      when: on_success
+    - changes: [ .ci-farms-disabled/* ]
+      if: '$CI_PIPELINE_SOURCE != "schedule"'
+      when: never
+
+.ondracka-farm-manual-rules:
+  rules:
+    - exists: [ .ci-farms-disabled/ondracka ]
+      when: never
+    - changes: [ .ci-farms-disabled/ondracka ]
+      if: '$CI_PIPELINE_SOURCE != "schedule"'
+      when: never
+    - !reference [.ondracka-farm-rules, rules]
+
 
 # Skip container & build jobs when disabling any farm, and run them if any
 # farm gets re-enabled.
@@ -286,6 +326,14 @@
       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
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes: [ .ci-farms-disabled/vmware ]
+      exists: [ .ci-farms-disabled/vmware ]
+      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"'

.gitlab-ci/fossilize-runner.sh

@@ -11,7 +11,7 @@ INSTALL=$PWD/install
 
 # Set up the driver environment.
 export LD_LIBRARY_PATH="$INSTALL/lib/"
-export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
+export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
 
 # To store Fossilize logs on failure.
 RESULTS="$PWD/results"

.gitlab-ci/gtest-runner.sh

@@ -55,7 +55,7 @@ deqp-runner junit \
    --results $RESULTS/failures.csv \
    --output $RESULTS/junit.xml \
    --limit 50 \
-   --template "See https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/results/{{testcase}}.xml"
+   --template "See $ARTIFACTS_BASE_URL/results/{{testcase}}.xml"
 
 # Report the flakes to the IRC channel for monitoring (if configured):
 if [ -n "$FLAKES_CHANNEL" ]; then

.gitlab-ci/image-tags.yml

@@ -1,19 +1,22 @@
-# Keep the tags below under 25-30 chars each, as they end up combined into
+# Keep the tags below under 20 chars each, as they end up combined into
 # docker image tags, and docker has a length limit of 128 chars total in tags.
 #
+# The word after the date doesn't need to be overly descriptive, it exists
+# purely to avoid the risk of two people updating an image tag on the same day
+# while working on different changes, so it doesn't matter whether that word
+# will make sense to someone else. Aim for "nobody else will pick that word
+# for their change".
+#
 # If you update a tag and you get an error like this:
 #     cannot parse input: "$image:$tag": invalid reference format
 # check the length of $tag; if it's > 128 chars you need to shorten your tag.
 
 variables:
    DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
-   DEBIAN_BASE_TAG: "2023-10-13-rust-1.66"
+   DEBIAN_BASE_TAG: "20240412-pycparser"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "2023-09-30-shader-db"
+   DEBIAN_BUILD_TAG: "20240408-cbindgen"
-
-   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"
 
@@ -21,21 +24,23 @@ 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: "2023-10-15-deqp"
+   DEBIAN_X86_64_TEST_ANDROID_TAG: "20240423-deqp"
-   DEBIAN_X86_64_TEST_GL_TAG: "2023-10-15-deqp"
+   DEBIAN_X86_64_TEST_GL_TAG: "20240423-deqp"
-   DEBIAN_X86_64_TEST_VK_TAG: "2023-10-15-deqp"
+   DEBIAN_X86_64_TEST_VK_TAG: "20240423-deqp"
+   KERNEL_ROOTFS_TAG: "20240423-deqp"
 
-   ALPINE_X86_64_BUILD_TAG: "2023-10-04-ephemeral"
+   ALPINE_X86_64_BUILD_TAG: "20240412-pycparser"
-   ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version"
+   ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto"
-   FEDORA_X86_64_BUILD_TAG: "2023-08-04-shader-db"
+   FEDORA_X86_64_BUILD_TAG: "20240412-pycparser"
-   KERNEL_ROOTFS_TAG: "2023-10-13-deqp"
+   KERNEL_TAG: "v6.6.21-mesa-19fc"
-   KERNEL_TAG: "v6.4.12-for-mesa-ci-f6b4ad45f48d"
+   KERNEL_REPO: "gfx-ci/linux"
+   PKG_REPO_REV: "3cc12a2a"
 
-   WINDOWS_X64_VS_PATH: "windows/x64_vs"
+   WINDOWS_X64_MSVC_PATH: "windows/x86_64_msvc"
-   WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"
+   WINDOWS_X64_MSVC_TAG: "20231222-msvc"
 
-   WINDOWS_X64_BUILD_PATH: "windows/x64_build"
+   WINDOWS_X64_BUILD_PATH: "windows/x86_64_build"
-   WINDOWS_X64_BUILD_TAG: "2023-06-24-agility-711"
+   WINDOWS_X64_BUILD_TAG: "20240405-vainfo-ci-1"
 
-   WINDOWS_X64_TEST_PATH: "windows/x64_test"
+   WINDOWS_X64_TEST_PATH: "windows/x86_64_test"
-   WINDOWS_X64_TEST_TAG: "2023-05-30-warp-1.0.7.1"
+   WINDOWS_X64_TEST_TAG: "20240405-vainfo-ci-1"

.gitlab-ci/lava/exceptions.py

@@ -5,24 +5,36 @@ class MesaCIException(Exception):
     pass
 
 
-class MesaCITimeoutError(MesaCIException):
+class MesaCIRetriableException(MesaCIException):
+    pass
+
+
+class MesaCITimeoutError(MesaCIRetriableException):
     def __init__(self, *args, timeout_duration: timedelta) -> None:
         super().__init__(*args)
         self.timeout_duration = timeout_duration
 
 
-class MesaCIRetryError(MesaCIException):
+class MesaCIRetryError(MesaCIRetriableException):
     def __init__(self, *args, retry_count: int, last_job: None) -> None:
         super().__init__(*args)
         self.retry_count = retry_count
         self.last_job = last_job
 
 
-class MesaCIParseException(MesaCIException):
+class MesaCIFatalException(MesaCIException):
+    """Exception raised when the Mesa CI script encounters a fatal error that
+    prevents the script from continuing."""
+
+    def __init__(self, *args) -> None:
+        super().__init__(*args)
+
+
+class MesaCIParseException(MesaCIRetriableException):
     pass
 
 
-class MesaCIKnownIssueException(MesaCIException):
+class MesaCIKnownIssueException(MesaCIRetriableException):
     """Exception raised when the Mesa CI script finds something in the logs that
     is known to cause the LAVA job to eventually fail"""
 

.gitlab-ci/lava/lava-submit.sh

@@ -42,6 +42,7 @@ PYTHONPATH=artifacts/ artifacts/lava/lava_job_submitter.py \
 	--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}" \
 	--build-url "${ARTIFACT_URL}" \
 	--job-rootfs-overlay-url "${FDO_HTTP_CACHE_URI:-}https://${JOB_ROOTFS_OVERLAY_PATH}" \
 	--job-timeout-min ${JOB_TIMEOUT:-30} \
@@ -58,4 +59,5 @@ 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

.gitlab-ci/lava/lava_job_submitter.py

@@ -16,33 +16,35 @@ import sys
 import time
 from collections import defaultdict
 from dataclasses import dataclass, fields
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
-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,
+    MesaCIFatalException,
+    MesaCIRetriableException,
     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 lavacli.utils import flow_yaml as lava_yaml
+from lava.utils import DEFAULT_GITLAB_SECTION_TIMEOUTS as GL_SECTION_TIMEOUTS
 
 # Initialize structural logging with a defaultdict, it can be changed for more
 # sophisticated dict-like data abstractions.
@@ -58,7 +60,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("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.
@@ -81,18 +83,29 @@ NUMBER_OF_RETRIES_TIMEOUT_DETECTION = int(
     getenv("LAVA_NUMBER_OF_RETRIES_TIMEOUT_DETECTION", 2)
 )
 
+CI_JOB_TIMEOUT_SEC = int(getenv("CI_JOB_TIMEOUT", 3600))
+# How many seconds the script will wait to let LAVA run the job and give the final details.
+EXPECTED_JOB_DURATION_SEC = int(getenv("EXPECTED_JOB_DURATION_SEC", 60 * 10))
+# CI_JOB_STARTED is given by GitLab CI/CD in UTC timezone by default.
+CI_JOB_STARTED_AT_RAW = getenv("CI_JOB_STARTED_AT", "")
+CI_JOB_STARTED_AT: datetime = (
+    datetime.fromisoformat(CI_JOB_STARTED_AT_RAW)
+    if CI_JOB_STARTED_AT_RAW
+    else datetime.now(timezone.utc)
+)
+
 
 def raise_exception_from_metadata(metadata: dict, job_id: int) -> None:
     """
     Investigate infrastructure errors from the job metadata.
-    If it finds an error, raise it as MesaCIException.
+    If it finds an error, raise it as MesaCIRetriableException.
     """
     if "result" not in metadata or metadata["result"] != "fail":
         return
     if "error_type" in metadata:
         error_type = metadata["error_type"]
         if error_type == "Infrastructure":
-            raise MesaCIException(
+            raise MesaCIRetriableException(
                 f"LAVA job {job_id} failed with Infrastructure Error. Retry."
             )
         if error_type == "Job":
@@ -100,12 +113,12 @@ def raise_exception_from_metadata(metadata: dict, job_id: int) -> None:
             # with mal-formed job definitions. As we are always validating the
             # jobs, only the former is probable to happen. E.g.: When some LAVA
             # action timed out more times than expected in job definition.
-            raise MesaCIException(
+            raise MesaCIRetriableException(
                 f"LAVA job {job_id} failed with JobError "
                 "(possible LAVA timeout misconfiguration/bug). Retry."
             )
     if "case" in metadata and metadata["case"] == "validate":
-        raise MesaCIException(
+        raise MesaCIRetriableException(
             f"LAVA job {job_id} failed validation (possible download error). Retry."
         )
 
@@ -182,7 +195,6 @@ def is_job_hanging(job, max_idle_time):
 
 
 def parse_log_lines(job, log_follower, new_log_lines):
-
     if log_follower.feed(new_log_lines):
         # If we had non-empty log data, we can assure that the device is alive.
         job.heartbeat()
@@ -200,7 +212,6 @@ def parse_log_lines(job, log_follower, new_log_lines):
 
 
 def fetch_new_log_lines(job):
-
     # The XMLRPC binary packet may be corrupted, causing a YAML scanner error.
     # Retry the log fetching several times before exposing the error.
     for _ in range(5):
@@ -216,14 +227,28 @@ def submit_job(job):
     try:
         job.submit()
     except Exception as mesa_ci_err:
-        raise MesaCIException(
+        raise MesaCIRetriableException(
             f"Could not submit LAVA job. Reason: {mesa_ci_err}"
         ) from mesa_ci_err
 
 
-def wait_for_job_get_started(job):
+def wait_for_job_get_started(job, attempt_no):
     print_log(f"Waiting for job {job.job_id} to start.")
     while not job.is_started():
+        current_job_duration_sec: int = int(
+            (datetime.now(timezone.utc) - CI_JOB_STARTED_AT).total_seconds()
+        )
+        remaining_time_sec: int = max(0, CI_JOB_TIMEOUT_SEC - current_job_duration_sec)
+        if remaining_time_sec < EXPECTED_JOB_DURATION_SEC:
+            job.cancel()
+            raise MesaCIFatalException(
+                f"{CONSOLE_LOG['BOLD']}"
+                f"{CONSOLE_LOG['FG_YELLOW']}"
+                f"Job {job.job_id} only has {remaining_time_sec} seconds "
+                "remaining to run, but it is expected to take at least "
+                f"{EXPECTED_JOB_DURATION_SEC} seconds."
+                f"{CONSOLE_LOG['RESET']}",
+            )
         time.sleep(WAIT_FOR_DEVICE_POLLING_TIME_SEC)
     job.refresh_log()
     print_log(f"Job {job.job_id} started.")
@@ -299,7 +324,7 @@ def execute_job_with_retries(
         try:
             job_log["submitter_start_time"] = datetime.now().isoformat()
             submit_job(job)
-            wait_for_job_get_started(job)
+            wait_for_job_get_started(job, attempt_no)
             log_follower: LogFollower = bootstrap_log_follower()
             follow_job_execution(job, log_follower)
             return job
@@ -318,6 +343,8 @@ def execute_job_with_retries(
                 f"Finished executing LAVA job in the attempt #{attempt_no}"
                 f"{CONSOLE_LOG['RESET']}"
             )
+            if job.exception and not isinstance(job.exception, MesaCIRetriableException):
+                break
 
     return last_failed_job
 
@@ -370,6 +397,7 @@ 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 = ""
@@ -379,6 +407,7 @@ 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:
@@ -402,7 +431,7 @@ class LAVAJobSubmitter(PathResolver):
             minutes=self.job_timeout_min
         )
 
-        job_definition = generate_lava_job_definition(self)
+        job_definition = LAVAJobDefinition(self).generate_lava_job_definition()
 
         if self.dump_yaml:
             self.dump_job_definition(job_definition)
@@ -456,10 +485,8 @@ 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"{base_url}{artifacts_path}{relative_log_path}"
+        full_path = f"$ARTIFACTS_BASE_URL/{relative_log_path}"
         artifact_url = path.expandvars(full_path)
 
         print_log(f"Structural Logging data available at: {artifact_url}")
@@ -471,8 +498,9 @@ class LAVAJobSubmitter(PathResolver):
         if not last_attempt_job:
             # No job was run, something bad happened
             STRUCTURAL_LOG["job_combined_status"] = "script_crash"
-            current_exception = str(sys.exc_info()[0])
+            current_exception = str(sys.exc_info()[1])
             STRUCTURAL_LOG["job_combined_fail_reason"] = current_exception
+            print(f"Interrupting the script. Reason: {current_exception}")
             raise SystemExit(1)
 
         STRUCTURAL_LOG["job_combined_status"] = last_attempt_job.status
@@ -509,7 +537,6 @@ class StructuredLoggerWrapper:
     def logger_context(self):
         context = contextlib.nullcontext()
         try:
-
             global STRUCTURAL_LOG
             STRUCTURAL_LOG = StructuredLogger(
                 self.__submitter.structured_log_file, truncate=True

.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 generate_lava_job_definition
+from .lava_job_definition import LAVAJobDefinition
 from .lava_proxy import call_proxy, setup_lava_proxy
 from .log_follower import (
     LogFollower,

.gitlab-ci/lava/utils/constants.py

@@ -0,0 +1,25 @@
+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))
+
+# How many times the r8152 error may happen to consider it a known issue.
+KNOWN_ISSUE_R8152_MAX_CONSECUTIVE_COUNTER: int = 10
+KNOWN_ISSUE_R8152_PATTERNS: tuple[str, ...] = (
+    r"r8152 \S+ eth0: Tx status -71",
+    r"nfs: server \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} not responding, still trying",
+)
+
+# This is considered noise, since LAVA produces this log after receiving a package of feedback
+# messages.
+LOG_DEBUG_FEEDBACK_NOISE = "Listened to connection for namespace 'dut' done"

.gitlab-ci/lava/utils/lava_job.py

@@ -6,6 +6,7 @@ from typing import Any, Optional
 
 from lava.exceptions import (
     MesaCIException,
+    MesaCIRetriableException,
     MesaCIKnownIssueException,
     MesaCIParseException,
     MesaCITimeoutError,
@@ -34,7 +35,7 @@ class LAVAJob:
         self._is_finished = False
         self.log: dict[str, Any] = log
         self.status = "not_submitted"
-        self.__exception: Optional[str] = None
+        self.__exception: Optional[Exception] = None
 
     def heartbeat(self) -> None:
         self.last_log_time: datetime = datetime.now()
@@ -63,13 +64,13 @@ class LAVAJob:
         return self._is_finished
 
     @property
-    def exception(self) -> str:
+    def exception(self) -> Optional[Exception]:
         return self.__exception
 
     @exception.setter
     def exception(self, exception: Exception) -> None:
-        self.__exception = repr(exception)
+        self.__exception = exception
-        self.log["dut_job_fail_reason"] = self.__exception
+        self.log["dut_job_fail_reason"] = repr(self.__exception)
 
     def validate(self) -> Optional[dict]:
         """Returns a dict with errors, if the validation fails.
@@ -176,11 +177,15 @@ class LAVAJob:
             self.status = "canceled"
         elif isinstance(exception, MesaCITimeoutError):
             self.status = "hung"
-        elif isinstance(exception, MesaCIException):
+        elif isinstance(exception, MesaCIRetriableException):
             self.status = "failed"
         elif isinstance(exception, KeyboardInterrupt):
             self.status = "interrupted"
             print_log("LAVA job submitter was interrupted. Cancelling the job.")
             raise
+        elif isinstance(exception, MesaCIException):
+            self.status = "interrupted"
+            print_log("LAVA job submitter was interrupted. Cancelling the job.")
+            raise
         else:
             self.status = "job_submitter_error"

.gitlab-ci/lava/utils/lava_job_definition.py

@@ -1,95 +1,130 @@
 from io import StringIO
 from typing import TYPE_CHECKING, Any
 
-import re
-from lava.utils.lava_farm import LavaFarm, get_lava_farm
-from ruamel.yaml.scalarstring import LiteralScalarString
 from ruamel.yaml import YAML
-from os import getenv
+
+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,
+    qemu_boot_action,
+    qemu_deploy_actions,
+    uart_test_actions,
+)
 
 if TYPE_CHECKING:
     from lava.lava_job_submitter import LAVAJobSubmitter
 
-# How many attempts should be made when a timeout happen during LAVA device boot.
+from .constants import FORCE_UART, JOB_PRIORITY, NUMBER_OF_ATTEMPTS_LAVA_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))
 
 
-def has_ssh_support(job_submitter: "LAVAJobSubmitter") -> bool:
+class LAVAJobDefinition:
-    force_uart = bool(getenv("LAVA_FORCE_UART", False))
+    """
+    This class is responsible for generating the YAML payload to submit a LAVA
+    job.
+    """
 
-    if force_uart:
+    def __init__(self, job_submitter: "LAVAJobSubmitter") -> None:
+        self.job_submitter: "LAVAJobSubmitter" = job_submitter
+
+    def has_ssh_support(self) -> bool:
+        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.
+        return current_farm == LavaFarm.COLLABORA
-    job_uses_fastboot: bool = job_submitter.boot_method == "fastboot"
 
-    return current_farm == LavaFarm.COLLABORA and not job_uses_fastboot
+    def generate_lava_yaml_payload(self) -> dict[str, Any]:
-
-
-def generate_lava_yaml_payload(job_submitter: "LAVAJobSubmitter") -> dict[str, Any]:
         """
-    Bridge function to use the supported job definition depending on some Mesa
+        Generates a YAML payload for submitting a LAVA job, based on the provided arguments.
-    CI job characteristics.
 
-    The strategy here, is to use LAVA with a containerized SSH session to follow
+        Args:
-    the job output, escaping from dumping data to the UART, which proves to be
+            None
-    error prone in some devices.
+
+        Returns:
+            a dictionary containing the values generated by the `generate_metadata` function and the
+            actions for the LAVA job submission.
         """
-    from lava.utils.ssh_job_definition import (
+        args = self.job_submitter
-        generate_lava_yaml_payload as ssh_lava_yaml,
+        values = self.generate_metadata()
-    )
+        nfsrootfs = {
-    from lava.utils.uart_job_definition import (
+            "url": f"{args.rootfs_url_prefix}/lava-rootfs.tar.zst",
-        generate_lava_yaml_payload as uart_lava_yaml,
+            "compression": "zstd",
+        }
+
+        init_stage1_steps = self.init_stage1_steps()
+        artifact_download_steps = self.artifact_download_steps()
+
+        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)
+        elif args.boot_method == "qemu-nfs":
+            deploy_actions = qemu_deploy_actions(self, nfsrootfs)
+            boot_action = qemu_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),
             )
 
-    if has_ssh_support(job_submitter):
+        values["actions"] = [
-        return ssh_lava_yaml(job_submitter)
+            *[{"deploy": d} for d in deploy_actions],
+            {"boot": boot_action},
+            *[{"test": t} for t in test_actions],
+        ]
 
-    return uart_lava_yaml(job_submitter)
+        return values
 
+    def generate_lava_job_definition(self) -> str:
+        """
+        Generates a LAVA job definition in YAML format and returns it as a string.
 
-def generate_lava_job_definition(job_submitter: "LAVAJobSubmitter") -> str:
+        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(generate_lava_yaml_payload(job_submitter), job_stream)
+        yaml.dump(self.generate_lava_yaml_payload(), job_stream)
         return job_stream.getvalue()
 
-
+    def generate_metadata(self) -> dict[str, Any]:
-def to_yaml_block(steps_array: list[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_metadata(args) -> dict[str, Any]:
         # General metadata and permissions
         values = {
-        "job_name": f"mesa: {args.pipeline_info}",
+            "job_name": f"{self.job_submitter.project_name}: {self.job_submitter.pipeline_info}",
-        "device_type": args.device_type,
+            "device_type": self.job_submitter.device_type,
-        "visibility": {"group": [args.visibility_group]},
+            "visibility": {"group": [self.job_submitter.visibility_group]},
             "priority": JOB_PRIORITY,
-        "context": {
+            "context": {"extra_nfsroot_args": " init=/init rootwait usbcore.quirks=0bda:8153:k"},
-            "extra_nfsroot_args": " init=/init rootwait usbcore.quirks=0bda:8153:k"
-        },
             "timeouts": {
-            "job": {"minutes": args.job_timeout_min},
+                "job": {"minutes": self.job_submitter.job_timeout_min},
                 "actions": {
                     "depthcharge-retry": {
                         # Could take between 1 and 1.5 min in slower boots
@@ -109,13 +144,32 @@ def generate_metadata(args) -> dict[str, Any]:
             },
         }
 
-    if args.lava_tags:
+        if self.job_submitter.lava_tags:
-        values["tags"] = args.lava_tags.split(",")
+            values["tags"] = self.job_submitter.lava_tags.split(",")
+
+        # QEMU lava jobs mandate proper arch value in the context
+        if self.job_submitter.boot_method == "qemu-nfs":
+            values["context"]["arch"] = self.job_submitter.mesa_job_name.split(":")[1]
 
         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 artifact_download_steps(args):
+    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(self):
         """
         This function is responsible for setting up the SSH server in the DUT and to
         export the first boot environment to a file.
@@ -125,21 +179,21 @@ def artifact_download_steps(args):
         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"{self.job_submitter.job_rootfs_overlay_url} | tar -xz -C /",
-        f"mkdir -p {args.ci_project_dir}",
+            f"mkdir -p {self.job_submitter.ci_project_dir}",
-        f"curl -L --retry 4 -f --retry-all-errors --retry-delay 60 {args.build_url} | "
+            f"curl -L --retry 4 -f --retry-all-errors --retry-delay 60 {self.job_submitter.build_url} | "
-        f"tar --zstd -x -C {args.ci_project_dir}",
+            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:
+        if self.job_submitter.jwt_file:
-        with open(args.jwt_file) as jwt_file:
+            with open(self.job_submitter.jwt_file) as jwt_file:
                 download_steps += [
                     "set +x  # HIDE_START",
-                f'echo -n "{jwt_file.read()}" > "{args.jwt_file}"',
+                    f'echo -n "{jwt_file.read()}" > "{self.job_submitter.jwt_file}"',
                     "set -x  # HIDE_END",
-                f'echo "export CI_JOB_JWT_FILE={args.jwt_file}" >> /set-job-env-vars.sh',
+                    f'echo "export CI_JOB_JWT_FILE={self.job_submitter.jwt_file}" >> /set-job-env-vars.sh',
                 ]
         else:
             download_steps += [
@@ -148,3 +202,30 @@ def artifact_download_steps(args):
             ]
 
         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:
+            # For vmware farm, patch nameserver as 8.8.8.8 is off limit.
+            # This is temporary and will be reverted once the farm is moved.
+            if self.job_submitter.mesa_job_name.startswith("vmware-"):
+                run_steps += [x.rstrip().replace("nameserver 8.8.8.8", "nameserver 10.25.198.110") for x in init_sh if not x.startswith("#") and x.rstrip()]
+            else:
+                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

.gitlab-ci/lava/utils/lava_log_hints.py

@@ -2,42 +2,78 @@ from __future__ import annotations
 
 import re
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Sequence
 
 if TYPE_CHECKING:
     from lava.utils import LogFollower
 
 from lava.exceptions import MesaCIKnownIssueException
 from lava.utils.console_format import CONSOLE_LOG
+from lava.utils.constants import (
+    KNOWN_ISSUE_R8152_MAX_CONSECUTIVE_COUNTER,
+    LOG_DEBUG_FEEDBACK_NOISE,
+    KNOWN_ISSUE_R8152_PATTERNS,
+)
 from lava.utils.log_section import LogSectionType
 
 
+def search_known_issue_patterns(patterns: Sequence[str], line: str) -> str:
+    for pattern in patterns:
+        if re.search(pattern, line):
+            return pattern
+    return ""
+
+
 @dataclass
 class LAVALogHints:
     log_follower: LogFollower
-    has_r8152_issue_history: bool = field(default=False, init=False)
+    r8152_issue_consecutive_counter: int = field(default=0, init=False)
+    reboot_counter: int = field(default=0, init=False)
 
-    def detect_failure(self, new_lines: list[dict[str, Any]]):
+    def raise_known_issue(self, message) -> None:
-        for line in new_lines:
-            self.detect_r8152_issue(line)
-
-    def detect_r8152_issue(self, line):
-        if (
-            self.log_follower.phase == LogSectionType.TEST_CASE
-            and line["lvl"] == "target"
-        ):
-            if re.search(r"r8152 \S+ eth0: Tx status -71", line["msg"]):
-                self.has_r8152_issue_history = True
-                return
-
-            if self.has_r8152_issue_history and re.search(
-                r"nfs: server \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} not responding, still trying",
-                line["msg"],
-            ):
         raise MesaCIKnownIssueException(
+            "Found known issue: "
             f"{CONSOLE_LOG['FG_MAGENTA']}"
-                    "Probable network issue failure encountered, retrying the job"
+            f"{message}"
             f"{CONSOLE_LOG['RESET']}"
         )
 
-        self.has_r8152_issue_history = False
+    def detect_failure(self, new_lines: list[dict[str, Any]]):
+        for line in new_lines:
+            if line["msg"] == LOG_DEBUG_FEEDBACK_NOISE:
+                continue
+            self.detect_r8152_issue(line)
+            self.detect_forced_reboot(line)
+
+    def detect_r8152_issue(self, line):
+        if self.log_follower.phase in (
+            LogSectionType.LAVA_BOOT,
+            LogSectionType.TEST_CASE,
+        ) and line["lvl"] in ("feedback", "target"):
+            if search_known_issue_patterns(KNOWN_ISSUE_R8152_PATTERNS, line["msg"]):
+                if (
+                    self.r8152_issue_consecutive_counter
+                    < KNOWN_ISSUE_R8152_MAX_CONSECUTIVE_COUNTER
+                ):
+                    self.r8152_issue_consecutive_counter += 1
+                    return
+
+                self.raise_known_issue(
+                    "Probable network issue failure encountered, retrying the job"
+                )
+
+        # Reset the status, as the `nfs... still trying` complaint was not detected
+        self.r8152_issue_consecutive_counter = 0
+
+    def detect_forced_reboot(self, line: dict[str, Any]) -> None:
+        if (
+            self.log_follower.phase == LogSectionType.TEST_CASE
+            and line["lvl"] == "feedback"
+        ):
+            if re.search(r"^Reboot requested", line["msg"]):
+                self.reboot_counter += 1
+
+                if self.reboot_counter > 0:
+                    self.raise_known_issue(
+                        "Forced reboot detected during test phase, failing the job..."
+                    )

.gitlab-ci/lava/utils/log_follower.py

@@ -187,6 +187,25 @@ class LogFollower:
 
         return False
 
+    def ignore_dut_feedback_lines(self, line: dict[str, str]) -> bool:
+        """
+        Ignores feedback lines from LAVA.
+        If we only receive this level of message for some time, it means that the job is
+        misbehaving. E.g Rebooting.
+
+        Args:
+            line: A dictionary representing a single log line.
+
+        Returns:
+            A boolean indicating whether the current line is a feedback line.
+        """
+        if line["lvl"] == "feedback" and line["ns"] == "dut":
+            return True
+        if line["lvl"] == "debug":
+            # This message happens after LAVA end receiving the feedback from the DUT
+            if line["msg"] == "Listened to connection for namespace 'dut' done":
+                return True
+        return False
 
     def feed(self, new_lines: list[dict[str, str]]) -> bool:
         """Input data to be processed by LogFollower instance
@@ -207,6 +226,9 @@ class LogFollower:
             if self.merge_carriage_return_lines(line):
                 continue
 
+            if self.ignore_dut_feedback_lines(line):
+                continue
+
             # At least we are fed with a non-kernel dump log, it seems that the
             # job is progressing
             is_job_healthy = True

.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.
 """
 
 
-from pathlib import Path
+import re
-from typing import Any
+from typing import TYPE_CHECKING, Any, Iterable
 
-from .lava_job_definition import (
+from ruamel.yaml.scalarstring import LiteralScalarString
-    NUMBER_OF_ATTEMPTS_LAVA_BOOT,
+
-    artifact_download_steps,
+from .constants import NUMBER_OF_ATTEMPTS_LAVA_BOOT
-    generate_metadata,
+
-    to_yaml_block,
+if TYPE_CHECKING:
-)
+    from ..lava_job_submitter import LAVAJobSubmitter
 
 # Very early SSH server setup. Uses /dut_ready file to flag it is done.
 SSH_SERVER_COMMANDS = {
@@ -79,12 +79,23 @@ lava_ssh_test_case() {
 ]
 
 
-def generate_dut_test(args):
+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]:
     # 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": [
@@ -109,7 +120,9 @@ def generate_dut_test(args):
     }
 
 
-def generate_docker_test(args):
+def generate_docker_test(
+    args: "LAVAJobSubmitter", artifact_download_steps: list[str]
+) -> dict[str, Any]:
     # This is a growing list of commands that will be executed by the docker
     # guest, which will be the SSH client.
     docker_commands = []
@@ -148,14 +161,14 @@ def generate_docker_test(args):
             (
                 "lava_ssh_test_case 'artifact_download' 'bash --' << EOF",
                 "source /dut-env-vars.sh",
-                *artifact_download_steps(args),
+                *artifact_download_steps,
                 "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 'mesa-ci_{args.mesa_job_name}' "
+        f"lava_ssh_test_case '{args.project_name}_{args.mesa_job_name}' "
         # Changing directory to /, as the HWCI_SCRIPT expects that
         "'\"cd / && /init-stage2.sh\"'",
     ]
@@ -163,46 +176,21 @@ def generate_docker_test(args):
     return init_stages_test
 
 
-def generate_lava_yaml_payload(args) -> dict[str, Any]:
+def wrap_final_deploy_action(final_deploy_action: dict):
-    values = generate_metadata(args)
+    wrap = {
-
-    # 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"}
 
-    # always boot over NFS
+    final_deploy_action.update(wrap)
-    boot = {
+
+
+def wrap_boot_action(boot_action: dict):
+    wrap = {
         "namespace": "dut",
         "failure_retry": NUMBER_OF_ATTEMPTS_LAVA_BOOT,
-        "method": args.boot_method,
-        "commands": "nfs",
-        "prompts": ["lava-shell:"],
         **SSH_SERVER_COMMANDS,
     }
 
-    # only declaring each job as a single 'test' since LAVA's test parsing is
+    boot_action.update(wrap)
-    # not useful to us
-    values["actions"] = [
-        {"deploy": deploy},
-        {"boot": boot},
-        {"test": generate_dut_test(args)},
-        {"test": generate_docker_test(args)},
-    ]
-
-    return values

.gitlab-ci/lava/utils/uart_job_definition.py

@@ -1,22 +1,23 @@
-from typing import Any
+from typing import TYPE_CHECKING, Any
-from .lava_job_definition import (
+
-    generate_metadata,
+if TYPE_CHECKING:
-    NUMBER_OF_ATTEMPTS_LAVA_BOOT,
+    from ..lava_job_submitter import LAVAJobSubmitter
-    artifact_download_steps,
+    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"
 
 
-def generate_lava_yaml_payload(args) -> dict[str, Any]:
+def fastboot_deploy_actions(
-    values = generate_metadata(args)
+    job_definition: "LAVAJobDefinition", nfsrootfs
-
+) -> tuple[dict[str, Any], ...]:
-    # URLs to our kernel rootfs to boot from, both generated by the base
+    args = job_definition.job_submitter
-    # container build
-
-    nfsrootfs = {
-        "url": f"{args.rootfs_url_prefix}/lava-rootfs.tar.zst",
-        "compression": "zstd",
-    }
-
     fastboot_deploy_nfs = {
         "timeout": {"minutes": 10},
         "to": "nfs",
@@ -34,7 +35,7 @@ def generate_lava_yaml_payload(args) -> dict[str, Any]:
         },
         "postprocess": {
             "docker": {
-                "image": "registry.gitlab.collabora.com/lava/health-check-docker",
+                "image": DOCKER_IMAGE,
                 "steps": [
                     f"cat Image.gz {args.dtb_filename}.dtb > Image.gz+dtb",
                     "mkbootimg --kernel Image.gz+dtb"
@@ -44,13 +45,28 @@ def generate_lava_yaml_payload(args) -> dict[str, Any]:
             }
         },
     }
-    if args.kernel_image_type:
+
-        fastboot_deploy_prepare["images"]["kernel"]["type"] = args.kernel_image_type
+    fastboot_deploy = {
-    if args.dtb_filename:
+        "timeout": {"minutes": 2},
-        fastboot_deploy_prepare["images"]["dtb"] = {
+        "to": "fastboot",
-            "url": f"{args.kernel_url_prefix}/{args.dtb_filename}.dtb"
+        "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",
@@ -60,40 +76,33 @@ def generate_lava_yaml_payload(args) -> dict[str, Any]:
         },
         "nfsrootfs": nfsrootfs,
     }
-    if args.kernel_image_type:
+    job_definition.attach_kernel_and_dtb(tftp_deploy)
-        tftp_deploy["kernel"]["type"] = args.kernel_image_type
+    job_definition.attach_external_modules(tftp_deploy)
-    if args.dtb_filename:
-        tftp_deploy["dtb"] = {
-            "url": f"{args.kernel_url_prefix}/{args.dtb_filename}.dtb"
-        }
 
-    fastboot_deploy = {
+    return (tftp_deploy,)
-        "timeout": {"minutes": 2},
+
-        "to": "fastboot",
+
-        "docker": {
+def qemu_deploy_actions(job_definition: "LAVAJobDefinition", nfsrootfs) -> tuple[dict[str, Any]]:
-            "image": "registry.gitlab.collabora.com/lava/health-check-docker",
+    args = job_definition.job_submitter
-        },
+    qemu_deploy = {
+        "timeout": {"minutes": 5},
+        "to": "nfs",
         "images": {
-            "boot": {"url": "downloads://boot.img"},
+            "kernel": {
+                "image_arg": "-kernel {kernel}",
+                "url": f"{args.kernel_url_prefix}/{args.kernel_image_name}",
+            },
+            "nfsrootfs": nfsrootfs,
         },
     }
+    job_definition.attach_external_modules(qemu_deploy)
 
-    fastboot_boot = {
+    return (qemu_deploy,)
-        "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 = []
@@ -120,26 +129,8 @@ def generate_lava_yaml_payload(args) -> dict[str, Any]:
         ],
     }
 
-    # job execution script:
+    run_steps += init_stage1_steps
-    #   - inline .gitlab-ci/common/init-stage1.sh
+    run_steps += artifact_download_steps
-    #   - 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}",
@@ -150,22 +141,41 @@ def generate_lava_yaml_payload(args) -> dict[str, Any]:
         "sleep 1",
         # Putting CI_JOB name as the testcase name, it may help LAVA farm
         # maintainers with monitoring
-        f"lava-test-case 'mesa-ci_{args.mesa_job_name}' --shell /init-stage2.sh",
+        f"lava-test-case '{args.project_name}_{args.mesa_job_name}' --shell /init-stage2.sh",
     ]
 
-    if args.boot_method == "fastboot":
+    return (test,)
-        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},
-        ]
 
-    return values
+
+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 qemu_boot_action(args: "LAVAJobSubmitter") -> dict[str, Any]:
+    qemu_boot = {
+        "failure_retry": NUMBER_OF_ATTEMPTS_LAVA_BOOT,
+        "method": args.boot_method,
+        "prompts": ["lava-shell:"],
+    }
+
+    return qemu_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

.gitlab-ci/meson/build.sh

@@ -2,7 +2,7 @@
 # shellcheck disable=SC1003 # works for us now...
 # shellcheck disable=SC2086 # we want word splitting
 
-section_switch meson-configure "meson: configure"
+section_switch meson-cross-file "meson: cross file generate"
 
 set -e
 set -o xtrace
@@ -49,11 +49,42 @@ if [ -n "$CROSS" ]; then
     fi
 fi
 
+if [ -n "$HOST_BUILD_OPTIONS" ]; then
+    section_switch meson-host-configure "meson: host configure"
+
+    # Stash the PKG_CONFIG_LIBDIR so that we can use the base x86_64 image
+    # libraries.
+    tmp_pkg_config_libdir=$PKG_CONFIG_LIBDIR
+    unset PKG_CONFIG_LIBDIR
+
+    # Compile a host version for the few tools we need for a cross build (for
+    # now just intel-clc)
+    rm -rf _host_build
+    meson setup _host_build \
+          --native-file=native.file \
+          -D prefix=/usr \
+          -D libdir=lib \
+          ${HOST_BUILD_OPTIONS}
+
+    pushd _host_build
+
+    section_switch meson-host-build "meson: host build"
+
+    meson configure
+    ninja
+    ninja install
+    popd
+
+    # Restore PKG_CONFIG_LIBDIR
+    if [ -n "$tmp_pkg_config_libdir" ]; then
+        export PKG_CONFIG_LIBDIR=$tmp_pkg_config_libdir
+    fi
+fi
+
 # Only use GNU time if available, not any shell built-in command
 case $CI_JOB_NAME in
-    # strace and wine don't seem to mix well
     # ASAN leak detection is incompatible with strace
-    debian-mingw32-x86_64|*-asan*)
+    *-asan*)
         if test -f /usr/bin/time; then
             MESON_TEST_ARGS+=--wrapper=$PWD/.gitlab-ci/meson/time.sh
         fi
@@ -67,11 +98,13 @@ case $CI_JOB_NAME in
         ;;
 esac
 
+section_switch meson-configure "meson: configure"
+
 rm -rf _build
 meson setup _build \
       --native-file=native.file \
       --wrap-mode=nofallback \
-      --force-fallback-for perfetto \
+      --force-fallback-for perfetto,syn,paste \
       ${CROSS+--cross "$CROSS_FILE"} \
       -D prefix=$PWD/install \
       -D libdir=lib \
@@ -85,9 +118,10 @@ 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=h264dec,h264enc,h265dec,h265enc,vc1dec \
+      -D video-codecs=all \
       -D werror=true \
       ${EXTRA_OPTION}
 cd _build
@@ -104,10 +138,11 @@ 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-test
+section_end meson-install

.gitlab-ci/piglit/piglit-runner.sh

@@ -13,7 +13,7 @@ INSTALL="$PWD/install"
 # Set up the driver environment.
 export LD_LIBRARY_PATH="$INSTALL/lib/"
 export EGL_PLATFORM=surfaceless
-export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.${VK_CPU:-$(uname -m)}.json"
+export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.${VK_CPU:-$(uname -m)}.json"
 
 RESULTS=$PWD/${PIGLIT_RESULTS_DIR:-results}
 mkdir -p $RESULTS
@@ -106,7 +106,7 @@ deqp-runner junit \
    --results $RESULTS/failures.csv \
    --output $RESULTS/junit.xml \
    --limit 50 \
-   --template "See https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/results/{{testcase}}.xml"
+   --template "See $ARTIFACTS_BASE_URL/results/{{testcase}}.xml"
 
 # Report the flakes to the IRC channel for monitoring (if configured):
 if [ -n "$FLAKES_CHANNEL" ]; then

.gitlab-ci/piglit/piglit-traces.sh

@@ -13,6 +13,12 @@ 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"
+
+# FIXME: guess why /usr/local/bin is not included in all runners PATH.
+# Needed because yq and ci-fairy are installed there.
+PATH="/usr/local/bin:$PATH"
+
 if [ "$PIGLIT_REPLAY_SUBCOMMAND" = "profile" ]; then
     yq -iY 'del(.traces[][] | select(.label[]? == "no-perf"))' \
       "$PIGLIT_REPLAY_DESCRIPTION_FILE"
@@ -48,7 +54,7 @@ if [ -n "${VK_DRIVER}" ]; then
   export DXVK_LOG="$RESULTS/dxvk"
   [ -d "$DXVK_LOG" ] || mkdir -pv "$DXVK_LOG"
   export DXVK_STATE_CACHE=0
-  export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.${VK_CPU:-$(uname -m)}.json"
+  export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.${VK_CPU:-$(uname -m)}.json"
 fi
 
 # Sanity check to ensure that our environment is sufficient to make our tests
@@ -111,7 +117,7 @@ else
       mkdir -p /tmp/.X11-unix
 
       env \
-        VK_ICD_FILENAMES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
+        VK_DRIVER_FILES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
 	weston -Bheadless-backend.so --use-gl -Swayland-0 --xwayland --idle-time=0 &
 
       while [ ! -S "$WESTON_X11_SOCK" ]; do sleep 1; done
@@ -183,13 +189,20 @@ RUN_CMD="export LD_LIBRARY_PATH=$__LD_LIBRARY_PATH; $SANITY_MESA_VERSION_CMD &&
 # run.
 rm -rf replayer-db
 
+# ANGLE: download compiled ANGLE runtime and the compiled restricted traces (all-in-one package)
+if [ -n "$PIGLIT_REPLAY_ANGLE_TAG" ]; then
+  ARCH="amd64"
+  FILE="angle-bin-${ARCH}-${PIGLIT_REPLAY_ANGLE_TAG}.tar.zst"
+  ci-fairy s3cp $S3_ARGS "https://s3.freedesktop.org/mesa-tracie-private/${FILE}" "${FILE}"
+  mkdir -p replayer-db/angle
+  tar --zstd -xf ${FILE} -C replayer-db/angle/
+fi
+
 if ! eval $RUN_CMD;
 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}"

.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 {} \;
+    find install -name \*.so -exec $STRIP --strip-debug {} \;
 fi
 
 # Test runs don't pull down the git tree, so put the dEQP helper
@@ -38,10 +38,11 @@ cp -Rp .gitlab-ci/fossilize-runner.sh install/
 cp -Rp .gitlab-ci/crosvm-init.sh install/
 cp -Rp .gitlab-ci/*.txt install/
 cp -Rp .gitlab-ci/report-flakes.py install/
-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 \

.gitlab-ci/run-shader-db.sh

@@ -10,7 +10,7 @@ export LD_LIBRARY_PATH=$LIBDIR
 
 cd /usr/local/shader-db
 
-for driver in freedreno intel v3d vc4; do
+for driver in freedreno intel lima v3d vc4; do
     section_start shader-db-${driver} "Running shader-db for $driver"
     env LD_PRELOAD="$LIBDIR/lib${driver}_noop_drm_shim.so" \
         ./run -j"${FDO_CI_CONCURRENT:-4}" ./shaders \

.gitlab-ci/setup-test-env.sh

@@ -14,6 +14,14 @@ function x_off {
 
 # TODO: implement x_on !
 
+export JOB_START_S=$(date -u +"%s" -d "${CI_JOB_STARTED_AT:?}")
+
+function get_current_minsec {
+    DATE_S=$(date -u +"%s")
+    CURR_TIME=$((DATE_S-JOB_START_S))
+    printf "%02d:%02d" $((CURR_TIME/60)) $((CURR_TIME%60))
+}
+
 function error {
     x_off 2>/dev/null
     RED="\e[0;31m"
@@ -21,10 +29,7 @@ function error {
     # we force the following to be not in a section
     section_end $CURRENT_SECTION
 
-    DATE_S=$(date -u +"%s")
+    CURR_MINSEC=$(get_current_minsec)
-    JOB_START_S=$(date -u +"%s" -d "${CI_JOB_STARTED_AT:?}")
-    CURR_TIME=$((DATE_S-JOB_START_S))
-    CURR_MINSEC="$(printf "%02d" $((CURR_TIME/60))):$(printf "%02d" $((CURR_TIME%60)))"
     echo -e "\n${RED}[${CURR_MINSEC}] ERROR: $*${ENDCOLOR}\n"
     [ "$state_x" -eq 0 ] || set -x
 }
@@ -42,10 +47,7 @@ function build_section_start {
     CYAN="\e[0;36m"
     ENDCOLOR="\e[0m"
 
-    DATE_S=$(date -u +"%s")
+    CURR_MINSEC=$(get_current_minsec)
-    JOB_START_S=$(date -u +"%s" -d "${CI_JOB_STARTED_AT:?}")
-    CURR_TIME=$((DATE_S-JOB_START_S))
-    CURR_MINSEC="$(printf "%02d" $((CURR_TIME/60))):$(printf "%02d" $((CURR_TIME%60)))"
     echo -e "\n\e[0Ksection_start:$(date +%s):$section_name$section_params\r\e[0K${CYAN}[${CURR_MINSEC}] $*${ENDCOLOR}\n"
 }
 
@@ -87,6 +89,7 @@ function uncollapsed_section_switch {
 }
 
 export -f x_off
+export -f get_current_minsec
 export -f error
 export -f trap_err
 export -f build_section_start

.gitlab-ci/test-source-dep.yml

@@ -49,6 +49,9 @@
         - .gitlab-ci/**/*
         - include/**/*
         - meson.build
+        - meson_options.txt
+        - build-support/**/*
+        - subprojects/**/*
         - .gitattributes
         - src/*
         - src/compiler/**/*
@@ -200,6 +203,7 @@
 # Rules for unusual architectures that only build a subset of drivers
 .ppc64el-rules:
   rules:
+    - !reference [.never-post-merge-rules, rules]
     - !reference [.no_scheduled_pipelines-rules, rules]
     - !reference [.zink-common-rules, rules]
     - !reference [.softpipe-rules, rules]
@@ -212,6 +216,7 @@
 
 .s390x-rules:
   rules:
+    - !reference [.never-post-merge-rules, rules]
     - !reference [.no_scheduled_pipelines-rules, rules]
     - !reference [.zink-common-rules, rules]
     - !reference [.softpipe-rules, rules]
@@ -221,22 +226,28 @@
 # Rules for linters
 .lint-rustfmt-rules:
   rules:
-    - !reference [.core-rules, rules]
+    - !reference [.never-post-merge-rules, rules]
+    - !reference [.no_scheduled_pipelines-rules, rules]
     - changes:
+        - .gitlab-ci.yml
+        - .gitlab-ci/**/*
+    # in merge pipeline, formatting checks are not allowed to fail
+    - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"
+      changes: &rust_file_list
         - src/**/*.rs
       when: on_success
-
+      allow_failure: false
-.lint-clang-format-rules:
+    # in other pipelines, formatting checks are allowed to fail
-   rules:
+    - changes: *rust_file_list
-    - !reference [.core-rules, rules]
+      when: on_success
-    - changes:
+      allow_failure: true
-      - .clang-format
+
-      - .clang-format-include
+# Rules for .mr-label-maker.yml
-      - .clang-format-ignore
+.mr-label-maker-rules:
-      - src/**/.clang-format
+  rules:
-      - src/egl/**/*
+    - !reference [.never-post-merge-rules, rules]
-      - src/**/asahi/**/*
+    - !reference [.no_scheduled_pipelines-rules, rules]
-      - src/**/panfrost/**/*
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      - src/amd/vulkan/**/*
+      changes:
-      - src/amd/compiler/**/*
+        - .mr-label-maker.yml
       when: on_success

.gitlab-ci/test/gitlab-ci.yml

@@ -16,23 +16,22 @@
     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: lint
+  stage: code-validation
   extends:
     - .use-debian/x86_64_build
-  rules:
-    # in merge pipeline, don't touch the default settings
-    - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_COMMIT_BRANCH == null
-    # in other pipelines, formatting checks are allowed to fail
-    - allow_failure: true
   variables:
     GIT_STRATEGY: fetch
   timeout: 10m
   script:
     - git diff --color=always --exit-code  # Fails if there are diffs
+  tags:
+    - placeholder-job
 
 rustfmt:
   extends:
@@ -42,20 +41,34 @@ rustfmt:
     - shopt -s globstar
     - rustfmt --version
     - rustfmt --verbose src/**/lib.rs
+    - rustfmt --verbose src/**/main.rs
 
-clang-format:
+python-test:
+  # Cancel job if a newer commit is pushed to the same branch
+  interruptible: true
+  stage: code-validation
   extends:
-    - .formatting-check
+    - .use-debian/x86_64_build
-    - .lint-clang-format-rules
   variables:
-    LLVM_VERSION: 15
+    GIT_STRATEGY: fetch
-  before_script:
+  timeout: 10m
-    - shopt -s globstar
+  script:
-    # We need a meson build dir, but its config doesn't actually matter, so
+    - cd bin/ci
-    # let's just use the default.
+    - pip install --break-system-packages -r test/requirements.txt
-    - meson setup build
+    - PYTHONPATH=. pytest -v
-    - clang-format-${LLVM_VERSION} --version
+  rules:
-    - ninja -C build clang-format
+    - !reference [.disable-farm-mr-rules, rules]
+    - !reference [.never-post-merge-rules, rules]
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+      when: on_success
+    - if: $GITLAB_USER_LOGIN == "marge-bot"
+      changes: &bin_ci_files
+        - .gitlab-ci.yml
+        - .gitlab-ci/**/*
+        - bin/ci/**/*
+      when: on_success
+    - changes: *bin_ci_files
+      when: manual
 
 .test-gl:
   extends:
@@ -162,12 +175,6 @@ clang-format:
     reports:
       junit: results/junit.xml
 
-.deqp-test-vk:
-  extends:
-    - .deqp-test
-  variables:
-    DEQP_VER: vk
-
 .fossilize-test:
   script:
     - ./install/fossilize-runner.sh
@@ -177,11 +184,7 @@ clang-format:
     paths:
       - results/
 
-.baremetal-test:
+.download_s3:
-  extends:
-    - .test
-  # Cancel job if a newer commit is pushed to the same branch
-  interruptible: true
   before_script:
     - !reference [default, before_script]
     # Use this instead of gitlab's artifacts download because it hits packet.net
@@ -193,6 +196,14 @@ clang-format:
     - 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
+
+.baremetal-test:
+  extends:
+    - .test
+  # Cancel job if a newer commit is pushed to the same branch
+  interruptible: true
+  before_script:
+    - !reference [.download_s3, before_script]
   variables:
     BM_ROOTFS: /rootfs-${DEBIAN_ARCH}
   artifacts:
@@ -278,8 +289,11 @@ clang-format:
   # 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:2023-06-02.1
+  image: registry.freedesktop.org/gfx-ci/ci-tron/mesa-trigger:2024-01-05.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
@@ -319,7 +333,7 @@ clang-format:
     - !reference [default, before_script]
 
     - |
-      set -x
+      set -eux
 
       # Useful as a hook point for runner admins. You may edit the
       # config.toml for the Gitlab runner and use a bind-mount to
@@ -340,44 +354,17 @@ clang-format:
       [ -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 -euc '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}
 
-      # Keep the results path the same as baremetal and LAVA
-      ln -s "$JOB_FOLDER"/results/ .
-
       # Create a script to regenerate the CI environment when this job
       # begins running on the remote DUT.
       set +x
@@ -385,7 +372,6 @@ clang-format:
       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
@@ -405,6 +391,12 @@ clang-format:
   # 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]
+
   artifacts:
     when: always
     name: "mesa_${CI_JOB_NAME}"
@@ -413,7 +405,7 @@ clang-format:
     reports:
       junit: results/**/junit.xml
 
-.b2c-test-vk:
+.b2c-x86_64-test-vk:
   extends:
     - .use-debian/x86_64_test-vk
     - .b2c-test
@@ -422,7 +414,7 @@ clang-format:
     - debian-testing
     - !reference [.required-for-hardware-jobs, needs]
 
-.b2c-test-gl:
+.b2c-x86_64-test-gl:
   extends:
     - .use-debian/x86_64_test-gl
     - .b2c-test

.gitlab-ci/tests/data/FASTBOOT_force_uart=False_job_definition.yaml

@@ -0,0 +1,142 @@
+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:

.gitlab-ci/tests/data/FASTBOOT_force_uart=True_job_definition.yaml

@@ -0,0 +1,96 @@
+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

.gitlab-ci/tests/data/UBOOT_force_uart=False_job_definition.yaml

@@ -0,0 +1,114 @@
+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:

.gitlab-ci/tests/data/UBOOT_force_uart=True_job_definition.yaml

@@ -0,0 +1,70 @@
+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

.gitlab-ci/tests/test_lava_job_submitter.py

@@ -9,12 +9,13 @@ import os
 import xmlrpc.client
 from contextlib import nullcontext as does_not_raise
 from datetime import datetime
-from itertools import chain, repeat
+from itertools import islice, repeat
 from pathlib import Path
+from typing import Generator
 from unittest.mock import MagicMock, patch
 
 import pytest
-from lava.exceptions import MesaCIException, MesaCIRetryError
+from lava.exceptions import MesaCIException, MesaCIRetryError, MesaCIFatalException
 from lava.lava_job_submitter import (
     DEVICE_HANGING_TIMEOUT_SEC,
     NUMBER_OF_RETRIES_TIMEOUT_DETECTION,
@@ -23,6 +24,7 @@ from lava.lava_job_submitter import (
     bootstrap_log_follower,
     follow_job_execution,
     retriable_follow_job,
+    wait_for_job_get_started,
 )
 from lava.utils import LogSectionType
 
@@ -82,7 +84,7 @@ def lava_job_submitter(
 def test_submit_and_follow_respects_exceptions(mock_sleep, mock_proxy, exception):
     with pytest.raises(MesaCIException):
         proxy = mock_proxy(side_effect=exception)
-        job = LAVAJob(proxy, '')
+        job = LAVAJob(proxy, "")
         log_follower = bootstrap_log_follower()
         follow_job_execution(job, log_follower)
 
@@ -164,21 +166,13 @@ PROXY_SCENARIOS = {
         mock_logs(result="pass"),
         does_not_raise(),
         "pass",
-        {
+        {"testsuite_results": [generate_testsuite_result(result="pass")]},
-            "testsuite_results": [
-                generate_testsuite_result(result="pass")
-            ]
-        },
     ),
     "no retries, but testsuite fails": (
         mock_logs(result="fail"),
         does_not_raise(),
         "fail",
-        {
+        {"testsuite_results": [generate_testsuite_result(result="fail")]},
-            "testsuite_results": [
-                generate_testsuite_result(result="fail")
-            ]
-        },
     ),
     "no retries, one testsuite fails": (
         generate_n_logs(n=1, tick_fn=0, result="fail"),
@@ -187,7 +181,7 @@ PROXY_SCENARIOS = {
         {
             "testsuite_results": [
                 generate_testsuite_result(result="fail"),
-                generate_testsuite_result(result="pass")
+                generate_testsuite_result(result="pass"),
             ]
         },
     ),
@@ -264,6 +258,27 @@ def test_simulate_a_long_wait_to_start_a_job(
     assert delta_time.total_seconds() >= wait_time
 
 
+LONG_LAVA_QUEUE_SCENARIOS = {
+    "no_time_to_run": (0, pytest.raises(MesaCIFatalException)),
+    "enough_time_to_run": (9999999999, does_not_raise()),
+}
+
+
+@pytest.mark.parametrize(
+    "job_timeout, expectation",
+    LONG_LAVA_QUEUE_SCENARIOS.values(),
+    ids=LONG_LAVA_QUEUE_SCENARIOS.keys(),
+)
+def test_wait_for_job_get_started_no_time_to_run(monkeypatch, job_timeout, expectation):
+    monkeypatch.setattr("lava.lava_job_submitter.CI_JOB_TIMEOUT_SEC", job_timeout)
+    job = MagicMock()
+    # Make it escape the loop
+    job.is_started.side_effect = (False, False, True)
+    with expectation as e:
+        wait_for_job_get_started(job, 1)
+    if e:
+        job.cancel.assert_called_with()
+
 
 CORRUPTED_LOG_SCENARIOS = {
     "too much subsequent corrupted data": (
@@ -341,13 +356,15 @@ def test_full_yaml_log(mock_proxy, frozen_time, lava_job_submitter):
         if not data_chunk:
             return
 
-        first_log_time = data_chunk[0]["dt"]
+        first_log = lava_yaml.load(data_chunk[0])[0]
+        first_log_time = first_log["dt"]
         frozen_time.move_to(first_log_time)
         yield
 
-        last_log_time = data_chunk[-1]["dt"]
+        last_log = lava_yaml.load(data_chunk[-1])[0]
+        last_log_time = last_log["dt"]
         frozen_time.move_to(last_log_time)
-        return
+        yield
 
     def time_travel_to_test_time():
         # Suppose that the first message timestamp of the entire LAVA job log is
@@ -357,22 +374,31 @@ def test_full_yaml_log(mock_proxy, frozen_time, lava_job_submitter):
             first_log_time = lava_yaml.load(first_log)[0]["dt"]
             frozen_time.move_to(first_log_time)
 
-    def load_lines() -> list:
+    def load_lines() -> Generator[tuple[bool, str], None, None]:
         with open("/tmp/log.yaml", "r") as f:
             # data = yaml.safe_load(f)
-            data = f.readlines()
+            log_lines = f.readlines()
-            stream = chain(data)
+            serial_message: str = ""
+            chunk_start_line = 0
+            chunk_end_line = 0
+            chunk_max_size = 100
             try:
                 while True:
-                    data_chunk = [next(stream) for _ in range(random.randint(0, 50))]
+                    chunk_end_line = chunk_start_line + random.randint(1, chunk_max_size)
-                    serial_message = "".join(data_chunk)
+                    # split the log in chunks of random size
+                    log_chunk = list(islice(log_lines, chunk_start_line, chunk_end_line))
+                    chunk_start_line = chunk_end_line + 1
+                    serial_message = "".join(log_chunk)
+                    # time_traveller_gen will make the time trave according to the timestamp from
+                    # the message
+                    time_traveller_gen = time_travel_from_log_chunk(log_chunk)
                     # Suppose that the first message timestamp is the same of
                     # log fetch RPC call
-                    time_travel_from_log_chunk(data_chunk)
+                    next(time_traveller_gen)
                     yield False, "[]"
                     # Travel to the same datetime of the last fetched log line
                     # in the chunk
-                    time_travel_from_log_chunk(data_chunk)
+                    next(time_traveller_gen)
                     yield False, serial_message
             except StopIteration:
                 yield True, serial_message
@@ -384,11 +410,20 @@ def test_full_yaml_log(mock_proxy, frozen_time, lava_job_submitter):
         proxy.scheduler.jobs.logs.side_effect = load_lines()
 
     proxy.scheduler.jobs.submit = reset_logs
-    with pytest.raises(MesaCIRetryError):
+    try:
         time_travel_to_test_time()
-        lava_job_submitter.submit()
+        start_time = datetime.now()
         retriable_follow_job(proxy, "")
+    finally:
+        try:
+            # If the job fails, maybe there will be no structured log
             print(lava_job_submitter.structured_log_file.read_text())
+        finally:
+            end_time = datetime.now()
+            print("---- Reproduction log stats ----")
+            print(f"Start time: {start_time}")
+            print(f"End time: {end_time}")
+            print(f"Duration: {end_time - start_time}")
 
 
 @pytest.mark.parametrize(
@@ -417,9 +452,7 @@ def test_job_combined_status(
         "lava.lava_job_submitter.retriable_follow_job"
     ) as mock_retriable_follow_job, patch(
         "lava.lava_job_submitter.LAVAJobSubmitter._LAVAJobSubmitter__prepare_submission"
-    ) as mock_prepare_submission, patch(
+    ) as mock_prepare_submission, patch("sys.exit"):
-        "sys.exit"
-    ):
         from lava.lava_job_submitter import STRUCTURAL_LOG
 
         mock_retriable_follow_job.return_value = MagicMock(status=finished_job_status)

.gitlab-ci/tests/utils/test_lava_job_definition.py

@@ -0,0 +1,197 @@
+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

.gitlab-ci/tests/utils/test_lava_log.py

@@ -16,8 +16,15 @@ from lava.utils import (
     fix_lava_gitlab_section_log,
     hide_sensitive_data,
 )
+from lava.utils.constants import KNOWN_ISSUE_R8152_MAX_CONSECUTIVE_COUNTER
 
-from ..lava.helpers import create_lava_yaml_msg, does_not_raise, lava_yaml, yaml_dump
+from ..lava.helpers import (
+    create_lava_yaml_msg,
+    does_not_raise,
+    lava_yaml,
+    mock_lava_signal,
+    yaml_dump,
+)
 
 GITLAB_SECTION_SCENARIOS = {
     "start collapsed": (
@@ -311,47 +318,56 @@ def test_gitlab_section_id(case_name, expected_id):
     assert gl.id == expected_id
 
 
-A618_NETWORK_ISSUE_LOGS = [
+def a618_network_issue_logs(level: str = "target") -> list:
-    create_lava_yaml_msg(
+    net_error = create_lava_yaml_msg(
-        msg="[ 1733.599402] r8152 2-1.3:1.0 eth0: Tx status -71", lvl="target"
+            msg="[ 1733.599402] r8152 2-1.3:1.0 eth0: Tx status -71", lvl=level)
-    ),
+
-    create_lava_yaml_msg(
+    nfs_error = create_lava_yaml_msg(
             msg="[ 1733.604506] nfs: server 192.168.201.1 not responding, still trying",
-        lvl="target",
+            lvl=level,
-    ),
+        )
-]
+
-TEST_PHASE_LAVA_SIGNAL = create_lava_yaml_msg(
+    return [
-    msg="Received signal: <STARTTC> mesa-ci_a618_vk", lvl="debug"
+        *(KNOWN_ISSUE_R8152_MAX_CONSECUTIVE_COUNTER*[net_error]),
-)
+        nfs_error
+    ]
+
+
+TEST_PHASE_LAVA_SIGNAL = mock_lava_signal(LogSectionType.TEST_CASE)
+A618_NET_ISSUE_BOOT = a618_network_issue_logs(level="feedback")
+A618_NET_ISSUE_TEST = [TEST_PHASE_LAVA_SIGNAL, *a618_network_issue_logs(level="target")]
 
 
 A618_NETWORK_ISSUE_SCENARIOS = {
-    "Pass - R8152 kmsg during boot": (A618_NETWORK_ISSUE_LOGS, does_not_raise()),
+    "Fail - R8152 kmsg during boot phase": (
+        A618_NET_ISSUE_BOOT,
+        pytest.raises(MesaCIKnownIssueException),
+    ),
     "Fail - R8152 kmsg during test phase": (
-        [TEST_PHASE_LAVA_SIGNAL, *A618_NETWORK_ISSUE_LOGS],
+        A618_NET_ISSUE_TEST,
         pytest.raises(MesaCIKnownIssueException),
     ),
     "Pass - Partial (1) R8152 kmsg during test phase": (
-        [TEST_PHASE_LAVA_SIGNAL, A618_NETWORK_ISSUE_LOGS[0]],
+        A618_NET_ISSUE_TEST[:1],
         does_not_raise(),
     ),
     "Pass - Partial (2) R8152 kmsg during test phase": (
-        [TEST_PHASE_LAVA_SIGNAL, A618_NETWORK_ISSUE_LOGS[1]],
+        A618_NET_ISSUE_TEST[:2],
         does_not_raise(),
     ),
-    "Pass - Partial subsequent (3) R8152 kmsg during test phase": (
+    "Pass - Partial (3) subsequent R8152 kmsg during test phase": (
         [
             TEST_PHASE_LAVA_SIGNAL,
-            A618_NETWORK_ISSUE_LOGS[0],
+            A618_NET_ISSUE_TEST[1],
-            A618_NETWORK_ISSUE_LOGS[0],
+            A618_NET_ISSUE_TEST[1],
         ],
         does_not_raise(),
     ),
-    "Pass - Partial subsequent (4) R8152 kmsg during test phase": (
+    "Pass - Partial (4) subsequent nfs kmsg during test phase": (
         [
             TEST_PHASE_LAVA_SIGNAL,
-            A618_NETWORK_ISSUE_LOGS[1],
+            A618_NET_ISSUE_TEST[-1],
-            A618_NETWORK_ISSUE_LOGS[1],
+            A618_NET_ISSUE_TEST[-1],
         ],
         does_not_raise(),
     ),
@@ -364,6 +380,13 @@ A618_NETWORK_ISSUE_SCENARIOS = {
     ids=A618_NETWORK_ISSUE_SCENARIOS.keys(),
 )
 def test_detect_failure(messages, expectation):
-    lf = LogFollower()
+    boot_section = GitlabSection(
+        id="lava_boot",
+        header="LAVA boot",
+        type=LogSectionType.LAVA_BOOT,
+        start_collapsed=True,
+    )
+    boot_section.start()
+    lf = LogFollower(starting_section=boot_section)
     with expectation:
         lf.feed(messages)

.gitlab-ci/valve/traces-runner.sh

@@ -1,87 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-
-set -ex
-
-if [[ -z "$VK_DRIVER" ]]; then
-    exit 1
-fi
-
-# Useful debug output, you rarely know what envirnoment you'll be
-# running in within container-land, this can be a landmark.
-ls -l
-
-INSTALL=$(realpath -s "$PWD"/install)
-RESULTS=$(realpath -s "$PWD"/results)
-
-# Set up the driver environment.
-# Modifiying here directly LD_LIBRARY_PATH may cause problems when
-# using a command wrapper. Hence, we will just set it when running the
-# command.
-export __LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/"
-
-# Sanity check to ensure that our environment is sufficient to make our tests
-# run against the Mesa built by CI, rather than any installed distro version.
-MESA_VERSION=$(sed 's/\./\\./g' "$INSTALL/VERSION")
-
-# Force the stdout and stderr streams to be unbuffered in python.
-export PYTHONUNBUFFERED=1
-
-# Set the Vulkan driver to use.
-export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
-if [ "${VK_DRIVER}" = "radeon" ]; then
-    # Disable vsync
-    export MESA_VK_WSI_PRESENT_MODE=mailbox
-    export vblank_mode=0
-fi
-
-# Set environment for Wine.
-export WINEDEBUG="-all"
-export WINEPREFIX="/dxvk-wine64"
-export WINEESYNC=1
-
-# Wait for amdgpu to be fully loaded
-sleep 1
-
-# Avoid having to perform nasty command pre-processing to insert the
-# wine executable in front of the test executables. Instead, use the
-# kernel's binfmt support to automatically use Wine as an interpreter
-# when asked to load PE executables.
-# TODO: Have boot2container mount this filesystem for all jobs?
-mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
-echo ':DOSWin:M::MZ::/usr/bin/wine64:' > /proc/sys/fs/binfmt_misc/register
-
-# Set environment for DXVK.
-export DXVK_LOG_LEVEL="info"
-export DXVK_LOG="$RESULTS/dxvk"
-[ -d "$DXVK_LOG" ] || mkdir -pv "$DXVK_LOG"
-export DXVK_STATE_CACHE=0
-
-# Set environment for replaying traces.
-export PATH="/apitrace-msvc-win64/bin:/gfxreconstruct/build/bin:$PATH"
-
-SANITY_MESA_VERSION_CMD="vulkaninfo"
-
-# Set up the Window System Interface (WSI)
-# TODO: Can we get away with GBM?
-if [ "${TEST_START_XORG:-0}" -eq 1 ]; then
-    "$INSTALL"/common/start-x.sh "$INSTALL"
-    export DISPLAY=:0
-fi
-
-wine64 --version
-
-SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD | tee /tmp/version.txt | grep \"Mesa $MESA_VERSION\(\s\|$\)\""
-
-RUN_CMD="export LD_LIBRARY_PATH=$__LD_LIBRARY_PATH; $SANITY_MESA_VERSION_CMD"
-
-set +e
-if ! eval $RUN_CMD;
-then
-    printf "%s\n" "Found $(cat /tmp/version.txt), expected $MESA_VERSION"
-fi
-set -e
-
-# Just to be sure...
-chmod +x ./valvetraces-run.sh
-./valvetraces-run.sh

.gitlab-ci/vkd3d-proton/run.sh

@@ -23,7 +23,7 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/:/vkd3d-proton-tests/x64/"
 MESA_VERSION=$(sed 's/\./\\./g' "$INSTALL/VERSION")
 
 # Set the Vulkan driver to use.
-export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
+export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
 
 # Set environment for Wine.
 export WINEDEBUG="-all"

.gitlab-ci/windows/Dockerfile_build

@@ -3,6 +3,14 @@
 ARG base_image
 FROM ${base_image}
 
+COPY mesa_deps_vulkan_sdk.ps1 C:\
+RUN C:\mesa_deps_vulkan_sdk.ps1
+
+COPY mesa_init_msvc.ps1 C:\
+
+COPY mesa_deps_libva.ps1 C:\
+RUN C:\mesa_deps_libva.ps1
+
 COPY mesa_deps_build.ps1 C:\
 RUN C:\mesa_deps_build.ps1
 

.gitlab-ci/windows/Dockerfile_msvc

@@ -12,11 +12,9 @@ RUN powershell -ExecutionPolicy RemoteSigned -Command "$ErrorActionPreference =
 SHELL ["pwsh", "-ExecutionPolicy", "RemoteSigned", "-Command", "$ErrorActionPreference = 'Stop';"]
 RUN Write-Output $PSVersionTable $ErrorActionPreference
 
-COPY mesa_deps_vs2019.ps1 C:\
+COPY mesa_deps_msvc.ps1 C:\
-RUN C:\mesa_deps_vs2019.ps1
+RUN C:\mesa_deps_msvc.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
 
@@ -25,5 +23,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_vs -t mesa_vs --build-arg base_image="mcr.microsoft.com/windows:10.0.19041.1415" .
+# docker build --isolation=hyperv -f .\Dockerfile_msvc -t mesa_vs --build-arg base_image="mcr.microsoft.com/windows:10.0.19041.1415" .