VERSION: bump for 23.0.0-rc5

CC: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7987
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20981>

.clang-format-ignore

@@ -1,2 +0,0 @@
-# Vendored code
-src/amd/vulkan/radix_sort/*

.clang-format-include

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

.git-blame-ignore-revs

@@ -1,67 +0,0 @@
-# List of commits to ignore when using `git blame`.
-# Enable with:
-#   git config blame.ignoreRevsFile .git-blame-ignore-revs
-#
-# Per git-blame(1):
-#   Ignore revisions listed in the file, one unabbreviated object name
-#   per line, in git-blame. Whitespace and comments beginning with # are
-#   ignored.
-#
-# Please keep these in chronological order :)
-#
-# You can add a new commit with the following command:
-#   git log -1 --pretty=format:'%n# %s%n%H%n' >> .git-blame-ignore-revs $COMMIT
-
-# pvr: Fix clang-format error.
-0ad5b0a74ef73f5fcbe1406ad9d57fe5dc00a5b1
-
-# panfrost: Fix up some formatting for clang-format
-a4705afe63412498d13ded73cba969c66be67907
-
-# asahi: clang-format the world again
-26c51bb8d8a33098b1990425a391f56ffba5728c
-
-# perfetto: Add a .clang-format for the directory.
-da78d5d729b1800136dd713b68492cb339993f4a
-
-# panfrost/winsys: Clang-format
-c90f036516a5376002be6550a917e8bad6a8a3b8
-
-# panfrost: Re-run clang-format
-4ccf174009af6732cbffa5d8ebb4687da7517505
-
-# panvk: Clang-format
-c7bf3b69ebc8f2252dbf724a4de638e6bb2ac402
-
-# pan/mdg: Fix icky formatting
-133af0d6c945d3aaca8989edd15283a2b7dcc6c7
-
-# mapi: clang-format _glapi_add_dispatch()
-30332529663268a6406e910848e906e725e6fda7
-
-# radv: reformat according to its .clang-format
-8b319c6db8bd93603b18bd783eb75225fcfd51b7
-
-# aco: reformat according to its .clang-format
-6b21653ab4d3a67e711fe10e3d403128b6d26eb2
-
-# egl: re-format using clang-format
-2f670d89db038d5a29f6b72732fd7ad63dfaf4c6
-
-# panfrost: clang-format the tree
-0afd691f29683f6e9dde60f79eca094373521806
-
-# aco: Format.
-1e2639026fec7069806449f9ba2a124ce4eb5569
-
-# radv: Format.
-59c501ca353f8ec9d2717c98af2bfa1a1dbf4d75
-
-# pvr: clang-format fixes
-953c04ebd39c52d457301bdd8ac803949001da2d
-
-# freedreno: Re-indent
-2d439343ea1aee146d4ce32800992cd389bd505d
-
-# ir3: Reformat source with clang-format
-177138d8cb0b4f6a42ef0a1f8593e14d79f17c54

.gitattributes

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

.gitignore

@@ -1,7 +1,5 @@
-.cache
 .vscode*
 *.pyc
 *.pyo
 *.out
 /build
-.venv/

.gitlab-ci.yml

@@ -1,170 +1,55 @@
-# Types of CI pipelines:
-# | pipeline name        | context   | description                                                 |
-# |----------------------|-----------|-------------------------------------------------------------|
-# | merge pipeline       | mesa/mesa | pipeline running for an MR; if it passes the MR gets merged |
-# | pre-merge pipeline   | mesa/mesa | same as above, except its status doesn't affect the MR      |
-# | post-merge pipeline  | mesa/mesa | pipeline immediately after merging                          |
-# | fork pipeline        | fork      | pipeline running in a user fork                             |
-# | scheduled pipeline   | mesa/mesa | nightly pipelines, running every morning at 4am UTC         |
-# | direct-push pipeline | mesa/mesa | when commits are pushed directly to mesa/mesa, bypassing Marge and its gating pipeline |
-#
-# Note that the release branches maintained by the release manager fall under
-# the "direct push" category.
-#
-# "context" indicates the permissions that the jobs get; notably, any
-# container created in mesa/mesa gets pushed immediately for everyone to use
-# as soon as the image tag change is merged.
-#
-# Merge pipelines contain all jobs that must pass before the MR can be merged.
-# Pre-merge pipelines contain the exact same jobs as merge pipelines.
-# Post-merge pipelines contain *only* the `pages` job that deploys the new
-# version of the website.
-# Fork pipelines contain everything.
-# Scheduled pipelines only contain the container+build jobs, and some extra
-# test jobs (typically "full" variants of pre-merge jobs that only run 1/X
-# test cases), but not a repeat of the merge pipeline jobs.
-# Direct-push pipelines contain the same jobs as merge pipelines.
-
-workflow:
-  rules:
-    # do not duplicate pipelines on merge pipelines
-    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"
-      when: never
-    # merge pipeline
-    - if: &is-merge-attempt $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"
-      variables:
-        MESA_CI_PERFORMANCE_ENABLED: 1
-        VALVE_INFRA_VANGOGH_JOB_PRIORITY: ""  # Empty tags are ignored by gitlab
-        JOB_PRIORITY: 75
-        # fast-fail in merge pipelines: stop early if we get this many unexpected fails/crashes
-        DEQP_RUNNER_MAX_FAILS: 40
-    # post-merge pipeline
-    - if: &is-post-merge $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "push"
-    # Pre-merge pipeline
-    - if: &is-pre-merge $CI_PIPELINE_SOURCE == "merge_request_event"
-    # Push to a branch on a fork
-    - if: &is-fork-push $CI_PROJECT_NAMESPACE != "mesa" && $CI_PIPELINE_SOURCE == "push"
-    # nightly pipeline
-    - if: &is-scheduled-pipeline $CI_PIPELINE_SOURCE == "schedule"
-      variables:
-        # (some) nightly builds perform LTO, so they take much longer than the
-        # short timeout allowed in other pipelines.
-        # Note: 0 = infinity = gitlab's job `timeout:` applies, which is 1h
-        BUILD_JOB_TIMEOUT_OVERRIDE: 0
-    # pipeline for direct pushes that bypassed the CI
-    - if: &is-direct-push $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $GITLAB_USER_LOGIN != "marge-bot"
-      variables:
-        JOB_PRIORITY: 70
-
-
 variables:
   FDO_UPSTREAM_REPO: mesa/mesa
-  MESA_TEMPLATES_COMMIT: &ci-templates-commit e195d80f35b45cc73668be3767b923fd76c70ed5
+  MESA_TEMPLATES_COMMIT: &ci-templates-commit d5aa3941aa03c2f716595116354fb81eb8012acb
   CI_PRE_CLONE_SCRIPT: |-
           set -o xtrace
           wget -q -O download-git-cache.sh ${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/download-git-cache.sh
           bash download-git-cache.sh
           rm download-git-cache.sh
           set +o xtrace
-  S3_JWT_FILE: /s3_jwt
-  S3_HOST: s3.freedesktop.org
-  # This bucket is used to fetch the kernel image
-  S3_KERNEL_BUCKET: mesa-rootfs
-  # Bucket for git cache
-  S3_GITCACHE_BUCKET: git-cache
-  # Bucket for the pipeline artifacts pushed to S3
-  S3_ARTIFACTS_BUCKET: artifacts
-  # Buckets for traces
-  S3_TRACIE_RESULTS_BUCKET: mesa-tracie-results
-  S3_TRACIE_PUBLIC_BUCKET: mesa-tracie-public
-  S3_TRACIE_PRIVATE_BUCKET: mesa-tracie-private
+  CI_JOB_JWT_FILE: /minio_jwt
+  MINIO_HOST: s3.freedesktop.org
   # per-pipeline artifact storage on MinIO
-  PIPELINE_ARTIFACTS_BASE: ${S3_HOST}/${S3_ARTIFACTS_BUCKET}/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
+  PIPELINE_ARTIFACTS_BASE: ${MINIO_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
   # per-job artifact storage on MinIO
   JOB_ARTIFACTS_BASE: ${PIPELINE_ARTIFACTS_BASE}/${CI_JOB_ID}
   # reference images stored for traces
-  PIGLIT_REPLAY_REFERENCE_IMAGES_BASE: "${S3_HOST}/${S3_TRACIE_RESULTS_BUCKET}/$FDO_UPSTREAM_REPO"
-  # 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 priority for non-merge pipelines
-  VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
-  JOB_PRIORITY: 50
+  PIGLIT_REPLAY_REFERENCE_IMAGES_BASE: "${MINIO_HOST}/mesa-tracie-results/$FDO_UPSTREAM_REPO"
+  # Individual CI farm status, set to "offline" to disable jobs
+  # running on a particular CI farm (ie. for outages, etc):
+  FD_FARM: "online"
+  COLLABORA_FARM: "online"
+  MICROSOFT_FARM: "online"
+  LIMA_FARM: "online"
+  IGALIA_FARM: "online"
+  ANHOLT_FARM: "online"
+  VALVE_FARM: "online"
+  AUSTRIANCODER_FARM: "online"  # only etnaviv GPUs
 
 default:
-  id_tokens:
-    S3_JWT:
-      aud: https://s3.freedesktop.org
   before_script:
-    - |
-      if [ -z "${KERNEL_IMAGE_BASE:-}" ]; then
-        export KERNEL_IMAGE_BASE="https://${S3_HOST}/${S3_KERNEL_BUCKET}/${KERNEL_REPO}/${EXTERNAL_KERNEL_TAG:-$KERNEL_TAG}"
-      fi
-    - >
-      export SCRIPTS_DIR=$(mktemp -d) &&
-      curl -L -s --retry 4 -f --retry-all-errors --retry-delay 60 -O --output-dir "${SCRIPTS_DIR}" "${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/setup-test-env.sh" &&
-      . ${SCRIPTS_DIR}/setup-test-env.sh &&
-      echo -n "${S3_JWT}" > "${S3_JWT_FILE}" &&
-      unset CI_JOB_JWT S3_JWT  # Unsetting vulnerable env variables
+    - echo -e "\e[0Ksection_start:$(date +%s):unset_env_vars_section[collapsed=true]\r\e[0KUnsetting vulnerable environment variables"
+    - echo -n "${CI_JOB_JWT}" > "${CI_JOB_JWT_FILE}"
+    - unset CI_JOB_JWT
+    - echo -e "\e[0Ksection_end:$(date +%s):unset_env_vars_section\r\e[0K"
 
   after_script:
-    # Work around https://gitlab.com/gitlab-org/gitlab/-/issues/20338
-    - find -name '*.log' -exec mv {} {}.txt \;
+    - >
+      set +x
 
-  # Retry when job fails. Failed jobs can be found in the Mesa CI Daily Reports:
-  # https://gitlab.freedesktop.org/mesa/mesa/-/issues/?sort=created_date&state=opened&label_name%5B%5D=CI%20daily
+      test -e "${CI_JOB_JWT_FILE}" &&
+      export CI_JOB_JWT="$(<${CI_JOB_JWT_FILE})" &&
+      rm "${CI_JOB_JWT_FILE}"
+
+  # Retry build or test jobs up to twice when the gitlab-runner itself fails somehow.
   retry:
-    max: 1
-    # Ignore runner_unsupported, stale_schedule, archived_failure, or
-    # unmet_prerequisites
+    max: 2
     when:
-      - api_failure
       - runner_system_failure
-      - script_failure
-      - job_execution_timeout
-      - scheduler_failure
-      - data_integrity_failure
-      - unknown_failure
-
-stages:
-  - sanity
-  - container
-  - git-archive
-  - build-for-tests
-  - build-only
-  - code-validation
-  - amd
-  - amd-postmerge
-  - intel
-  - intel-postmerge
-  - nouveau
-  - nouveau-postmerge
-  - arm
-  - arm-postmerge
-  - broadcom
-  - broadcom-postmerge
-  - freedreno
-  - freedreno-postmerge
-  - etnaviv
-  - etnaviv-postmerge
-  - software-renderer
-  - software-renderer-postmerge
-  - layered-backends
-  - layered-backends-postmerge
-  - performance
-  - deploy
 
 include:
   - project: 'freedesktop/ci-templates'
-    ref: 16bc29078de5e0a067ff84a1a199a3760d3b3811
+    ref: ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2
     file:
       - '/templates/ci-fairy.yml'
   - project: 'freedesktop/ci-templates'
@@ -178,75 +63,161 @@ include:
   - local: '.gitlab-ci/container/gitlab-ci.yml'
   - local: '.gitlab-ci/build/gitlab-ci.yml'
   - local: '.gitlab-ci/test/gitlab-ci.yml'
-  - local: '.gitlab-ci/farm-rules.yml'
   - local: '.gitlab-ci/test-source-dep.yml'
-  - local: 'docs/gitlab-ci.yml'
-  - local: 'src/**/ci/gitlab-ci.yml'
+  - local: 'src/amd/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'
+
+stages:
+  - sanity
+  - container
+  - git-archive
+  - build-x86_64
+  - build-misc
+  - lint
+  - amd
+  - intel
+  - nouveau
+  - arm
+  - broadcom
+  - freedreno
+  - etnaviv
+  - software-renderer
+  - layered-backends
+  - deploy
 
 
-# Rules applied to every job in the pipeline
-.common-rules:
+# YAML anchors for rule conditions
+# --------------------------------
+.rules-anchors:
   rules:
-    - if: *is-fork-push
+    # Pipeline for forked project branch
+    - if: &is-forked-branch '$CI_COMMIT_BRANCH && $CI_PROJECT_NAMESPACE != "mesa"'
       when: manual
-
-.never-post-merge-rules:
-  rules:
-    - if: *is-post-merge
-      when: never
-
-
-.container+build-rules:
-  rules:
-    - !reference [.common-rules, rules]
-    # Run when re-enabling a disabled farm, but not when disabling it
-    - !reference [.disable-farm-mr-rules, rules]
-    # Never run immediately after merging, as we just ran everything
-    - !reference [.never-post-merge-rules, rules]
-    # Build everything in merge pipelines, if any files affecting the pipeline
-    # were changed
-    - if: *is-merge-attempt
-      changes: &all_paths
-        - VERSION
-        - bin/git_sha1_gen.py
-        - bin/install_megadrivers.py
-        - bin/symbols-check.py
-        # GitLab CI
-        - .gitlab-ci.yml
-        - .gitlab-ci/**/*
-        - .ci-farms/*
-        # Meson
-        - meson*
-        - build-support/**/*
-        - subprojects/**/*
-        # clang format
-        - .clang-format
-        - .clang-format-include
-        - .clang-format-ignore
-        # Source code
-        - include/**/*
-        - src/**/*
-      when: on_success
-    # Same as above, but for pre-merge pipelines
-    - if: *is-pre-merge
-      changes:
-        *all_paths
+    # Forked project branch / pre-merge pipeline not for Marge bot
+    - if: &is-forked-branch-or-pre-merge-not-for-marge '$CI_PROJECT_NAMESPACE != "mesa" || ($GITLAB_USER_LOGIN != "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event")'
       when: manual
-    # Skip everything for pre-merge and merge pipelines which don't change
-    # anything in the build
-    - if: *is-merge-attempt
-      when: never
+    # Pipeline runs for the main branch of the upstream Mesa project
+    - if: &is-mesa-main '$CI_PROJECT_NAMESPACE == "mesa" && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH && $CI_COMMIT_BRANCH'
+      when: always
+    # Post-merge pipeline
+    - if: &is-post-merge '$CI_PROJECT_NAMESPACE == "mesa" && $CI_COMMIT_BRANCH'
+      when: on_success
+    # Post-merge pipeline, not for Marge Bot
+    - if: &is-post-merge-not-for-marge '$CI_PROJECT_NAMESPACE == "mesa" && $GITLAB_USER_LOGIN != "marge-bot" && $CI_COMMIT_BRANCH'
+      when: on_success
+    # Pre-merge pipeline
+    - if: &is-pre-merge '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: on_success
+    # Pre-merge pipeline for Marge Bot
+    - if: &is-pre-merge-for-marge '$GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: on_success
+
+
+.docs-base:
+  variables:
+    BUILDER: html
+  extends:
+    - .fdo.ci-fairy
+    - .build-rules
+  artifacts:
+    expose_as: 'Documentation preview'
+    paths:
+    - public/
+  script:
+  - apk --no-cache add graphviz doxygen
+  - pip3 install sphinx===5.1.1 breathe===4.34.0 mako===1.2.3 sphinx_rtd_theme===1.0.0
+  - docs/doxygen-wrapper.py --out-dir=docs/doxygen_xml
+  - sphinx-build -W -b $BUILDER docs public
+
+pages:
+  extends: .docs-base
+  stage: deploy
+  needs: []
+  rules:
+    - !reference [.no_scheduled_pipelines-rules, rules]
+    - if: *is-mesa-main
+      changes: &docs-or-ci
+      - docs/**/*
+      - .gitlab-ci.yml
+      when: always
+    # Other cases default to never
+
+test-docs:
+  extends: .docs-base
+  # Cancel job if a newer commit is pushed to the same branch
+  interruptible: true
+  stage: deploy
+  needs: []
+  rules:
+    - !reference [.no_scheduled_pipelines-rules, rules]
+    - if: *is-forked-branch
+      changes: *docs-or-ci
+      when: manual
+    # Other cases default to never
+
+test-docs-mr:
+  extends:
+    - test-docs
+  needs:
+    - sanity
+  rules:
     - if: *is-pre-merge
-      when: never
-    # Build everything after someone bypassed the CI
-    - if: *is-direct-push
+      changes: *docs-or-ci
       when: on_success
-    # Build everything in scheduled pipelines
-    - if: *is-scheduled-pipeline
+    # Other cases default to never
+
+lincheck-docs:
+  extends: .docs-base
+  # Cancel job if a newer commit is pushed to the same branch
+  interruptible: true
+  stage: deploy
+  needs: []
+  rules:
+    - !reference [.scheduled_pipeline-rules, rules]
+  allow_failure: true
+  variables:
+    BUILDER: linkcheck
+
+# When to automatically run the CI for build jobs
+.build-rules:
+  rules:
+    - !reference [.no_scheduled_pipelines-rules, rules]
+    # If any files affecting the pipeline are changed, build/test jobs run
+    # automatically once all dependency jobs have passed
+    - changes: &all_paths
+      - VERSION
+      - bin/git_sha1_gen.py
+      - bin/install_megadrivers.py
+      - bin/meson_get_version.py
+      - bin/symbols-check.py
+      # GitLab CI
+      - .gitlab-ci.yml
+      - .gitlab-ci/**/*
+      # Meson
+      - meson*
+      - build-support/**/*
+      - subprojects/**/*
+      # Source code
+      - include/**/*
+      - src/**/*
       when: on_success
-    # Allow building everything in fork pipelines, but build nothing unless
-    # manually triggered
-    - when: manual
+    # Otherwise, build/test jobs won't run because no rule matched.
 
 
 .ci-deqp-artifacts:
@@ -261,6 +232,35 @@ include:
       - _build/meson-logs/*.txt
       - _build/meson-logs/strace
 
+.container-rules:
+  rules:
+    - !reference [.no_scheduled_pipelines-rules, rules]
+    # Run pipeline by default in the main project if any CI pipeline
+    # configuration files were changed, to ensure docker images are up to date
+    - if: *is-post-merge
+      changes:
+      - .gitlab-ci.yml
+      - .gitlab-ci/**/*
+      when: on_success
+    # Run pipeline by default if it was triggered by Marge Bot, is for a
+    # merge request, and any files affecting the pipeline were changed
+    - if: *is-pre-merge-for-marge
+      changes:
+        *all_paths
+      when: on_success
+    # Run pipeline by default in the main project if it was not triggered by
+    # Marge Bot, and any files affecting the pipeline were changed
+    - if: *is-post-merge-not-for-marge
+      changes:
+        *all_paths
+      when: on_success
+    # Allow triggering jobs manually in other cases if any files affecting the
+    # pipeline were changed
+    - changes:
+        *all_paths
+      when: manual
+    # Otherwise, container jobs won't run because no rule matched.
+
 # Git archive
 
 make git archive:
@@ -275,12 +275,11 @@ make git archive:
   script:
     # Compactify the .git directory
     - git gc --aggressive
-    # Download & cache the perfetto subproject as well.
-    - rm -rf subprojects/perfetto ; mkdir -p subprojects/perfetto && curl https://android.googlesource.com/platform/external/perfetto/+archive/$(grep 'revision =' subprojects/perfetto.wrap | cut -d ' ' -f3).tar.gz | tar zxf - -C subprojects/perfetto
     # compress the current folder
     - tar -cvzf ../$CI_PROJECT_NAME.tar.gz .
 
-    - ci-fairy s3cp --token-file "${S3_JWT_FILE}" ../$CI_PROJECT_NAME.tar.gz https://$S3_HOST/git-cache/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_PROJECT_NAME.tar.gz
+    - ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" ../$CI_PROJECT_NAME.tar.gz https://$MINIO_HOST/git-cache/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_PROJECT_NAME.tar.gz
+
 
 # Sanity checks of MR settings and commit logs
 sanity:
@@ -290,69 +289,28 @@ sanity:
   rules:
     - if: *is-pre-merge
       when: on_success
-    - when: never
+    # Other cases default to never
   variables:
     GIT_STRATEGY: none
   script:
     # ci-fairy check-commits --junit-xml=check-commits.xml
     - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=check-merge-request.xml
-    - |
-      set -eu
-      image_tags=(
-        ALPINE_X86_64_BUILD_TAG
-        ALPINE_X86_64_LAVA_SSH_TAG
-        DEBIAN_BASE_TAG
-        DEBIAN_BUILD_TAG
-        DEBIAN_PYUTILS_TAG
-        DEBIAN_TEST_ANDROID_TAG
-        DEBIAN_TEST_GL_TAG
-        DEBIAN_TEST_VK_TAG
-        FEDORA_X86_64_BUILD_TAG
-        KERNEL_ROOTFS_TAG
-        KERNEL_TAG
-        PKG_REPO_REV
-        WINDOWS_X64_BUILD_TAG
-        WINDOWS_X64_MSVC_TAG
-        WINDOWS_X64_TEST_TAG
-      )
-      for var in "${image_tags[@]}"
-      do
-        if [ "$(echo -n "${!var}" | wc -c)" -gt 20 ]
-        then
-          echo "$var is too long; please make sure it is at most 20 chars."
-          exit 1
-        fi
-      done
   artifacts:
     when: on_failure
     reports:
       junit: check-*.xml
-  tags:
-    - placeholder-job
 
-
-mr-label-maker-test:
-  extends:
-    - .fdo.ci-fairy
-  stage: sanity
+# Rules for tests that should not block merging, but should be available to
+# optionally run with the "play" button in the UI in pre-merge non-marge
+# pipelines.  This should appear in "extends:" after any includes of
+# test-source-dep.yml rules, so that these rules replace those.
+.test-manual-mr:
   rules:
-    - !reference [.mr-label-maker-rules, rules]
+    - !reference [.no_scheduled_pipelines-rules, rules]
+    - if: *is-forked-branch-or-pre-merge-not-for-marge
+      changes:
+        *all_paths
+      when: manual
   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
+    JOB_TIMEOUT: 80
 
-# Jobs that need to pass before spending hardware resources on further testing
-.required-for-hardware-jobs:
-  needs:
-    - job: clang-format
-      optional: true
-    - job: rustfmt
-      optional: true
-    - job: toml-lint
-      optional: true

.gitlab-ci/all-skips.txt

@@ -2,16 +2,6 @@
 # non-zero-length and not starting with '#', will regex match to
 # delete lines from the test list.  Be careful.
 
-# This test checks the driver's reported conformance version against the
-# version of the CTS we're running. This check fails every few months
-# and everyone has to go and bump the number in every driver.
-# Running this check only makes sense while preparing a conformance
-# submission, so skip it in the regular CI.
-dEQP-VK.api.driver_properties.conformance_version
-
-# 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.*
@@ -25,63 +15,3 @@ glx@glx_arb_sync_control@timing.*
 
 # This test is not built with waffle, while we do build tests with waffle
 spec@!opengl 1.1@windowoverlap
-
-# These tests all read from the front buffer after a swap.  Given that we
-# run piglit tests in parallel in Mesa CI, and don't have a compositor
-# running, the frontbuffer reads may end up with undefined results from
-# windows overlapping us.
-#
-# Piglit does mark these tests as not to be run in parallel, but deqp-runner
-# doesn't respect that.  We need to extend deqp-runner to allow some tests to be
-# marked as single-threaded and run after the rayon loop if we want to support
-# them.
-#
-# 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
-
-# These test the loader more than the implementation and are broken because the
-# Vulkan loader in Debian is too old
-dEQP-VK.api.get_device_proc_addr.non_enabled
-dEQP-VK.api.version_check.unavailable_entry_points

.gitlab-ci/angle-skips.txt

@@ -1,7 +0,0 @@
-# Unlike zink which does support it, ANGLE relies on a waiver to not implement
-# capturing individual array elements (see waivers.xml and gles3-waivers.txt in the CTS)
-dEQP-GLES3.functional.transform_feedback.array_element.*
-dEQP-GLES3.functional.transform_feedback.random.*
-dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.*_array_element
-dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.type.*.array.*
-KHR-GLES31.core.program_interface_query.transform-feedback-types

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

@@ -2,28 +2,25 @@ version: 1
 
 # Rules to match for a machine to qualify
 target:
-  id: '{{ ci_runner_id }}'
+{% if tags %}
+  tags:
+{% for tag in tags %}
+    - '{{ tag | trim }}'
+{% endfor %}
+{% endif %}
 
 timeouts:
-
   first_console_activity:  # This limits the time it can take to receive the first console log
-    minutes: {{ timeout_first_console_activity_minutes | default(0, true) }}
-    seconds: {{ timeout_first_console_activity_seconds | default(0, true) }}
-    retries: {{ timeout_first_console_activity_retries }}
-
+    minutes: {{ timeout_first_minutes }}
+    retries: {{ timeout_first_retries }}
   console_activity:        # Reset every time we receive a message from the logs
-    minutes: {{ timeout_console_activity_minutes | default(0, true) }}
-    seconds: {{ timeout_console_activity_seconds | default(0, true) }}
-    retries: {{ timeout_console_activity_retries }}
-
+    minutes: {{ timeout_minutes }}
+    retries: {{ timeout_retries }}
   boot_cycle:
-    minutes: {{ timeout_boot_minutes | default(0, true) }}
-    seconds: {{ timeout_boot_seconds | default(0, true) }}
+    minutes: {{ timeout_boot_minutes }}
     retries: {{ timeout_boot_retries }}
-
   overall:                 # Maximum time the job can take, not overrideable by the "continue" deployment
-    minutes: {{ timeout_overall_minutes | default(0, true) }}
-    seconds: {{ timeout_overall_seconds | default(0, true) }}
+    minutes: {{ timeout_overall_minutes }}
     retries: 0
     # no retries possible here
 
@@ -31,59 +28,39 @@ console_patterns:
     session_end:
         regex: >-
           {{ session_end_regex }}
-{% if session_reboot_regex %}
     session_reboot:
         regex: >-
           {{ session_reboot_regex }}
-{% endif %}
     job_success:
         regex: >-
           {{ job_success_regex }}
-{% if job_warn_regex %}
     job_warn:
         regex: >-
           {{ job_warn_regex }}
-{% endif %}
 
 # Environment to deploy
 deployment:
   # Initial boot
   start:
-    storage:
-        http:
-          - path: "/b2c-extra-args"
-            data: >
-              b2c.pipefail b2c.poweroff_delay={{ poweroff_delay }}
-              b2c.minio="gateway,{{ '{{' }} minio_url }},{{ '{{' }} job_bucket_access_key }},{{ '{{' }} job_bucket_secret_key }}"
-              b2c.volume="{{ '{{' }} job_bucket }}-results,mirror=gateway/{{ '{{' }} job_bucket }},pull_on=pipeline_start,push_on=changes,overwrite{% for excl in job_volume_exclusions %},exclude={{ excl }}{% endfor %},remove,expiration=pipeline_end,preserve"
-              {% for volume in volumes %}
-              b2c.volume={{ volume }}
-              {% endfor %}
-              b2c.service="--privileged --tls-verify=false --pid=host docker://{{ '{{' }} fdo_proxy_registry }}/gfx-ci/ci-tron/telegraf:latest" b2c.hostname=dut-{{ '{{' }} machine.full_name }}
-              b2c.run="-ti --tls-verify=false docker://{{ '{{' }} fdo_proxy_registry }}/gfx-ci/ci-tron/machine-registration:latest check"
-              b2c.container="-v {{ '{{' }} job_bucket }}-results:{{ working_dir }} -w {{ working_dir }} {% for mount_volume in mount_volumes %} -v {{ mount_volume }}{% endfor %} --tls-verify=false docker://{{ local_container }} {{ container_cmd | replace('"', '\\\"') }}"
     kernel:
-{% if kernel_url %}
       url: '{{ kernel_url }}'
-{% endif %}
-
-      # NOTE: b2c.cache_device should not be here, but this works around
-      # a limitation of b2c which will be removed in the next release
       cmdline: >
         SALAD.machine_id={{ '{{' }} machine_id }}
-        console={{ '{{' }} local_tty_device }},115200
-        b2c.cache_device=auto b2c.ntp_peer=10.42.0.1
-        b2c.extra_args_url={{ '{{' }} job.http.url }}/b2c-extra-args
-        {% if kernel_cmdline_extras is defined %}
-        {{ kernel_cmdline_extras }}
+        console={{ '{{' }} local_tty_device }},115200 earlyprintk=vga,keep
+        loglevel={{ log_level }} no_hash_pointers
+        b2c.service="--privileged --tls-verify=false --pid=host docker://{{ '{{' }} fdo_proxy_registry }}/mupuf/valve-infra/telegraf-container:latest" b2c.hostname=dut-{{ '{{' }} machine.full_name }}
+        b2c.container="-ti --tls-verify=false docker://{{ '{{' }} fdo_proxy_registry }}/mupuf/valve-infra/machine_registration:latest check"
+        b2c.ntp_peer=10.42.0.1 b2c.pipefail b2c.cache_device=auto b2c.poweroff_delay={{ poweroff_delay }}
+        b2c.minio="gateway,{{ '{{' }} minio_url }},{{ '{{' }} job_bucket_access_key }},{{ '{{' }} job_bucket_secret_key }}"
+        b2c.volume="{{ '{{' }} job_bucket }}-results,mirror=gateway/{{ '{{' }} job_bucket }},pull_on=pipeline_start,push_on=changes,overwrite{% for excl in job_volume_exclusions %},exclude={{ excl }}{% endfor %},remove,expiration=pipeline_end,preserve"
+{% for volume in volumes %}
+        b2c.volume={{ volume }}
+{% endfor %}
+        b2c.container="-v {{ '{{' }} job_bucket }}-results:{{ working_dir }} -w {{ working_dir }} {% for mount_volume in mount_volumes %} -v {{ mount_volume }}{% endfor %} --tls-verify=false docker://{{ local_container }} {{ container_cmd }}"
+        {% if cmdline_extras is defined %}
+        {{ cmdline_extras }}
         {% endif %}
 
-{% if initramfs_url %}
     initramfs:
       url: '{{ initramfs_url }}'
-{% endif %}
 
-{% if dtb_url %}
-    dtb:
-      url: '{{ dtb_url }}'
-{% endif %}

.gitlab-ci/b2c/generate_b2c.py

@@ -22,34 +22,86 @@
 # IN THE SOFTWARE.
 
 from jinja2 import Environment, FileSystemLoader
+from argparse import ArgumentParser
 from os import environ, path
+import json
 
 
-# Pass all the environment variables prefixed by B2C_
-values = {
-    key.removeprefix("B2C_").lower(): environ[key]
-    for key in environ if key.startswith("B2C_")
-}
+parser = ArgumentParser()
+parser.add_argument('--ci-job-id')
+parser.add_argument('--container-cmd')
+parser.add_argument('--initramfs-url')
+parser.add_argument('--job-success-regex')
+parser.add_argument('--job-warn-regex')
+parser.add_argument('--kernel-url')
+parser.add_argument('--log-level', type=int)
+parser.add_argument('--poweroff-delay', type=int)
+parser.add_argument('--session-end-regex')
+parser.add_argument('--session-reboot-regex')
+parser.add_argument('--tags', nargs='?', default='')
+parser.add_argument('--template', default='b2c.yml.jinja2.jinja2')
+parser.add_argument('--timeout-boot-minutes', type=int)
+parser.add_argument('--timeout-boot-retries', type=int)
+parser.add_argument('--timeout-first-minutes', type=int)
+parser.add_argument('--timeout-first-retries', type=int)
+parser.add_argument('--timeout-minutes', type=int)
+parser.add_argument('--timeout-overall-minutes', type=int)
+parser.add_argument('--timeout-retries', type=int)
+parser.add_argument('--job-volume-exclusions', nargs='?', default='')
+parser.add_argument('--volume', action='append')
+parser.add_argument('--mount-volume', action='append')
+parser.add_argument('--local-container', default=environ.get('B2C_LOCAL_CONTAINER', 'alpine:latest'))
+parser.add_argument('--working-dir')
+args = parser.parse_args()
 
-env = Environment(loader=FileSystemLoader(path.dirname(values['job_template'])),
+env = Environment(loader=FileSystemLoader(path.dirname(args.template)),
                   trim_blocks=True, lstrip_blocks=True)
 
-template = env.get_template(path.basename(values['job_template']))
+template = env.get_template(path.basename(args.template))
 
-values['ci_job_id'] = environ['CI_JOB_ID']
-values['ci_runner_id'] = environ['CI_RUNNER_ID']
-values['job_volume_exclusions'] = [excl for excl in values['job_volume_exclusions'].split(",") if excl]
-values['working_dir'] = environ['CI_PROJECT_DIR']
+values = {}
+values['ci_job_id'] = args.ci_job_id
+values['container_cmd'] = args.container_cmd
+values['initramfs_url'] = args.initramfs_url
+values['job_success_regex'] = args.job_success_regex
+values['job_warn_regex'] = args.job_warn_regex
+values['kernel_url'] = args.kernel_url
+values['log_level'] = args.log_level
+values['poweroff_delay'] = args.poweroff_delay
+values['session_end_regex'] = args.session_end_regex
+values['session_reboot_regex'] = args.session_reboot_regex
+try:
+    values['tags'] = json.loads(args.tags)
+except json.decoder.JSONDecodeError:
+    values['tags'] = args.tags.split(",")
+values['template'] = args.template
+values['timeout_boot_minutes'] = args.timeout_boot_minutes
+values['timeout_boot_retries'] = args.timeout_boot_retries
+values['timeout_first_minutes'] = args.timeout_first_minutes
+values['timeout_first_retries'] = args.timeout_first_retries
+values['timeout_minutes'] = args.timeout_minutes
+values['timeout_overall_minutes'] = args.timeout_overall_minutes
+values['timeout_retries'] = args.timeout_retries
+if len(args.job_volume_exclusions) > 0:
+    exclusions = args.job_volume_exclusions.split(",")
+    values['job_volume_exclusions'] = [excl for excl in exclusions if len(excl) > 0]
+if args.volume is not None:
+    values['volumes'] = args.volume
+if args.mount_volume is not None:
+    values['mount_volumes'] = args.mount_volume
+values['working_dir'] = args.working_dir
+
+assert(len(args.local_container) > 0)
 
 # Use the gateway's pull-through registry caches to reduce load on fd.o.
-values['local_container'] = environ['IMAGE_UNDER_TEST']
-values['local_container'] = values['local_container'].replace(
-    'registry.freedesktop.org',
-    '{{ fdo_proxy_registry }}'
-)
+values['local_container'] = args.local_container
+for url, replacement in [('registry.freedesktop.org', '{{ fdo_proxy_registry }}'),
+                         ('harbor.freedesktop.org', '{{ harbor_fdo_registry }}')]:
+    values['local_container'] = values['local_container'].replace(url, replacement)
 
-if 'kernel_cmdline_extras' not in values:
-    values['kernel_cmdline_extras'] = ''
+if 'B2C_KERNEL_CMDLINE_EXTRAS' in environ:
+    values['cmdline_extras'] = environ['B2C_KERNEL_CMDLINE_EXTRAS']
 
-with open(path.splitext(path.basename(values['job_template']))[0], "w") as f:
-    f.write(template.render(values))
+f = open(path.splitext(path.basename(args.template))[0], "w")
+f.write(template.render(values))
+f.close()

.gitlab-ci/bare-metal/bm-init.sh

@@ -5,8 +5,6 @@
 # First stage: very basic setup to bring up network and /dev etc
 /init-stage1.sh
 
-export CURRENT_SECTION=dut_boot
-
 # Second stage: run jobs
 test $? -eq 0 && /init-stage2.sh
 

.gitlab-ci/bare-metal/cisco-2960-poe-off.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-# shellcheck disable=SC2086 # we want word splitting
 
 if [ -z "$BM_POE_INTERFACE" ]; then
     echo "Must supply the PoE Interface to power down"
@@ -12,6 +11,7 @@ if [ -z "$BM_POE_ADDRESS" ]; then
 fi
 
 SNMP_KEY="1.3.6.1.4.1.9.9.402.1.2.1.1.1.$BM_POE_INTERFACE"
+SNMP_ON="i 1"
 SNMP_OFF="i 4"
 
-snmpset -v2c -r 3 -t 30 -cmesaci "$BM_POE_ADDRESS" "$SNMP_KEY" $SNMP_OFF
+snmpset -v2c -r 3 -t 30 -cmesaci $BM_POE_ADDRESS $SNMP_KEY $SNMP_OFF

.gitlab-ci/bare-metal/cisco-2960-poe-on.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-# shellcheck disable=SC2086 # we want word splitting
 
 if [ -z "$BM_POE_INTERFACE" ]; then
     echo "Must supply the PoE Interface to power up"
@@ -17,6 +16,6 @@ SNMP_KEY="1.3.6.1.4.1.9.9.402.1.2.1.1.1.$BM_POE_INTERFACE"
 SNMP_ON="i 1"
 SNMP_OFF="i 4"
 
-snmpset -v2c -r 3 -t 10 -cmesaci "$BM_POE_ADDRESS" "$SNMP_KEY" $SNMP_OFF
+snmpset -v2c -r 3 -t 10 -cmesaci $BM_POE_ADDRESS $SNMP_KEY $SNMP_OFF
 sleep 3s
-snmpset -v2c -r 3 -t 10 -cmesaci "$BM_POE_ADDRESS" "$SNMP_KEY" $SNMP_ON
+snmpset -v2c -r 3 -t 10 -cmesaci $BM_POE_ADDRESS $SNMP_KEY $SNMP_ON

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

@@ -1,7 +1,4 @@
 #!/bin/bash
-# shellcheck disable=SC1091 # The relative paths in this file only become valid at runtime.
-# shellcheck disable=SC2034
-# shellcheck disable=SC2086 # we want word splitting
 
 # Boot script for Chrome OS devices attached to a servo debug connector, using
 # NFS and TFTP to boot.
@@ -9,7 +6,6 @@
 # We're run from the root of the repo, make a helper var for our paths
 BM=$CI_PROJECT_DIR/install/bare-metal
 CI_COMMON=$CI_PROJECT_DIR/install/common
-CI_INSTALL=$CI_PROJECT_DIR/install
 
 # Runner config checks
 if [ -z "$BM_SERIAL" ]; then
@@ -50,10 +46,6 @@ if [ -z "$BM_CMDLINE" ]; then
   exit 1
 fi
 
-. "${SCRIPTS_DIR}/setup-test-env.sh"
-
-section_start prepare_rootfs "Preparing rootfs components"
-
 set -ex
 
 # Clear out any previous run's artifacts.
@@ -88,42 +80,23 @@ mkdir -p /nfs/results
 
 rm -rf /tftp/*
 if echo "$BM_KERNEL" | grep -q http; then
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-      $BM_KERNEL -o /tftp/vmlinuz
-elif [ -n "${EXTERNAL_KERNEL_TAG}" ]; then
-  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 &
+  apt install -y wget
+  wget $BM_KERNEL -O /tftp/vmlinuz
 else
-  cp /baremetal-files/"$BM_KERNEL" /tftp/vmlinuz
+  cp $BM_KERNEL /tftp/vmlinuz
 fi
 echo "$BM_CMDLINE" > /tftp/cmdline
 
 set +e
-STRUCTURED_LOG_FILE=results/job_detail.json
-python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update dut_job_type "${DEVICE_TYPE}"
-python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update farm "${FARM}"
-python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --create-dut-job dut_name "${CI_RUNNER_DESCRIPTION}"
-python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update-dut-time submit "${CI_JOB_STARTED_AT}"
-section_end prepare_rootfs
-
 python3 $BM/cros_servo_run.py \
         --cpu $BM_SERIAL \
         --ec $BM_SERIAL_EC \
-        --test-timeout ${TEST_PHASE_TIMEOUT_MINUTES:-20}
+        --test-timeout ${TEST_PHASE_TIMEOUT:-20}
 ret=$?
-
-section_start dut_cleanup "Cleaning up after job"
-python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --close-dut-job
-python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --close
 set -e
 
 # Bring artifacts back from the NFS dir to the build dir where gitlab-runner
 # will look for them.
 cp -Rp /nfs/results/. results/
-section_end dut_cleanup
 
 exit $ret

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

@@ -1,77 +1,61 @@
+
 #!/usr/bin/env python3
 #
 # Copyright © 2020 Google LLC
-# SPDX-License-Identifier: MIT
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
 
 import argparse
-import datetime
-import math
-import os
+import queue
 import re
-import sys
-
-from custom_logger import CustomLogger
 from serial_buffer import SerialBuffer
+import sys
+import threading
 
-ANSI_ESCAPE="\x1b[0K"
-ANSI_COLOUR="\x1b[0;36m"
-ANSI_RESET="\x1b[0m"
-SECTION_START="start"
-SECTION_END="end"
 
 class CrosServoRun:
-    def __init__(self, cpu, ec, test_timeout, logger):
+    def __init__(self, cpu, ec, test_timeout):
         self.cpu_ser = SerialBuffer(
-            cpu, "results/serial.txt", ": ")
+            cpu, "results/serial.txt", "R SERIAL-CPU> ")
         # Merge the EC serial into the cpu_ser's line stream so that we can
         # effectively poll on both at the same time and not have to worry about
         self.ec_ser = SerialBuffer(
-            ec, "results/serial-ec.txt", " EC: ", line_queue=self.cpu_ser.line_queue)
+            ec, "results/serial-ec.txt", "R SERIAL-EC> ", line_queue=self.cpu_ser.line_queue)
         self.test_timeout = test_timeout
-        self.logger = logger
 
     def close(self):
         self.ec_ser.close()
         self.cpu_ser.close()
 
     def ec_write(self, s):
-        print("EC> %s" % s)
+        print("W SERIAL-EC> %s" % s)
         self.ec_ser.serial.write(s.encode())
 
     def cpu_write(self, s):
-        print("> %s" % s)
+        print("W SERIAL-CPU> %s" % s)
         self.cpu_ser.serial.write(s.encode())
 
     def print_error(self, message):
         RED = '\033[0;31m'
         NO_COLOR = '\033[0m'
         print(RED + message + NO_COLOR)
-        self.logger.update_status_fail(message)
-
-    def get_rel_timestamp(self):
-        now = datetime.datetime.now(tz=datetime.UTC)
-        then_env = os.getenv("CI_JOB_STARTED_AT")
-        if not then_env:
-            return ""
-        delta = now - datetime.datetime.fromisoformat(then_env)
-        return f"[{math.floor(delta.seconds / 60):02}:{(delta.seconds % 60):02}]"
-
-    def get_cur_timestamp(self):
-        return str(int(datetime.datetime.timestamp(datetime.datetime.now())))
-
-    def print_gitlab_section(self, action, name, description, collapse=True):
-        assert action in [SECTION_START, SECTION_END]
-        out = ANSI_ESCAPE + "section_" + action + ":"
-        out += self.get_cur_timestamp() + ":"
-        out += name
-        if action == "start" and collapse:
-            out += "[collapsed=true]"
-        out += "\r" + ANSI_ESCAPE + ANSI_COLOUR
-        out += self.get_rel_timestamp() + " " + description + ANSI_RESET
-        print(out)
-
-    def boot_section(self, action):
-        self.print_gitlab_section(action, "dut_boot", "Booting hardware device", True)
 
     def run(self):
         # Flush any partial commands in the EC's prompt, then ask for a reboot.
@@ -79,9 +63,6 @@ class CrosServoRun:
         self.ec_write("reboot\n")
 
         bootloader_done = False
-        self.logger.create_job_phase("boot")
-        self.boot_section(SECTION_START)
-        tftp_failures = 0
         # This is emitted right when the bootloader pauses to check for input.
         # Emit a ^N character to request network boot, because we don't have a
         # direct-to-netboot firmware on cheza.
@@ -91,17 +72,6 @@ class CrosServoRun:
                 bootloader_done = True
                 break
 
-            # The Cheza firmware seems to occasionally get stuck looping in
-            # this error state during TFTP booting, possibly based on amount of
-            # network traffic around it, but it'll usually recover after a
-            # reboot. Currently mostly visible on google-freedreno-cheza-14.
-            if re.search("R8152: Bulk read error 0xffffffbf", line):
-                tftp_failures += 1
-                if tftp_failures >= 10:
-                    self.print_error(
-                        "Detected intermittent tftp failure, restarting run.")
-                    return 1
-
             # If the board has a netboot firmware and we made it to booting the
             # kernel, proceed to processing of the test run.
             if re.search("Booting Linux", line):
@@ -113,30 +83,41 @@ class CrosServoRun:
             # in the farm.
             if re.search("POWER_GOOD not seen in time", line):
                 self.print_error(
-                    "Detected intermittent poweron failure, abandoning run.")
-                return 1
+                    "Detected intermittent poweron failure, restarting run...")
+                return 2
 
         if not bootloader_done:
-            self.print_error("Failed to make it through bootloader, abandoning run.")
-            return 1
+            print("Failed to make it through bootloader, restarting run...")
+            return 2
 
-        self.logger.create_job_phase("test")
+        tftp_failures = 0
         for line in self.cpu_ser.lines(timeout=self.test_timeout, phase="test"):
             if re.search("---. end Kernel panic", line):
                 return 1
 
+            # The Cheza firmware seems to occasionally get stuck looping in
+            # this error state during TFTP booting, possibly based on amount of
+            # network traffic around it, but it'll usually recover after a
+            # reboot.
+            if re.search("R8152: Bulk read error 0xffffffbf", line):
+                tftp_failures += 1
+                if tftp_failures >= 100:
+                    self.print_error(
+                        "Detected intermittent tftp failure, restarting run...")
+                    return 2
+
             # There are very infrequent bus errors during power management transitions
             # on cheza, which we don't expect to be the case on future boards.
             if re.search("Kernel panic - not syncing: Asynchronous SError Interrupt", line):
                 self.print_error(
-                    "Detected cheza power management bus error, abandoning run.")
-                return 1
+                    "Detected cheza power management bus error, restarting run...")
+                return 2
 
             # If the network device dies, it's probably not graphics's fault, just try again.
             if re.search("NETDEV WATCHDOG", line):
                 self.print_error(
-                    "Detected network device failure, abandoning run.")
-                return 1
+                    "Detected network device failure, restarting run...")
+                return 2
 
             # These HFI response errors started appearing with the introduction
             # of piglit runs.  CosmicPenguin says:
@@ -149,34 +130,28 @@ class CrosServoRun:
             # break many tests after that, just restart the whole run.
             if re.search("a6xx_hfi_send_msg.*Unexpected message id .* on the response queue", line):
                 self.print_error(
-                    "Detected cheza power management bus error, abandoning run.")
-                return 1
+                    "Detected cheza power management bus error, restarting run...")
+                return 2
 
             if re.search("coreboot.*bootblock starting", line):
                 self.print_error(
-                    "Detected spontaneous reboot, abandoning run.")
-                return 1
+                    "Detected spontaneous reboot, restarting run...")
+                return 2
 
             if re.search("arm-smmu 5040000.iommu: TLB sync timed out -- SMMU may be deadlocked", line):
-                self.print_error("Detected cheza MMU fail, abandoning run.")
-                return 1
+                self.print_error("Detected cheza MMU fail, restarting run...")
+                return 2
 
-            result = re.search(r"hwci: mesa: (\S*), exit_code: (\d+)", line)
+            result = re.search("hwci: mesa: (\S*)", line)
             if result:
-                status = result.group(1)
-                exit_code = int(result.group(2))
-
-                if status == "pass":
-                    self.logger.update_dut_job("status", "pass")
+                if result.group(1) == "pass":
+                    return 0
                 else:
-                    self.logger.update_status_fail("test fail")
-
-                self.logger.update_dut_job("exit_code", exit_code)
-                return exit_code
+                    return 1
 
         self.print_error(
             "Reached the end of the CPU serial log without finding a result")
-        return 1
+        return 2
 
 
 def main():
@@ -189,17 +164,16 @@ def main():
         '--test-timeout', type=int, help='Test phase timeout (minutes)', required=True)
     args = parser.parse_args()
 
-    logger = CustomLogger("results/job_detail.json")
-    logger.update_dut_time("start", None)
-    servo = CrosServoRun(args.cpu, args.ec, args.test_timeout * 60, logger)
-    retval = servo.run()
+    while True:
+        servo = CrosServoRun(args.cpu, args.ec, args.test_timeout * 60)
+        retval = servo.run()
 
-    # power down the CPU on the device
-    servo.ec_write("power off\n")
-    logger.update_dut_time("end", None)
-    servo.close()
+        # power down the CPU on the device
+        servo.ec_write("power off\n")
+        servo.close()
 
-    sys.exit(retval)
+        if retval != 2:
+            sys.exit(retval)
 
 
 if __name__ == '__main__':

.gitlab-ci/bare-metal/eth008-power-down.sh

@@ -7,4 +7,4 @@ if [ -z "$relay" ]; then
     exit 1
 fi
 
-"$CI_PROJECT_DIR"/install/bare-metal/eth008-power-relay.py "$ETH_HOST" "$ETH_PORT" off "$relay"
+$CI_PROJECT_DIR/install/bare-metal/eth008-power-relay.py $ETH_HOST $ETH_PORT off $relay

.gitlab-ci/bare-metal/eth008-power-up.sh

@@ -7,6 +7,6 @@ if [ -z "$relay" ]; then
     exit 1
 fi
 
-"$CI_PROJECT_DIR"/install/bare-metal/eth008-power-relay.py "$ETH_HOST" "$ETH_PORT" off "$relay"
+$CI_PROJECT_DIR/install/bare-metal/eth008-power-relay.py $ETH_HOST $ETH_PORT off $relay
 sleep 5
-"$CI_PROJECT_DIR"/install/bare-metal/eth008-power-relay.py "$ETH_HOST" "$ETH_PORT" on "$relay"
+$CI_PROJECT_DIR/install/bare-metal/eth008-power-relay.py $ETH_HOST $ETH_PORT on $relay

.gitlab-ci/bare-metal/expect-output.sh

@@ -5,27 +5,26 @@ set -e
 STRINGS=$(mktemp)
 ERRORS=$(mktemp)
 
-trap 'rm $STRINGS; rm $ERRORS;' EXIT
+trap "rm $STRINGS; rm $ERRORS;" EXIT
 
 FILE=$1
 shift 1
 
 while getopts "f:e:" opt; do
   case $opt in
-    f) echo "$OPTARG" >> "$STRINGS";;
-    e) echo "$OPTARG" >> "$STRINGS" ; echo "$OPTARG" >> "$ERRORS";;
-    *) exit
+    f) echo "$OPTARG" >> $STRINGS;;
+    e) echo "$OPTARG" >> $STRINGS ; echo "$OPTARG" >> $ERRORS;;
   esac
 done
 shift $((OPTIND -1))
 
 echo "Waiting for $FILE to say one of following strings"
-cat "$STRINGS"
+cat $STRINGS
 
-while ! grep -E -wf "$STRINGS" "$FILE"; do
+while ! egrep -wf $STRINGS $FILE; do
   sleep 2
 done
 
-if grep -E -wf "$ERRORS" "$FILE"; then
+if egrep -wf $ERRORS $FILE; then
   exit 1
 fi

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

@@ -1,14 +1,9 @@
 #!/bin/bash
-# shellcheck disable=SC1091 # The relative paths in this file only become valid at runtime.
-# shellcheck disable=SC2034
-# shellcheck disable=SC2086 # we want word splitting
-
-. "$SCRIPTS_DIR"/setup-test-env.sh
 
 BM=$CI_PROJECT_DIR/install/bare-metal
 CI_COMMON=$CI_PROJECT_DIR/install/common
 
-if [ -z "$BM_SERIAL" ] && [ -z "$BM_SERIAL_SCRIPT" ]; then
+if [ -z "$BM_SERIAL" -a -z "$BM_SERIAL_SCRIPT" ]; then
   echo "Must set BM_SERIAL OR BM_SERIAL_SCRIPT in your gitlab-runner config.toml [[runners]] environment"
   echo "BM_SERIAL:"
   echo "  This is the serial device to talk to for waiting for fastboot to be ready and logging from the kernel."
@@ -55,8 +50,6 @@ if echo $BM_CMDLINE | grep -q "root=/dev/nfs"; then
   BM_FASTBOOT_NFSROOT=1
 fi
 
-section_start prepare_rootfs "Preparing rootfs components"
-
 set -ex
 
 # Clear out any previous run's artifacts.
@@ -89,42 +82,34 @@ else
   fi
 
   pushd rootfs
-  find -H . | \
-    grep -E -v "external/(openglcts|vulkancts|amber|glslang|spirv-tools)" |
-    grep -E -v "traces-db|apitrace|renderdoc" | \
-    grep -E -v $EXCLUDE_FILTER | \
+  find -H | \
+    egrep -v "external/(openglcts|vulkancts|amber|glslang|spirv-tools)" |
+    egrep -v "traces-db|apitrace|renderdoc" | \
+    egrep -v $EXCLUDE_FILTER | \
     cpio -H newc -o | \
     xz --check=crc32 -T4 - > $CI_PROJECT_DIR/rootfs.cpio.gz
   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
+  apt install -y wget
+
+  wget $BM_KERNEL -O kernel
+  wget $BM_DTB -O dtb
 
   cat kernel dtb > Image.gz-dtb
-
-elif [ -n "${EXTERNAL_KERNEL_TAG}" ]; then
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-      "${FDO_HTTP_CACHE_URI:-}${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${BM_KERNEL}" -o kernel
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-      "${FDO_HTTP_CACHE_URI:-}${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/modules.tar.zst" -o modules.tar.zst
-
-  if [ -n "$BM_DTB" ]; then
-    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-	"${FDO_HTTP_CACHE_URI:-}${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${BM_DTB}.dtb" -o dtb
-  fi
-
-  cat kernel dtb > Image.gz-dtb || echo "No DTB available, using pure kernel."
   rm kernel
-  tar --keep-directory-symlink --zstd -xf modules.tar.zst -C "$BM_ROOTFS/"
-  rm modules.tar.zst &
 else
-  cat /baremetal-files/"$BM_KERNEL" /baremetal-files/"$BM_DTB".dtb > Image.gz-dtb
-  cp /baremetal-files/"$BM_DTB".dtb dtb
+  cat $BM_KERNEL $BM_DTB > Image.gz-dtb
+  cp $BM_DTB dtb
 fi
 
 export PATH=$BM:$PATH
@@ -150,12 +135,10 @@ if [ -n "$BM_SERIAL_SCRIPT" ]; then
   done
 fi
 
-section_end prepare_rootfs
-
 set +e
 $BM/fastboot_run.py \
   --dev="$BM_SERIAL" \
-  --test-timeout ${TEST_PHASE_TIMEOUT_MINUTES:-20} \
+  --test-timeout ${TEST_PHASE_TIMEOUT:-20} \
   --fbserial="$BM_FASTBOOT_SERIAL" \
   --powerup="$BM_POWERUP" \
   --powerdown="$BM_POWERDOWN"

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

@@ -51,8 +51,8 @@ class FastbootRun:
         try:
             return subprocess.call(cmd, shell=True, timeout=timeout)
         except subprocess.TimeoutExpired:
-            self.print_error("timeout, abandoning run.")
-            return 1
+            self.print_error("timeout, restarting run...")
+            return 2
 
     def run(self):
         if ret := self.logged_system(self.powerup):
@@ -60,20 +60,20 @@ class FastbootRun:
 
         fastboot_ready = False
         for line in self.ser.lines(timeout=2 * 60, phase="bootloader"):
-            if re.search("[Ff]astboot: [Pp]rocessing commands", line) or \
+            if re.search("fastboot: processing commands", line) or \
                     re.search("Listening for fastboot command on", line):
                 fastboot_ready = True
                 break
 
             if re.search("data abort", line):
                 self.print_error(
-                    "Detected crash during boot, abandoning run.")
-                return 1
+                    "Detected crash during boot, restarting run...")
+                return 2
 
         if not fastboot_ready:
             self.print_error(
-                "Failed to get to fastboot prompt, abandoning run.")
-            return 1
+                "Failed to get to fastboot prompt, restarting run...")
+            return 2
 
         if ret := self.logged_system(self.fastboot):
             return ret
@@ -81,7 +81,7 @@ class FastbootRun:
         print_more_lines = -1
         for line in self.ser.lines(timeout=self.test_timeout, phase="test"):
             if print_more_lines == 0:
-                return 1
+                return 2
             if print_more_lines > 0:
                 print_more_lines -= 1
 
@@ -92,20 +92,20 @@ class FastbootRun:
             # when if we see a reboot after we got past fastboot.
             if re.search("PON REASON", line):
                 self.print_error(
-                    "Detected spontaneous reboot, abandoning run.")
-                return 1
+                    "Detected spontaneous reboot, restarting run...")
+                return 2
 
             # db820c sometimes wedges around iommu fault recovery
             if re.search("watchdog: BUG: soft lockup - CPU.* stuck", line):
                 self.print_error(
-                    "Detected kernel soft lockup, abandoning run.")
-                return 1
+                    "Detected kernel soft lockup, restarting run...")
+                return 2
 
             # If the network device dies, it's probably not graphics's fault, just try again.
             if re.search("NETDEV WATCHDOG", line):
                 self.print_error(
-                    "Detected network device failure, abandoning run.")
-                return 1
+                    "Detected network device failure, restarting run...")
+                return 2
 
             # A3xx recovery doesn't quite work. Sometimes the GPU will get
             # wedged and recovery will fail (because power can't be reset?)
@@ -115,20 +115,20 @@ class FastbootRun:
             # of the hang. Once a hang happens, it's pretty chatty.
             if "[drm:adreno_recover] *ERROR* gpu hw init failed: -22" in line:
                 self.print_error(
-                    "Detected GPU hang, abandoning run.")
+                    "Detected GPU hang, restarting run...")
                 if print_more_lines == -1:
                     print_more_lines = 30
 
-            result = re.search(r"hwci: mesa: (\S*), exit_code: (\d+)", line)
+            result = re.search("hwci: mesa: (\S*)", line)
             if result:
-                status = result.group(1)
-                exit_code = int(result.group(2))
-
-                return exit_code
+                if result.group(1) == "pass":
+                    return 0
+                else:
+                    return 1
 
         self.print_error(
-            "Reached the end of the CPU serial log without finding a result, abandoning run.")
-        return 1
+            "Reached the end of the CPU serial log without finding a result, restarting run...")
+        return 2
 
 
 def main():
@@ -147,8 +147,13 @@ def main():
 
     fastboot = FastbootRun(args, args.test_timeout * 60)
 
-    retval = fastboot.run()
-    fastboot.close()
+    while True:
+        retval = fastboot.run()
+        fastboot.close()
+        if retval != 2:
+            break
+
+        fastboot = FastbootRun(args, args.test_timeout * 60)
 
     fastboot.logged_system(args.powerdown)
 

.gitlab-ci/bare-metal/google-power-down.sh

@@ -7,4 +7,4 @@ if [ -z "$relay" ]; then
     exit 1
 fi
 
-"$CI_PROJECT_DIR"/install/bare-metal/google-power-relay.py off "$relay"
+$CI_PROJECT_DIR/install/bare-metal/google-power-relay.py off $relay

.gitlab-ci/bare-metal/google-power-up.sh

@@ -7,6 +7,6 @@ if [ -z "$relay" ]; then
     exit 1
 fi
 
-"$CI_PROJECT_DIR"/install/bare-metal/google-power-relay.py off "$relay"
+$CI_PROJECT_DIR/install/bare-metal/google-power-relay.py off $relay
 sleep 5
-"$CI_PROJECT_DIR"/install/bare-metal/google-power-relay.py on "$relay"
+$CI_PROJECT_DIR/install/bare-metal/google-power-relay.py on $relay

.gitlab-ci/bare-metal/poe-off

@@ -10,7 +10,8 @@ if [ -z "$BM_POE_ADDRESS" ]; then
     exit 1
 fi
 
-SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.$((${BM_POE_BASE:-0} + BM_POE_INTERFACE))"
+SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.`expr 48 + $BM_POE_INTERFACE`"
+SNMP_ON="i 1"
 SNMP_OFF="i 2"
 
 flock /var/run/poe.lock -c "snmpset -v2c -r 3 -t 30 -cmesaci $BM_POE_ADDRESS $SNMP_KEY $SNMP_OFF"

.gitlab-ci/bare-metal/poe-on

@@ -10,7 +10,7 @@ if [ -z "$BM_POE_ADDRESS" ]; then
     exit 1
 fi
 
-SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.$((${BM_POE_BASE:-0} + BM_POE_INTERFACE))"
+SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.`expr 48 + $BM_POE_INTERFACE`"
 SNMP_ON="i 1"
 SNMP_OFF="i 2"
 

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

@@ -1,10 +1,4 @@
 #!/bin/bash
-# shellcheck disable=SC1091
-# shellcheck disable=SC2034
-# shellcheck disable=SC2059
-# shellcheck disable=SC2086 # we want word splitting
-
-. "$SCRIPTS_DIR"/setup-test-env.sh
 
 # Boot script for devices attached to a PoE switch, using NFS for the root
 # filesystem.
@@ -12,7 +6,6 @@
 # We're run from the root of the repo, make a helper var for our paths
 BM=$CI_PROJECT_DIR/install/bare-metal
 CI_COMMON=$CI_PROJECT_DIR/install/common
-CI_INSTALL=$CI_PROJECT_DIR/install
 
 # Runner config checks
 if [ -z "$BM_SERIAL" ]; then
@@ -61,8 +54,8 @@ if [ -z "$BM_ROOTFS" ]; then
   exit 1
 fi
 
-if [ -z "$BM_BOOTFS" ] && { [ -z "$BM_KERNEL" ] || [ -z "$BM_DTB" ]; } ; then
-  echo "Must set /boot files for the TFTP boot in the job's variables or set kernel and dtb"
+if [ -z "$BM_BOOTFS" ]; then
+  echo "Must set /boot files for the TFTP boot in the job's variables"
   exit 1
 fi
 
@@ -71,12 +64,13 @@ if [ -z "$BM_CMDLINE" ]; then
   exit 1
 fi
 
-section_start prepare_rootfs "Preparing rootfs components"
+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'
-
 # Clear out any previous run's artifacts.
 rm -rf results/
 mkdir -p results
@@ -85,64 +79,27 @@ mkdir -p results
 # state, since it's volume-mounted on the host.
 rsync -a --delete $BM_ROOTFS/ /nfs/
 
-date +'%F %T'
-
 # If BM_BOOTFS is an URL, download it
 if echo $BM_BOOTFS | grep -q http; then
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    "${FDO_HTTP_CACHE_URI:-}$BM_BOOTFS" -o /tmp/bootfs.tar
+  apt install -y wget
+  wget ${FDO_HTTP_CACHE_URI:-}$BM_BOOTFS -O /tmp/bootfs.tar
   BM_BOOTFS=/tmp/bootfs.tar
 fi
 
-date +'%F %T'
-
 # If BM_BOOTFS is a file, assume it is a tarball and uncompress it
-if [ -f "${BM_BOOTFS}" ]; then
+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 "${EXTERNAL_KERNEL_TAG}" ]; then
-  if [ -z "${BM_KERNEL}" ] || [ -z "${BM_DTB}" ]; then
-    echo "This machine cannot be tested with external kernel since BM_KERNEL or BM_DTB missing!"
-    exit 1
-  fi
-
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-      "${FDO_HTTP_CACHE_URI:-}${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${BM_KERNEL}" -o "${BM_KERNEL}"
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-      "${FDO_HTTP_CACHE_URI:-}${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/${BM_DTB}.dtb" -o "${BM_DTB}.dtb"
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-      "${FDO_HTTP_CACHE_URI:-}${KERNEL_IMAGE_BASE}/${DEBIAN_ARCH}/modules.tar.zst" -o modules.tar.zst
-fi
-
-date +'%F %T'
-
 # Install kernel modules (it could be either in /lib/modules or
 # /usr/lib/modules, but we want to install in the latter)
-if [ -n "${EXTERNAL_KERNEL_TAG}" ]; then
-  tar --keep-directory-symlink --zstd -xf modules.tar.zst -C /nfs/
-  rm modules.tar.zst &
-elif [ -n "${BM_BOOTFS}" ]; then
-  [ -d $BM_BOOTFS/usr/lib/modules ] && rsync -a $BM_BOOTFS/usr/lib/modules/ /nfs/usr/lib/modules/
-  [ -d $BM_BOOTFS/lib/modules ] && rsync -a $BM_BOOTFS/lib/modules/ /nfs/lib/modules/
-else
-  echo "No modules!"
-fi
-
-
-date +'%F %T'
+[ -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/
 
 # Install kernel image + bootloader files
-if [ -n "${EXTERNAL_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'
+rsync -aL --delete $BM_BOOTFS/boot/ /tftp/
 
 # Set up the pxelinux config for Jetson Nano
 mkdir -p /tftp/pxelinux.cfg
@@ -172,65 +129,34 @@ LABEL primary
 EOF
 
 # Create the rootfs in the NFS directory
+mkdir -p /nfs/results
 . $BM/rootfs-setup.sh /nfs
 
-date +'%F %T'
-
 echo "$BM_CMDLINE" > /tftp/cmdline.txt
 
-# Add some options in config.txt, if defined
-if [ -n "$BM_BOOTCONFIG" ]; then
-  printf "$BM_BOOTCONFIG" >> /tftp/config.txt
-fi
-
-section_end prepare_rootfs
+# Add some required options in config.txt
+printf "$BM_BOOTCONFIG" >> /tftp/config.txt
 
 set +e
-STRUCTURED_LOG_FILE=results/job_detail.json
-python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update dut_job_type "${DEVICE_TYPE}"
-python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update farm "${FARM}"
-ATTEMPTS=3
-first_attempt=True
+ATTEMPTS=10
 while [ $((ATTEMPTS--)) -gt 0 ]; do
-  section_start dut_boot "Booting hardware device ..."
-  python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --create-dut-job dut_name "${CI_RUNNER_DESCRIPTION}"
-  # Update subtime time to CI_JOB_STARTED_AT only for the first run
-  if [ "$first_attempt" = "True" ]; then
-    python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update-dut-time submit "${CI_JOB_STARTED_AT}"
-  else
-    python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --update-dut-time submit
-  fi
   python3 $BM/poe_run.py \
           --dev="$BM_SERIAL" \
           --powerup="$BM_POWERUP" \
           --powerdown="$BM_POWERDOWN" \
-          --boot-timeout-seconds ${BOOT_PHASE_TIMEOUT_SECONDS:-300} \
-          --test-timeout-minutes ${TEST_PHASE_TIMEOUT_MINUTES:-$((CI_JOB_TIMEOUT/60 - ${TEST_SETUP_AND_UPLOAD_MARGIN_MINUTES:-5}))}
+          --test-timeout ${TEST_PHASE_TIMEOUT:-20}
   ret=$?
 
   if [ $ret -eq 2 ]; then
-    python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --close-dut-job
-    first_attempt=False
-    error "Device failed to boot; will retry"
+    echo "Did not detect boot sequence, retrying..."
   else
-    # We're no longer in dut_boot by this point
-    unset CURRENT_SECTION
     ATTEMPTS=0
   fi
 done
-
-section_start dut_cleanup "Cleaning up after job"
-python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --close-dut-job
-python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --close
 set -e
 
-date +'%F %T'
-
 # Bring artifacts back from the NFS dir to the build dir where gitlab-runner
 # will look for them.
 cp -Rp /nfs/results/. results/
 
-date +'%F %T'
-section_end dut_cleanup
-
 exit $ret

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

@@ -24,27 +24,23 @@
 import argparse
 import os
 import re
+from serial_buffer import SerialBuffer
 import sys
 import threading
 
-from custom_logger import CustomLogger
-from serial_buffer import SerialBuffer
 
 class PoERun:
-    def __init__(self, args, boot_timeout, test_timeout, logger):
+    def __init__(self, args, test_timeout):
         self.powerup = args.powerup
         self.powerdown = args.powerdown
         self.ser = SerialBuffer(
-            args.dev, "results/serial-output.txt", ": ")
-        self.boot_timeout = boot_timeout
+            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))
@@ -52,12 +48,10 @@ 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=self.boot_timeout, phase="bootloader"):
+        for line in self.ser.lines(timeout=5 * 60, phase="bootloader"):
             if re.search("Booting Linux", line):
                 boot_detected = True
                 break
@@ -67,10 +61,8 @@ class PoERun:
                 "Something wrong; couldn't detect the boot start up sequence")
             return 2
 
-        self.logger.create_job_phase("test")
         for line in self.ser.lines(timeout=self.test_timeout, phase="test"):
             if re.search("---. end Kernel panic", line):
-                self.logger.update_status_fail("kernel panic")
                 return 1
 
             # Binning memory problems
@@ -79,30 +71,24 @@ class PoERun:
                 return 1
 
             if re.search("nouveau 57000000.gpu: bus: MMIO read of 00000000 FAULT at 137000", line):
-                self.print_error("nouveau jetson boot bug, abandoning run.")
-                return 1
+                self.print_error("nouveau jetson boot bug, retrying.")
+                return 2
 
             # network fail on tk1
             if re.search("NETDEV WATCHDOG:.* transmit queue 0 timed out", line):
-                self.print_error("nouveau jetson tk1 network fail, abandoning run.")
-                return 1
+                self.print_error("nouveau jetson tk1 network fail, retrying.")
+                return 2
 
-            result = re.search(r"hwci: mesa: (\S*), exit_code: (\d+)", line)
+            result = re.search("hwci: mesa: (\S*)", line)
             if result:
-                status = result.group(1)
-                exit_code = int(result.group(2))
-
-                if status == "pass":
-                    self.logger.update_dut_job("status", "pass")
+                if result.group(1) == "pass":
+                    return 0
                 else:
-                    self.logger.update_status_fail("test fail")
-
-                self.logger.update_dut_job("exit_code", exit_code)
-                return exit_code
+                    return 1
 
         self.print_error(
             "Reached the end of the CPU serial log without finding a result")
-        return 1
+        return 2
 
 
 def main():
@@ -114,18 +100,13 @@ def main():
     parser.add_argument('--powerdown', type=str,
                         help='shell command for powering off', required=True)
     parser.add_argument(
-        '--boot-timeout-seconds', type=int, help='Boot phase timeout (seconds)', required=True)
-    parser.add_argument(
-        '--test-timeout-minutes', type=int, help='Test phase timeout (minutes)', required=True)
+        '--test-timeout', type=int, help='Test phase timeout (minutes)', required=True)
     args = parser.parse_args()
 
-    logger = CustomLogger("results/job_detail.json")
-    logger.update_dut_time("start", None)
-    poe = PoERun(args, args.boot_timeout_seconds, args.test_timeout_minutes * 60, logger)
+    poe = PoERun(args, args.test_timeout * 60)
     retval = poe.run()
 
     poe.logged_system(args.powerdown)
-    logger.update_dut_time("end", None)
 
     sys.exit(retval)
 

.gitlab-ci/bare-metal/rootfs-setup.sh

@@ -1,5 +1,4 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
+#!/bin/bash
 
 rootfs_dst=$1
 
@@ -9,29 +8,23 @@ mkdir -p $rootfs_dst/results
 cp $BM/bm-init.sh $rootfs_dst/init
 cp $CI_COMMON/init*.sh $rootfs_dst/
 
-date +'%F %T'
-
 # Make JWT token available as file in the bare-metal storage to enable access
 # to MinIO
-cp "${S3_JWT_FILE}" "${rootfs_dst}${S3_JWT_FILE}"
-
-date +'%F %T'
+cp "${CI_JOB_JWT_FILE}" "${rootfs_dst}${CI_JOB_JWT_FILE}"
 
 cp $CI_COMMON/capture-devcoredump.sh $rootfs_dst/
 cp $CI_COMMON/intel-gpu-freq.sh $rootfs_dst/
-cp $CI_COMMON/kdl.sh $rootfs_dst/
-cp "$SCRIPTS_DIR/setup-test-env.sh" "$rootfs_dst/"
 
 set +x
 
 # Pass through relevant env vars from the gitlab job to the baremetal init script
+"$CI_COMMON"/generate-env.sh > $rootfs_dst/set-job-env-vars.sh
+chmod +x $rootfs_dst/set-job-env-vars.sh
 echo "Variables passed through:"
-"$CI_COMMON"/generate-env.sh | tee $rootfs_dst/set-job-env-vars.sh
+cat $rootfs_dst/set-job-env-vars.sh
 
 set -x
 
 # Add the Mesa drivers we built, and make a consistent symlink to them.
 mkdir -p $rootfs_dst/$CI_PROJECT_DIR
 rsync -aH --delete $CI_PROJECT_DIR/install/ $rootfs_dst/$CI_PROJECT_DIR/install/
-
-date +'%F %T'

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

@@ -22,7 +22,7 @@
 # IN THE SOFTWARE.
 
 import argparse
-from datetime import datetime, UTC
+from datetime import datetime, timezone
 import queue
 import serial
 import threading
@@ -130,10 +130,9 @@ class SerialBuffer:
                 if b == b'\n'[0]:
                     line = line.decode(errors="replace")
 
-                    ts = datetime.now(tz=UTC)
-                    ts_str = f"{ts.hour:02}:{ts.minute:02}:{ts.second:02}.{int(ts.microsecond / 1000):03}"
-                    print("{endc}{time}{prefix}{line}".format(
-                        time=ts_str, prefix=self.prefix, line=line, endc='\033[0m'), flush=True, end='')
+                    time = datetime.now().strftime('%y-%m-%d %H:%M:%S')
+                    print("{endc}{time} {prefix}{line}".format(
+                        time=time, prefix=self.prefix, line=line, endc='\033[0m'), flush=True, end='')
 
                     self.line_queue.put(line)
                     line = bytearray()

.gitlab-ci/build/compiler-wrapper-clang++-15.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC1091
-
-set -e
-
-_COMPILER=clang++-15
-. compiler-wrapper.sh

.gitlab-ci/build/compiler-wrapper-clang++.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC1091
-
-set -e
-
-_COMPILER=clang++
-. compiler-wrapper.sh

.gitlab-ci/build/compiler-wrapper-clang-15.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC1091
-
-set -e
-
-_COMPILER=clang-15
-. compiler-wrapper.sh

.gitlab-ci/build/compiler-wrapper-clang.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC1091
-
-set -e
-
-_COMPILER=clang
-. compiler-wrapper.sh

.gitlab-ci/build/compiler-wrapper-g++.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC1091
-
-set -e
-
-_COMPILER=g++
-. compiler-wrapper.sh

.gitlab-ci/build/compiler-wrapper-gcc.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-# shellcheck disable=SC1091
-
-set -e
-
-_COMPILER=gcc
-. compiler-wrapper.sh

.gitlab-ci/build/compiler-wrapper.sh

@@ -1,21 +0,0 @@
-# shellcheck disable=SC1091
-# shellcheck disable=SC2086 # we want word splitting
-if command -V ccache >/dev/null 2>/dev/null; then
-  CCACHE=ccache
-else
-  CCACHE=
-fi
-
-if echo "$@" | grep -E 'meson-private/tmp[^ /]*/testfile.c' >/dev/null; then
-    # Invoked for meson feature check
-    exec $CCACHE $_COMPILER "$@"
-fi
-
-if [ "$(eval printf "'%s'" "\"\${$(($#-1))}\"")" = "-c" ]; then
-    # Not invoked for linking
-    exec $CCACHE $_COMPILER "$@"
-fi
-
-# Compiler invoked by ninja for linking. Add -Werror to turn compiler warnings into errors
-# with LTO. (meson's werror should arguably do this, but meanwhile we need to)
-exec $CCACHE $_COMPILER "$@" -Werror

.gitlab-ci/common/capture-devcoredump.sh

@@ -1,35 +1,14 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2035
-# shellcheck disable=SC2061
-# shellcheck disable=SC2086 # we want word splitting
+#!/bin/sh
 
 while true; do
-  devcds=$(find /sys/devices/virtual/devcoredump/ -name data 2>/dev/null)
+  devcds=`find /sys/devices/virtual/devcoredump/ -name data 2>/dev/null`
   for i in $devcds; do
     echo "Found a devcoredump at $i."
-    if cp $i $RESULTS_DIR/first.devcore; then
+    if cp $i /results/first.devcore; then
       echo 1 > $i
       echo "Saved to the job artifacts at /first.devcore"
       exit 0
     fi
   done
-  i915_error_states=$(find /sys/devices/ -path */drm/card*/error)
-  for i in $i915_error_states; do
-    tmpfile=$(mktemp)
-    cp "$i" "$tmpfile"
-    filesize=$(stat --printf="%s" "$tmpfile")
-    # Does the file contain "No error state collected" ?
-    if [ "$filesize" = 25 ]; then
-        rm "$tmpfile"
-    else
-        echo "Found an i915 error state at $i size=$filesize."
-        if cp "$tmpfile" $RESULTS_DIR/first.i915_error_state; then
-            rm "$tmpfile"
-            echo 1 > "$i"
-            echo "Saved to the job artifacts at /first.i915_error_state"
-            exit 0
-        fi
-    fi
-  done
   sleep 10
 done

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

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

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

@@ -7,14 +7,12 @@ set -ex
 
 cd /
 
-findmnt --mountpoint /proc || mount -t proc none /proc
-findmnt --mountpoint /sys || mount -t sysfs none /sys
+mount -t proc none /proc
+mount -t sysfs none /sys
 mount -t debugfs none /sys/kernel/debug
-findmnt --mountpoint /dev || mount -t devtmpfs none /dev
+mount -t devtmpfs none /dev || echo possibly already mounted
 mkdir -p /dev/pts
 mount -t devpts devpts /dev/pts
-mkdir /dev/shm
-mount -t tmpfs -o noexec,nodev,nosuid tmpfs /dev/shm
 mount -t tmpfs tmpfs /tmp
 
 echo "nameserver 8.8.8.8" > /etc/resolv.conf
@@ -22,4 +20,4 @@ echo "nameserver 8.8.8.8" > /etc/resolv.conf
 
 # Set the time so we can validate certificates before we fetch anything;
 # however as not all DUTs have network, make this non-fatal.
-for _ in 1 2 3; do sntp -sS pool.ntp.org && break || sleep 2; done || true
+for i in 1 2 3; do sntp -sS pool.ntp.org && break || sleep 2; done || true

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

@@ -1,13 +1,4 @@
-#!/bin/bash
-# shellcheck disable=SC1090
-# shellcheck disable=SC1091
-# shellcheck disable=SC2086 # we want word splitting
-# shellcheck disable=SC2155
-
-# Second-stage init, used to set up devices and our job environment before
-# running tests.
-
-shopt -s extglob
+#!/bin/sh
 
 # 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,
@@ -42,17 +33,10 @@ trap cleanup INT TERM EXIT
 BACKGROUND_PIDS=
 
 
-for path in '/dut-env-vars.sh' '/set-job-env-vars.sh' './set-job-env-vars.sh'; do
-    [ -f "$path" ] && source "$path"
-done
-. "$SCRIPTS_DIR"/setup-test-env.sh
+# Second-stage init, used to set up devices and our job environment before
+# running tests.
 
-# Flush out anything which might be stuck in a serial buffer
-echo
-echo
-echo
-
-section_switch init_stage2 "Pre-testing hardware setup"
+. /set-job-env-vars.sh
 
 set -ex
 
@@ -63,7 +47,7 @@ set -ex
 
 # Set up ZRAM
 HWCI_ZRAM_SIZE=2G
-if /sbin/zramctl --find --size $HWCI_ZRAM_SIZE -a zstd; then
+if zramctl --find --size $HWCI_ZRAM_SIZE -a zstd; then
     mkswap /dev/zram0
     swapon /dev/zram0
     echo "zram: $HWCI_ZRAM_SIZE activated"
@@ -80,22 +64,17 @@ fi
 #
 if [ "$HWCI_KVM" = "true" ]; then
     unset KVM_KERNEL_MODULE
-    {
-      grep -qs '\bvmx\b' /proc/cpuinfo && KVM_KERNEL_MODULE=kvm_intel
-    } || {
-      grep -qs '\bsvm\b' /proc/cpuinfo && KVM_KERNEL_MODULE=kvm_amd
+    grep -qs '\bvmx\b' /proc/cpuinfo && KVM_KERNEL_MODULE=kvm_intel || {
+        grep -qs '\bsvm\b' /proc/cpuinfo && KVM_KERNEL_MODULE=kvm_amd
     }
 
-    {
-      [ -z "${KVM_KERNEL_MODULE}" ] && \
-      echo "WARNING: Failed to detect CPU virtualization extensions"
-    } || \
+    [ -z "${KVM_KERNEL_MODULE}" ] && \
+        echo "WARNING: Failed to detect CPU virtualization extensions" || \
         modprobe ${KVM_KERNEL_MODULE}
 
     mkdir -p /lava-files
-    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-	-o "/lava-files/${KERNEL_IMAGE_NAME}" \
-        "${KERNEL_IMAGE_BASE}/amd64/${KERNEL_IMAGE_NAME}"
+    wget -S --progress=dot:giga -O /lava-files/${KERNEL_IMAGE_NAME} \
+        "${KERNEL_IMAGE_BASE_URL}/${KERNEL_IMAGE_NAME}"
 fi
 
 # Fix prefix confusion: the build installs to $CI_PROJECT_DIR, but we expect
@@ -104,52 +83,31 @@ ln -sf $CI_PROJECT_DIR/install /install
 export LD_LIBRARY_PATH=/install/lib
 export LIBGL_DRIVERS_PATH=/install/lib/dri
 
-# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22495#note_1876691
-# The navi21 boards seem to have trouble with ld.so.cache, so try explicitly
-# telling it to look in /usr/local/lib.
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-
 # Store Mesa's disk cache under /tmp, rather than sending it out over NFS.
 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
 
   # Disable GPU frequency scaling
-  DEVFREQ_GOVERNOR=$(find /sys/devices -name governor | grep gpu || true)
+  DEVFREQ_GOVERNOR=`find /sys/devices -name governor | grep gpu || true`
   test -z "$DEVFREQ_GOVERNOR" || echo performance > $DEVFREQ_GOVERNOR || true
 
   # Disable CPU frequency scaling
   echo performance | tee -a /sys/devices/system/cpu/cpufreq/policy*/scaling_governor || true
 
   # Disable GPU runtime power management
-  GPU_AUTOSUSPEND=$(find /sys/devices -name autosuspend_delay_ms | grep gpu | head -1)
+  GPU_AUTOSUSPEND=`find /sys/devices -name autosuspend_delay_ms | grep gpu | head -1`
   test -z "$GPU_AUTOSUSPEND" || echo -1 > $GPU_AUTOSUSPEND || true
   # Lock Intel GPU frequency to 70% of the maximum allowed by hardware
   # and enable throttling detection & reporting.
   # Additionally, set the upper limit for CPU scaling frequency to 65% of the
   # maximum permitted, as an additional measure to mitigate thermal throttling.
-  /intel-gpu-freq.sh -s 70% --cpu-set-max 65% -g all -d
-fi
-
-# Start a little daemon to capture sysfs records and produce a JSON file
-if [ -x /kdl.sh ]; then
-  echo "launch kdl.sh!"
-  /kdl.sh &
-  BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
-else
-  echo "kdl.sh not found!"
+  ./intel-gpu-freq.sh -s 70% --cpu-set-max 65% -g all -d
 fi
 
 # Increase freedreno hangcheck timer because it's right at the edge of the
@@ -160,13 +118,8 @@ fi
 
 # Start a little daemon to capture the first devcoredump we encounter.  (They
 # expire after 5 minutes, so we poll for them).
-if [ -x /capture-devcoredump.sh ]; then
-  /capture-devcoredump.sh &
-  BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
-fi
-
-ARCH=$(uname -m)
-export VK_DRIVER_FILES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json"
+/capture-devcoredump.sh &
+BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
 
 # If we want Xorg to be running for the test, then we start it up before the
 # HWCI_TEST_SCRIPT because we need to use xinit to start X (otherwise
@@ -175,11 +128,12 @@ export VK_DRIVER_FILES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json"
 if [ -n "$HWCI_START_XORG" ]; then
   echo "touch /xorg-started; sleep 100000" > /xorg-script
   env \
-    xinit /bin/sh /xorg-script -- /usr/bin/Xorg -noreset -s 0 -dpms -logfile "$RESULTS_DIR/Xorg.0.log" &
+    VK_ICD_FILENAMES=/install/share/vulkan/icd.d/${VK_DRIVER}_icd.`uname -m`.json \
+    xinit /bin/sh /xorg-script -- /usr/bin/Xorg -noreset -s 0 -dpms -logfile /Xorg.0.log &
   BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
 
   # Wait for xorg to be ready for connections.
-  for _ in 1 2 3 4 5; do
+  for i in 1 2 3 4 5; do
     if [ -e /xorg-started ]; then
       break
     fi
@@ -189,36 +143,30 @@ if [ -n "$HWCI_START_XORG" ]; then
 fi
 
 if [ -n "$HWCI_START_WESTON" ]; then
-  WESTON_X11_SOCK="/tmp/.X11-unix/X0"
-  if [ -n "$HWCI_START_XORG" ]; then
-    echo "Please consider dropping HWCI_START_XORG and instead using Weston XWayland for testing."
-    WESTON_X11_SOCK="/tmp/.X11-unix/X1"
-  fi
-  export WAYLAND_DISPLAY=wayland-0
+  export XDG_RUNTIME_DIR=/run/user
+  mkdir -p $XDG_RUNTIME_DIR
 
-  # Display server is Weston Xwayland when HWCI_START_XORG is not set or Xorg when it's
+  # Xwayland to be used when HWCI_START_XORG is not set
   export DISPLAY=:0
   mkdir -p /tmp/.X11-unix
 
   env \
-    weston -Bheadless-backend.so --use-gl -Swayland-0 --xwayland --idle-time=0 &
-  BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
-
-  while [ ! -S "$WESTON_X11_SOCK" ]; do sleep 1; done
+    VK_ICD_FILENAMES=/install/share/vulkan/icd.d/${VK_DRIVER}_icd.`uname -m`.json \
+    weston -Bheadless-backend.so --use-gl -Swayland-0 --xwayland &
+  export WAYLAND_DISPLAY=wayland-0
+  sleep 1
 fi
 
-set +x
-
-section_end init_stage2
-
-echo "Running ${HWCI_TEST_SCRIPT} ${HWCI_TEST_ARGS} ..."
-
+RESULT=fail
 set +e
-$HWCI_TEST_SCRIPT ${HWCI_TEST_ARGS:-}; EXIT_CODE=$?
+sh -c "$HWCI_TEST_SCRIPT"
+EXIT_CODE=$?
 set -e
 
-section_start post_test_cleanup "Cleaning up after testing, uploading results"
-set -x
+# Let's make sure the results are always stored in current working directory
+mv -f ${CI_PROJECT_DIR}/results ./ 2>/dev/null || true
+
+[ ${EXIT_CODE} -ne 0 ] || rm -rf results/trace/"$PIGLIT_REPLAY_DEVICE_NAME"
 
 # Make sure that capture-devcoredump is done before we start trying to tar up
 # artifacts -- if it's writing while tar is reading, tar will throw an error and
@@ -226,22 +174,17 @@ set -x
 cleanup
 
 # upload artifacts
-if [ -n "$S3_RESULTS_UPLOAD" ]; then
+if [ -n "$MINIO_RESULTS_UPLOAD" ]; then
   tar --zstd -cf results.tar.zst results/;
-  ci-fairy s3cp --token-file "${S3_JWT_FILE}" results.tar.zst https://"$S3_RESULTS_UPLOAD"/results.tar.zst;
+  ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" results.tar.zst https://"$MINIO_RESULTS_UPLOAD"/results.tar.zst;
 fi
 
 # We still need to echo the hwci: mesa message, as some scripts rely on it, such
 # as the python ones inside the bare-metal folder
-[ ${EXIT_CODE} -eq 0 ] && RESULT=pass || RESULT=fail
+[ ${EXIT_CODE} -eq 0 ] && RESULT=pass
 
 set +x
-section_end post_test_cleanup
-
-# Print the final result; both bare-metal and LAVA look for this string to get
-# the result of our run, so try really hard to get it out rather than losing
-# the run. The device gets shut down right at this point, and a630 seems to
-# enjoy corrupting the last line of serial output before shutdown.
-for _ in $(seq 0 3); do echo "hwci: mesa: $RESULT, exit_code: $EXIT_CODE"; sleep 1; echo; done
-
+echo "hwci: mesa: $RESULT"
+# Sleep a bit to avoid kernel dump message interleave from LAVA ENDTC signal
+sleep 1
 exit $EXIT_CODE

.gitlab-ci/common/intel-gpu-freq.sh

@@ -1,14 +1,4 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2013
-# shellcheck disable=SC2015
-# shellcheck disable=SC2034
-# shellcheck disable=SC2046
-# shellcheck disable=SC2059
-# shellcheck disable=SC2086 # we want word splitting
-# shellcheck disable=SC2154
-# shellcheck disable=SC2155
-# shellcheck disable=SC2162
-# shellcheck disable=SC2229
+#!/bin/sh
 #
 # This is an utility script to manage Intel GPU frequencies.
 # It can be used for debugging performance problems or trying to obtain a stable
@@ -203,7 +193,7 @@ compute_freq_set() {
         val=${FREQ_RPn}
         ;;
     *%)
-        val=$((${1%?} * FREQ_RP0 / 100))
+        val=$((${1%?} * ${FREQ_RP0} / 100))
         # Adjust freq to comply with 50 MHz increments
         val=$((val / 50 * 50))
         ;;
@@ -252,12 +242,12 @@ set_freq_max() {
 
     [ -z "${DRY_RUN}" ] || return 0
 
-    if ! printf "%s" ${SET_MAX_FREQ} | tee $(print_freq_sysfs_path max) \
-        $(print_freq_sysfs_path boost) > /dev/null;
-    then
+    printf "%s" ${SET_MAX_FREQ} | tee $(print_freq_sysfs_path max) \
+        $(print_freq_sysfs_path boost) > /dev/null
+    [ $? -eq 0 ] || {
         log ERROR "Failed to set GPU max frequency"
         return 1
-    fi
+    }
 }
 
 #
@@ -282,11 +272,11 @@ set_freq_min() {
 
     [ -z "${DRY_RUN}" ] || return 0
 
-    if ! printf "%s" ${SET_MIN_FREQ} > $(print_freq_sysfs_path min);
-    then
+    printf "%s" ${SET_MIN_FREQ} > $(print_freq_sysfs_path min)
+    [ $? -eq 0 ] || {
         log ERROR "Failed to set GPU min frequency"
         return 1
-    fi
+    }
 }
 
 #
@@ -505,7 +495,7 @@ compute_cpu_freq_set() {
         val=${CPU_FREQ_cpuinfo_min}
         ;;
     *%)
-        val=$((${1%?} * CPU_FREQ_cpuinfo_max / 100))
+        val=$((${1%?} * ${CPU_FREQ_cpuinfo_max} / 100))
         ;;
     *[!0-9]*)
         log ERROR "Cannot set CPU freq to invalid value: %s" "$1"
@@ -548,11 +538,11 @@ set_cpu_freq_max() {
     local pstate_info=$(printf "${CPU_PSTATE_SYSFS_PATTERN}" max_perf_pct)
     [ -e "${pstate_info}" ] && {
         log INFO "Setting intel_pstate max perf to %s" "${target_freq}%"
-        if ! printf "%s" "${target_freq}" > "${pstate_info}";
-	then
+        printf "%s" "${target_freq}" > "${pstate_info}"
+        [ $? -eq 0 ] || {
             log ERROR "Failed to set intel_pstate max perf"
             res=1
-	fi
+        }
     }
 
     local cpu_index
@@ -560,17 +550,16 @@ set_cpu_freq_max() {
         read_cpu_freq_info ${cpu_index} n ${CAP_CPU_FREQ_INFO} || { res=$?; continue; }
 
         target_freq=$(compute_cpu_freq_set "${CPU_SET_MAX_FREQ}")
-        tf_res=$?
-        [ -z "${target_freq}" ] && { res=$tf_res; continue; }
+        [ -z "${target_freq}" ] && { res=$?; continue; }
 
         log INFO "Setting CPU%s max scaling freq to %s Hz" ${cpu_index} "${target_freq}"
         [ -n "${DRY_RUN}" ] && continue
 
-        if ! printf "%s" ${target_freq} > $(print_cpu_freq_sysfs_path scaling_max ${cpu_index});
-	then
+        printf "%s" ${target_freq} > $(print_cpu_freq_sysfs_path scaling_max ${cpu_index})
+        [ $? -eq 0 ] || {
             res=1
             log ERROR "Failed to set CPU%s max scaling frequency" ${cpu_index}
-	fi
+        }
     done
 
     return ${res}

.gitlab-ci/common/kdl.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC1091  # the path is created in build-kdl and
-# here is check if exist
-# shellcheck disable=SC2086 # we want the arguments to be expanded
-
-if ! [ -f /ci-kdl/bin/activate ]; then
-  echo -e "ci-kdl not installed; not monitoring temperature"
-  exit 0
-fi
-
-KDL_ARGS="
-	--output-file=${RESULTS_DIR}/kdl.json
-	--log-level=WARNING
-	--num-samples=-1
-"
-
-source /ci-kdl/bin/activate
-exec /ci-kdl/bin/ci-kdl ${KDL_ARGS}

.gitlab-ci/common/start-x.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -ex
+
+_XORG_SCRIPT="/xorg-script"
+_FLAG_FILE="/xorg-started"
+
+echo "touch ${_FLAG_FILE}; sleep 100000" > "${_XORG_SCRIPT}"
+if [ "x$1" != "x" ]; then
+    export LD_LIBRARY_PATH="${1}/lib"
+    export LIBGL_DRIVERS_PATH="${1}/lib/dri"
+fi
+xinit /bin/sh "${_XORG_SCRIPT}" -- /usr/bin/Xorg vt45 -noreset -s 0 -dpms -logfile /Xorg.0.log &
+
+# Wait for xorg to be ready for connections.
+for i in 1 2 3 4 5; do
+    if [ -e "${_FLAG_FILE}" ]; then
+        break
+    fi
+    sleep 5
+done

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

@@ -1,78 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC1091
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# ALPINE_X86_64_BUILD_TAG
-
-set -e
-set -o xtrace
-
-EPHEMERAL=(
-)
-
-
-DEPS=(
-    bash
-    bison
-    ccache
-    "clang${LLVM_VERSION}-dev"
-    cmake
-    clang-dev
-    coreutils
-    curl
-    flex
-    gcc
-    g++
-    git
-    gettext
-    glslang
-    graphviz
-    linux-headers
-    "llvm${LLVM_VERSION}-static"
-    "llvm${LLVM_VERSION}-dev"
-    meson
-    mold
-    musl-dev
-    expat-dev
-    elfutils-dev
-    libclc-dev
-    libdrm-dev
-    libva-dev
-    libpciaccess-dev
-    zlib-dev
-    python3-dev
-    py3-clang
-    py3-cparser
-    py3-mako
-    py3-packaging
-    py3-pip
-    py3-ply
-    py3-yaml
-    vulkan-headers
-    spirv-tools-dev
-    spirv-llvm-translator-dev
-    util-macros
-    wayland-dev
-    wayland-protocols
-)
-
-apk --no-cache add "${DEPS[@]}" "${EPHEMERAL[@]}"
-
-pip3 install --break-system-packages sphinx===5.1.1 hawkmoth===0.16.0
-
-. .gitlab-ci/container/container_pre_build.sh
-
-
-############### Uninstall the build software
-
-# too many vendor binarise, just keep the ones we need
-find /usr/share/clc \
-  \( -type f -o -type l \) \
-  ! -name 'spirv-mesa3d-.spv' \
-  ! -name 'spirv64-mesa3d-.spv' \
-  -delete
-
-apk del "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/container_post_build.sh

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

@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-# This is a ci-templates build script to generate a container for LAVA SSH client.
-
-# shellcheck disable=SC1091
-set -e
-set -o xtrace
-
-EPHEMERAL=(
-)
-
-# We only need these very basic packages to run the tests.
-DEPS=(
-    openssh-client  # for ssh
-    iputils         # for ping
-    bash
-    curl
-)
-
-
-apk --no-cache add "${DEPS[@]}" "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/container_pre_build.sh
-
-############### Uninstall the build software
-
-apk del "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/container_post_build.sh

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

@@ -0,0 +1,70 @@
+#!/bin/bash
+# shellcheck disable=SC2086 # we want word splitting
+
+set -e
+set -o xtrace
+
+
+EPHEMERAL="
+        autoconf
+        automake
+        bzip2
+        cmake
+        git
+        libtool
+        libepoxy-dev
+        libtbb-dev
+        make
+        openssl-dev
+        unzip
+        wget
+        xz
+	zstd-dev
+        "
+
+apk add \
+    bison \
+    ccache \
+    clang-dev \
+    flex \
+    gcc \
+    g++ \
+    gettext \
+    glslang \
+    linux-headers \
+    llvm15-dev \
+    meson \
+    expat-dev \
+    elfutils-dev \
+    libselinux-dev \
+    libva-dev \
+    libpciaccess-dev \
+    zlib-dev \
+    python3-dev \
+    py3-mako \
+    py3-ply \
+    vulkan-headers \
+    spirv-tools-dev \
+    util-macros \
+    $EPHEMERAL
+
+
+. .gitlab-ci/container/container_pre_build.sh
+
+. .gitlab-ci/container/build-libdrm.sh
+
+. .gitlab-ci/container/build-wayland.sh
+
+pushd /usr/local
+git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
+rm -rf shader-db/.git
+cd shader-db
+make
+popd
+
+
+############### Uninstall the build software
+
+apk del $EPHEMERAL
+
+. .gitlab-ci/container/container_post_build.sh

.gitlab-ci/container/arm.config

@@ -0,0 +1,69 @@
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_DEBUG_KERNEL=y
+
+CONFIG_CRYPTO_ZSTD=y
+CONFIG_ZRAM_MEMORY_TRACKING=y
+CONFIG_ZRAM_WRITEBACK=y
+CONFIG_ZRAM=y
+CONFIG_ZSMALLOC_STAT=y
+
+# abootimg with a 'dummy' rootfs fails with root=/dev/nfs
+CONFIG_BLK_DEV_INITRD=n
+
+CONFIG_DEVFREQ_GOV_PERFORMANCE=y
+CONFIG_DEVFREQ_GOV_POWERSAVE=y
+CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_GOV_PASSIVE=y
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+
+CONFIG_DRM=y
+CONFIG_DRM_ETNAVIV=y
+CONFIG_DRM_ROCKCHIP=y
+CONFIG_DRM_PANFROST=y
+CONFIG_DRM_LIMA=y
+CONFIG_DRM_PANEL_SIMPLE=y
+CONFIG_PWM_CROS_EC=y
+CONFIG_BACKLIGHT_PWM=y
+
+CONFIG_ROCKCHIP_CDN_DP=n
+
+CONFIG_SPI_ROCKCHIP=y
+CONFIG_PWM_ROCKCHIP=y
+CONFIG_PHY_ROCKCHIP_DP=y
+CONFIG_DWMAC_ROCKCHIP=y
+
+CONFIG_MFD_RK808=y
+CONFIG_REGULATOR_RK808=y
+CONFIG_RTC_DRV_RK808=y
+CONFIG_COMMON_CLK_RK808=y
+
+CONFIG_REGULATOR_FAN53555=y
+CONFIG_REGULATOR=y
+
+CONFIG_REGULATOR_VCTRL=y
+
+CONFIG_KASAN=n
+CONFIG_KASAN_INLINE=n
+CONFIG_STACKTRACE=n
+
+CONFIG_TMPFS=y
+
+CONFIG_PROVE_LOCKING=n
+CONFIG_DEBUG_LOCKDEP=n
+CONFIG_SOFTLOCKUP_DETECTOR=n
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=n
+
+CONFIG_FW_LOADER_COMPRESS=y
+
+CONFIG_USB_USBNET=y
+CONFIG_NETDEVICES=y
+CONFIG_USB_NET_DRIVERS=y
+CONFIG_USB_RTL8152=y
+CONFIG_USB_NET_AX8817X=y
+CONFIG_USB_NET_SMSC95XX=y
+
+# TK1
+CONFIG_ARM_TEGRA_DEVFREQ=y
+
+# 32-bit build failure
+CONFIG_DRM_MSM=n

.gitlab-ci/container/arm64.config

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

.gitlab-ci/container/baremetal_build.sh

@@ -1,20 +1,19 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -e
 set -o xtrace
 
-# Fetch the arm-built rootfs image and unpack it in our x86_64 container (saves
+# Fetch the arm-built rootfs image and unpack it in our x86 container (saves
 # network transfer, disk usage, and runtime on test jobs)
 
 # shellcheck disable=SC2154 # arch is assigned in previous scripts
-if curl -X HEAD -s "${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/${ARTIFACTS_SUFFIX}/${arch}/done"; then
+if wget -q --method=HEAD "${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/${ARTIFACTS_SUFFIX}/${arch}/done"; then
   ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${FDO_UPSTREAM_REPO}/${ARTIFACTS_SUFFIX}/${arch}"
 else
   ARTIFACTS_URL="${ARTIFACTS_PREFIX}/${CI_PROJECT_PATH}/${ARTIFACTS_SUFFIX}/${arch}"
 fi
 
-curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    "${ARTIFACTS_URL}"/lava-rootfs.tar.zst -o rootfs.tar.zst
+wget "${ARTIFACTS_URL}"/lava-rootfs.tar.zst -O rootfs.tar.zst
 mkdir -p /rootfs-"$arch"
 tar -C /rootfs-"$arch" '--exclude=./dev/*' --zstd -xf rootfs.tar.zst
 rm rootfs.tar.zst
@@ -23,12 +22,9 @@ if [[ $arch == "arm64" ]]; then
     mkdir -p /baremetal-files
     pushd /baremetal-files
 
-    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-	-O "${KERNEL_IMAGE_BASE}"/arm64/Image
-    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-        -O "${KERNEL_IMAGE_BASE}"/arm64/Image.gz
-    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-        -O "${KERNEL_IMAGE_BASE}"/arm64/cheza-kernel
+    wget "${ARTIFACTS_URL}"/Image
+    wget "${ARTIFACTS_URL}"/Image.gz
+    wget "${ARTIFACTS_URL}"/cheza-kernel
 
     DEVICE_TREES=""
     DEVICE_TREES="$DEVICE_TREES apq8016-sbc.dtb"
@@ -37,8 +33,7 @@ if [[ $arch == "arm64" ]]; then
     DEVICE_TREES="$DEVICE_TREES imx8mq-nitrogen.dtb"
 
     for DTB in $DEVICE_TREES; do
-	curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-            -O "${KERNEL_IMAGE_BASE}/arm64/$DTB"
+        wget "${ARTIFACTS_URL}/$DTB"
     done
 
     popd
@@ -46,16 +41,14 @@ elif [[ $arch == "armhf" ]]; then
     mkdir -p /baremetal-files
     pushd /baremetal-files
 
-    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-        -O "${KERNEL_IMAGE_BASE}"/armhf/zImage
+    wget "${ARTIFACTS_URL}"/zImage
 
     DEVICE_TREES=""
     DEVICE_TREES="$DEVICE_TREES imx6q-cubox-i.dtb"
     DEVICE_TREES="$DEVICE_TREES tegra124-jetson-tk1.dtb"
 
     for DTB in $DEVICE_TREES; do
-	curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-            -O "${KERNEL_IMAGE_BASE}/armhf/$DTB"
+        wget "${ARTIFACTS_URL}/$DTB"
     done
 
     popd

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

@@ -1,99 +0,0 @@
-#!/usr/bin/env bash
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# KERNEL_ROOTFS_TAG
-
-set -uex
-
-ANGLE_REV="76025caa1a059f464a2b0e8f879dbd4746f092b9"
-SCRIPTS_DIR="$(pwd)/.gitlab-ci"
-ANGLE_PATCH_DIR="${SCRIPTS_DIR}/container/patches"
-
-# DEPOT tools
-git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git /depot-tools
-export PATH=/depot-tools:$PATH
-export DEPOT_TOOLS_UPDATE=0
-
-mkdir /angle-build
-mkdir /angle
-pushd /angle-build
-git init
-git remote add origin https://chromium.googlesource.com/angle/angle.git
-git fetch --depth 1 origin "$ANGLE_REV"
-git checkout FETCH_HEAD
-
-angle_patch_files=(
-  build-angle_deps_Make-more-sources-conditional.patch
-)
-for patch in "${angle_patch_files[@]}"; do
-  echo "Apply patch to ANGLE from ${patch}"
-  GIT_COMMITTER_DATE=$(date -d@0) git am < "${ANGLE_PATCH_DIR}/${patch}"
-done
-
-{
-  echo "ANGLE base version $ANGLE_REV"
-  echo "The following local patches are applied on top:"
-  git log --reverse --oneline $ANGLE_REV.. --format='- %s'
-} > /angle/version
-
-# source preparation
-gclient config --name REPLACE-WITH-A-DOT --unmanaged \
-  --custom-var='angle_enable_cl=False' \
-  --custom-var='angle_enable_cl_testing=False' \
-  --custom-var='angle_enable_vulkan_validation_layers=False' \
-  --custom-var='angle_enable_wgpu=False' \
-  --custom-var='build_allow_regenerate=False' \
-  --custom-var='build_angle_deqp_tests=False' \
-  --custom-var='build_angle_perftests=False' \
-  --custom-var='build_with_catapult=False' \
-  --custom-var='build_with_swiftshader=False' \
-  https://chromium.googlesource.com/angle/angle.git
-sed -e 's/REPLACE-WITH-A-DOT/./;' -i .gclient
-gclient sync -j"${FDO_CI_CONCURRENT:-4}"
-
-mkdir -p out/Release
-echo '
-angle_build_all=false
-angle_build_tests=false
-angle_enable_cl=false
-angle_enable_cl_testing=false
-angle_enable_gl=false
-angle_enable_gl_desktop_backend=false
-angle_enable_null=false
-angle_enable_swiftshader=false
-angle_enable_trace=false
-angle_enable_wgpu=false
-angle_enable_vulkan=true
-angle_enable_vulkan_api_dump_layer=false
-angle_enable_vulkan_validation_layers=false
-angle_has_frame_capture=false
-angle_has_histograms=false
-angle_use_custom_libvulkan=false
-angle_egl_extension="so.1"
-angle_glesv2_extension="so.2"
-build_angle_deqp_tests=false
-dcheck_always_on=true
-enable_expensive_dchecks=false
-is_debug=false
-' > out/Release/args.gn
-
-if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
-  build/linux/sysroot_scripts/install-sysroot.py --arch=arm64
-fi
-
-gn gen out/Release
-# depot_tools overrides ninja with a version that doesn't work.  We want
-# ninja with FDO_CI_CONCURRENT anyway.
-/usr/local/bin/ninja -C out/Release/ libEGL libGLESv2
-
-rm -f out/Release/libvulkan.so* out/Release/*.so.TOC
-cp out/Release/lib*.so* /angle/
-ln -s libEGL.so.1 /angle/libEGL.so
-ln -s libGLESv2.so.2 /angle/libGLESv2.so
-
-rm -rf out
-
-popd
-rm -rf /depot-tools
-rm -rf /angle-build

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

@@ -1,21 +1,15 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # shellcheck disable=SC2086 # we want word splitting
 
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_GL_TAG
-# DEBIAN_TEST_VK_TAG
-# KERNEL_ROOTFS_TAG
+set -ex
 
-set -uex
-
-APITRACE_VERSION="0a6506433e1f9f7b69757b4e5730326970c4321a"
+APITRACE_VERSION="790380e05854d5c9d315555444ffcc7acb8f4037"
 
 git clone https://github.com/apitrace/apitrace.git --single-branch --no-checkout /apitrace
 pushd /apitrace
 git checkout "$APITRACE_VERSION"
 git submodule update --init --depth 1 --recursive
-cmake -S . -B _build -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_GUI=False -DENABLE_WAFFLE=on ${EXTRA_CMAKE_ARGS:-}
+cmake -S . -B _build -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_GUI=False -DENABLE_WAFFLE=on $EXTRA_CMAKE_ARGS
 cmake --build _build --parallel --target apitrace eglretrace
 mkdir build
 cp _build/apitrace build

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

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-
-BINDGEN_VER=0.65.1
-CBINDGEN_VER=0.26.0
-
-# bindgen
-RUSTFLAGS='-L native=/usr/local/lib' cargo install \
-  bindgen-cli --version ${BINDGEN_VER} \
-  --locked \
-  -j ${FDO_CI_CONCURRENT:-4} \
-  --root /usr/local
-
-# cbindgen
-RUSTFLAGS='-L native=/usr/local/lib' cargo install \
-  cbindgen --version ${CBINDGEN_VER} \
-  --locked \
-  -j ${FDO_CI_CONCURRENT:-4} \
-  --root /usr/local
-

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

@@ -1,43 +1,40 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # shellcheck disable=SC2086 # we want word splitting
 
-set -uex
+set -ex
 
 git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"
 
-CROSVM_VERSION=1641c55bcc922588e24de73e9cca7b5e4005bd6d
+CROSVM_VERSION=504899212d626ecf42b1c459e5592891dde5bf91
 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=d9c002fac153b834a2c17731f2b85c36e333e102
+VIRGLRENDERER_VERSION=3f2685355f71201f22b98c19aa778b43732c8435
 rm -rf third_party/virglrenderer
-git clone --single-branch -b main --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer
+git clone --single-branch -b master --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer
 pushd third_party/virglrenderer
 git checkout "$VIRGLRENDERER_VERSION"
-meson setup build/ -D libdir=lib -D render-server-worker=process -D venus=true ${EXTRA_MESON_ARGS:-}
-meson install -C build
+meson build/ -Drender-server=true -Drender-server-worker=process -Dvenus-experimental=true $EXTRA_MESON_ARGS
+ninja -C build install
 popd
 
-cargo update -p pkg-config@0.3.26 --precise 0.3.27
+RUSTFLAGS='-L native=/usr/local/lib' cargo install \
+  bindgen \
+  -j ${FDO_CI_CONCURRENT:-4} \
+  --root /usr/local \
+  --version 0.60.1 \
+  $EXTRA_CARGO_ARGS
 
 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
-  bindgen-cli \
-  --locked \
-  -j ${FDO_CI_CONCURRENT:-4} \
-  --root /usr/local \
-  --version 0.65.1 \
-  ${EXTRA_CARGO_ARGS:-}
-
-CROSVM_USE_SYSTEM_MINIGBM=1 CROSVM_USE_SYSTEM_VIRGLRENDERER=1 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
   -j ${FDO_CI_CONCURRENT:-4} \
   --locked \
-  --features 'default-no-sandbox gpu x virgl_renderer' \
+  --features 'default-no-sandbox gpu x virgl_renderer virgl_renderer_next' \
   --path . \
   --root /usr/local \
-  ${EXTRA_CARGO_ARGS:-}
+  $EXTRA_CARGO_ARGS
 
 popd
 

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

@@ -1,96 +1,31 @@
-#!/usr/bin/env bash
+#!/bin/sh
 # shellcheck disable=SC2086 # we want word splitting
 
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_ANDROID_TAG
-# DEBIAN_BASE_TAG
-# KERNEL_ROOTFS_TAG
+set -ex
 
-set -uex
+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_VERSION=0.20.2
-
-commits_to_backport=(
-)
-
-patch_files=(
-)
-
-DEQP_RUNNER_GIT_URL="${DEQP_RUNNER_GIT_URL:-https://gitlab.freedesktop.org/mesa/deqp-runner.git}"
-
-if [ -n "${DEQP_RUNNER_GIT_TAG:-}" ]; then
-    DEQP_RUNNER_GIT_CHECKOUT="$DEQP_RUNNER_GIT_TAG"
-elif [ -n "${DEQP_RUNNER_GIT_REV:-}" ]; then
-    DEQP_RUNNER_GIT_CHECKOUT="$DEQP_RUNNER_GIT_REV"
-else
-    DEQP_RUNNER_GIT_CHECKOUT="v$DEQP_RUNNER_VERSION"
-fi
-
-BASE_PWD=$PWD
-
-mkdir -p /deqp-runner
-pushd /deqp-runner
-mkdir deqp-runner-git
-pushd deqp-runner-git
-git init
-git remote add origin "$DEQP_RUNNER_GIT_URL"
-git fetch --depth 1 origin "$DEQP_RUNNER_GIT_CHECKOUT"
-git checkout FETCH_HEAD
-
-for commit in "${commits_to_backport[@]}"
-do
-  PATCH_URL="https://gitlab.freedesktop.org/mesa/deqp-runner/-/commit/$commit.patch"
-  echo "Backport deqp-runner commit $commit from $PATCH_URL"
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 $PATCH_URL | git am
-done
-
-for patch in "${patch_files[@]}"
-do
-  echo "Apply patch to deqp-runner from $patch"
-  git am "$BASE_PWD/.gitlab-ci/container/patches/$patch"
-done
-
-if [ -z "${RUST_TARGET:-}" ]; then
-    RUST_TARGET=""
-fi
-
-if [[ "$RUST_TARGET" != *-android ]]; then
-    # When CC (/usr/lib/ccache/gcc) variable is set, the rust compiler uses
-    # this variable when cross-compiling arm32 and build fails for zsys-sys.
-    # So unset the CC variable when cross-compiling for arm32.
-    SAVEDCC=${CC:-}
-    if [ "$RUST_TARGET" = "armv7-unknown-linux-gnueabihf" ]; then
-        unset CC
+    if [ -n "${DEQP_RUNNER_GIT_TAG}" ]; then
+        DEQP_RUNNER_CARGO_ARGS="--tag ${DEQP_RUNNER_GIT_TAG} ${DEQP_RUNNER_CARGO_ARGS}"
+    else
+        DEQP_RUNNER_CARGO_ARGS="--rev ${DEQP_RUNNER_GIT_REV} ${DEQP_RUNNER_CARGO_ARGS}"
     fi
-    cargo install --locked  \
-        -j ${FDO_CI_CONCURRENT:-4} \
-        --root /usr/local \
-        ${EXTRA_CARGO_ARGS:-} \
-        --path .
-    CC=$SAVEDCC
+
+    DEQP_RUNNER_CARGO_ARGS="${DEQP_RUNNER_CARGO_ARGS} ${EXTRA_CARGO_ARGS}"
 else
-    cargo install --locked  \
-        -j ${FDO_CI_CONCURRENT:-4} \
-        --root /usr/local --version 2.10.0 \
-        cargo-ndk
-
-    rustup target add $RUST_TARGET
-    RUSTFLAGS='-C target-feature=+crt-static' cargo ndk --target $RUST_TARGET build --release
-
-    mv target/$RUST_TARGET/release/deqp-runner /deqp-runner
-
-    cargo uninstall --locked  \
-        --root /usr/local \
-        cargo-ndk
+    # Install from package registry
+    DEQP_RUNNER_CARGO_ARGS="--version 0.16.0 ${EXTRA_CARGO_ARGS} -- deqp-runner"
 fi
 
-popd
-rm -rf deqp-runner-git
-popd
+cargo install --locked  \
+    -j ${FDO_CI_CONCURRENT:-4} \
+    --root /usr/local \
+    ${DEQP_RUNNER_CARGO_ARGS}
 
 # remove unused test runners to shrink images for the Mesa CI build (not kernel,
 # which chooses its own deqp branch)
-if [ -z "${DEQP_RUNNER_GIT_TAG:-}${DEQP_RUNNER_GIT_REV:-}" ]; then
+if [ -z "${DEQP_RUNNER_GIT_TAG}${DEQP_RUNNER_GIT_REV}" ]; then
     rm -f /usr/local/bin/igt-runner
 fi

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

@@ -1,261 +1,104 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # shellcheck disable=SC2086 # we want word splitting
 
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_ANDROID_TAG
-# DEBIAN_TEST_GL_TAG
-# DEBIAN_TEST_VK_TAG
-# KERNEL_ROOTFS_TAG
-
-set -uex -o pipefail
-
-# See `deqp_build_targets` below for which release is used to produce which
-# binary. Unless this comment has bitrotten:
-# - the VK release produces `deqp-vk`,
-# - the GL release produces `glcts`, and
-# - the GLES release produces `deqp-gles*` and `deqp-egl`
-
-DEQP_VK_VERSION=1.3.10.0
-DEQP_GL_VERSION=4.6.5.0
-DEQP_GLES_VERSION=3.2.11.0
-
-# Patches to VulkanCTS may come from commits in their repo (listed in
-# cts_commits_to_backport) or patch files stored in our repo (in the patch
-# directory `$OLDPWD/.gitlab-ci/container/patches/` listed in cts_patch_files).
-# Both list variables would have comments explaining the reasons behind the
-# patches.
-
-# shellcheck disable=SC2034
-vk_cts_commits_to_backport=(
-    # Remove multi-line test results in DRM format modifier tests
-    8c95af68a2a85cbdc7e1d9267ab029f73e9427d2
-)
-
-# shellcheck disable=SC2034
-vk_cts_patch_files=(
-)
-
-if [ "${DEQP_TARGET}" = 'android' ]; then
-  vk_cts_patch_files+=(
-    build-deqp-vk_Allow-running-on-Android-from-the-command-line.patch
-    build-deqp-vk_Android-prints-to-stdout-instead-of-logcat.patch
-  )
-fi
-
-# shellcheck disable=SC2034
-gl_cts_commits_to_backport=(
-)
-
-# 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=(
-)
-
-# 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
-
+set -ex
 
 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 \
+    -b vulkan-cts-1.3.3.0 \
     --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 ${DEQP_API} CTS from $PATCH_URL"
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 $PATCH_URL | \
-    GIT_COMMITTER_DATE=$(date -d@0) git am -
-done
-
-cts_patch_files="${deqp_api}_cts_patch_files[@]"
-for patch in "${!cts_patch_files}"
-do
-  echo "Apply patch to ${DEQP_API} CTS from $patch"
-  GIT_COMMITTER_DATE=$(date -d@0) 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'
-} > /deqp/version-$deqp_api
+# Apply a patch to update zlib link to an available version.
+# vulkan-cts-1.3.3.0 uses zlib 1.2.12 which was removed from zlib server due to
+# a CVE. See https://zlib.net/
+# FIXME: Remove this patch when uprev to 1.3.4.0+
+wget -O- https://github.com/KhronosGroup/VK-GL-CTS/commit/6bb2e7d64261bedb503947b1b251b1eeeb49be73.patch |
+    git am -
 
 # --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_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:-}
-    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:-}
-    mold --run ninja modules/egl/deqp-egl
-    mv /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-wayland
-  fi
-fi
+# 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
+cp /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-x11
 
 cmake -S /VK-GL-CTS -B . -G Ninja \
-      -DDEQP_TARGET=${DEQP_TARGET} \
+      -DDEQP_TARGET=wayland \
       -DCMAKE_BUILD_TYPE=Release \
-      ${EXTRA_CMAKE_ARGS:-}
+      $EXTRA_CMAKE_ARGS
+ninja modules/egl/deqp-egl
+cp /deqp/modules/egl/deqp-egl /deqp/modules/egl/deqp-egl-wayland
 
-# Make sure `default` doesn't silently stop detecting one of the platforms we care about
-if [ "${DEQP_TARGET}" = 'default' ]; then
-  grep -q DEQP_SUPPORT_WAYLAND=1 build.ninja
-  grep -q DEQP_SUPPORT_X11=1 build.ninja
-  grep -q DEQP_SUPPORT_XCB=1 build.ninja
-fi
+cmake -S /VK-GL-CTS -B . -G Ninja \
+      -DDEQP_TARGET=${DEQP_TARGET:-x11_glx} \
+      -DCMAKE_BUILD_TYPE=Release \
+      $EXTRA_CMAKE_ARGS
+ninja
 
-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
+mv /deqp/modules/egl/deqp-egl-x11 /deqp/modules/egl/deqp-egl
 
-mold --run ninja "${deqp_build_targets[@]}"
+# Copy out the mustpass lists we want.
+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
+cp \
+    /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/aosp_mustpass/3.2.6.x/*.txt \
+    /deqp/mustpass/.
+cp \
+    /deqp/external/openglcts/modules/gl_cts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-master.txt \
+    /deqp/mustpass/.
+cp \
+    /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/khronos_mustpass/3.2.6.x/*-master.txt \
+    /deqp/mustpass/.
+cp \
+    /deqp/external/openglcts/modules/gl_cts/data/mustpass/gl/khronos_mustpass/4.6.1.x/*-master.txt \
+    /deqp/mustpass/.
+cp \
+    /deqp/external/openglcts/modules/gl_cts/data/mustpass/gl/khronos_mustpass_single/4.6.1.x/*-single.txt \
+    /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 \
-            /VK-GL-CTS/external/openglcts/data/gl_cts/data/mustpass/gl/khronos_mustpass/main/*-main.txt \
-            /deqp/mustpass/
-        cp \
-            /VK-GL-CTS/external/openglcts/data/gl_cts/data/mustpass/gl/khronos_mustpass_single/main/*-single.txt \
-            /deqp/mustpass/
-    fi
-
-    if [ "${DEQP_API}" = 'GLES' ]; then
-        cp \
-            /VK-GL-CTS/external/openglcts/data/gl_cts/data/mustpass/gles/aosp_mustpass/main/*.txt \
-            /deqp/mustpass/
-        cp \
-            /VK-GL-CTS/external/openglcts/data/gl_cts/data/mustpass/egl/aosp_mustpass/main/egl-main.txt \
-            /deqp/mustpass/
-        cp \
-            /VK-GL-CTS/external/openglcts/data/gl_cts/data/mustpass/gles/khronos_mustpass/main/*-main.txt \
-            /deqp/mustpass/
-    fi
-
-    # Save *some* executor utils, but otherwise strip things down
-    # to reduct deqp build size:
-    mkdir /deqp/executor.save
-    cp /deqp/executor/testlog-to-* /deqp/executor.save
-    rm -rf /deqp/executor
-    mv /deqp/executor.save /deqp/executor
-fi
-
-# Compress the caselists, since Vulkan's in particular are gigantic; higher
-# compression levels provide no real measurable benefit.
-zstd -1 --rm /deqp/mustpass/*.txt
+# Save *some* executor utils, but otherwise strip things down
+# to reduct deqp build size:
+mkdir /deqp/executor.save
+cp /deqp/executor/testlog-to-* /deqp/executor.save
+rm -rf /deqp/executor
+mv /deqp/executor.save /deqp/executor
 
 # Remove other mustpass files, since we saved off the ones we wanted to conventient locations above.
-rm -rf /deqp/external/**/mustpass/
-rm -rf /deqp/external/vulkancts/modules/vulkan/vk-main*
+rm -rf /deqp/external/openglcts/modules/gl_cts/data/mustpass
+rm -rf /deqp/external/vulkancts/modules/vulkan/vk-master*
 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
-find . -depth \( -iname '*cmake*' -o -name '*ninja*' -o -name '*.o' -o -name '*.a' \) -exec rm -rf {} \;
-if [ "${DEQP_API}" = 'VK' ]; then
-  ${STRIP_CMD:-strip} external/vulkancts/modules/vulkan/deqp-vk
-fi
-if [ "${DEQP_API}" = 'GL' ]; then
-  ${STRIP_CMD:-strip} external/openglcts/modules/glcts
-fi
-if [ "${DEQP_API}" = 'GLES' ]; then
-  ${STRIP_CMD:-strip} modules/*/deqp-*
-fi
+# shellcheck disable=SC2038,SC2185 # TODO: rewrite find
+find -iname '*cmake*' -o -name '*ninja*' -o -name '*.o' -o -name '*.a' | xargs rm -rf
+${STRIP_CMD:-strip} external/vulkancts/modules/vulkan/deqp-vk
+${STRIP_CMD:-strip} external/openglcts/modules/glcts
+${STRIP_CMD:-strip} modules/*/deqp-*
 du -sh ./*
 rm -rf /VK-GL-CTS
 popd

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

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BUILD_TAG
-
-set -uex
-
-git clone https://github.com/microsoft/DirectX-Headers -b v1.614.1 --depth 1
-pushd DirectX-Headers
-meson setup build --backend=ninja --buildtype=release -Dbuild-test=false ${EXTRA_MESON_ARGS:-}
-meson install -C build
-popd
-rm -rf DirectX-Headers

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

@@ -1,15 +1,10 @@
 #!/bin/bash
 
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_VK_TAG
-# KERNEL_ROOTFS_TAG
-
 set -ex
 
 git clone https://github.com/ValveSoftware/Fossilize.git
 cd Fossilize
-git checkout b43ee42bbd5631ea21fe9a2dee4190d5d875c327
+git checkout 16fba1b8b5d9310126bb02323d7bae3227338461
 git submodule update --init
 mkdir build
 cd build

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

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -ex
 
-GFXRECONSTRUCT_VERSION=761837794a1e57f918a85af7000b12e531b178ae
+GFXRECONSTRUCT_VERSION=5ed3caeecc46e976c4df31e263df8451ae176c26
 
 git clone https://github.com/LunarG/gfxreconstruct.git \
     --single-branch \

.gitlab-ci/container/build-hang-detection.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -ex
+
+PARALLEL_DEQP_RUNNER_VERSION=fe557794b5dadd8dbf0eae403296625e03bda18a
+
+git clone https://gitlab.freedesktop.org/mesa/parallel-deqp-runner --single-branch -b master --no-checkout /parallel-deqp-runner
+pushd /parallel-deqp-runner
+git checkout "$PARALLEL_DEQP_RUNNER_VERSION"
+meson . _build
+ninja -C _build hang-detection
+mkdir -p build/bin
+install _build/hang-detection build/bin
+strip build/bin/*
+find . -not -path './build' -not -path './build/*' -delete
+popd

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

@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC1091  # the path is created by the script
-
-set -ex
-
-KDL_REVISION="cbbe5fd54505fd03ee34f35bfd16794f0c30074f"
-KDL_CHECKOUT_DIR="/tmp/ci-kdl.git"
-
-mkdir -p ${KDL_CHECKOUT_DIR}
-pushd ${KDL_CHECKOUT_DIR}
-git init
-git remote add origin https://gitlab.freedesktop.org/gfx-ci/ci-kdl.git
-git fetch --depth 1 origin ${KDL_REVISION}
-git checkout FETCH_HEAD
-popd
-
-# Run venv in a subshell, so we don't accidentally leak the venv state into
-# calling scripts
-(
-	python3 -m venv /ci-kdl
-	source /ci-kdl/bin/activate &&
-	pushd ${KDL_CHECKOUT_DIR} &&
-	pip install -r requirements.txt &&
-	pip install . &&
-	popd
-)
-
-rm -rf ${KDL_CHECKOUT_DIR}

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

@@ -0,0 +1,53 @@
+#!/bin/bash
+# shellcheck disable=SC2086 # we want word splitting
+
+set -ex
+
+mkdir -p kernel
+wget -qO- ${KERNEL_URL} | tar -xj --strip-components=1 -C kernel
+pushd kernel
+
+# The kernel doesn't like the gold linker (or the old lld in our debians).
+# Sneak in some override symlinks during kernel build until we can update
+# debian (they'll get blown away by the rm of the kernel dir at the end).
+mkdir -p ld-links
+for i in /usr/bin/*-ld /usr/bin/ld; do
+    i=$(basename $i)
+    ln -sf /usr/bin/$i.bfd ld-links/$i
+done
+
+NEWPATH=$(pwd)/ld-links
+export PATH=$NEWPATH:$PATH
+
+KERNEL_FILENAME=$(basename $KERNEL_URL)
+export LOCALVERSION="$KERNEL_FILENAME"
+./scripts/kconfig/merge_config.sh ${DEFCONFIG} ../.gitlab-ci/container/${KERNEL_ARCH}.config
+make ${KERNEL_IMAGE_NAME}
+for image in ${KERNEL_IMAGE_NAME}; do
+    cp arch/${KERNEL_ARCH}/boot/${image} /lava-files/.
+done
+
+if [[ -n ${DEVICE_TREES} ]]; then
+    make dtbs
+    cp ${DEVICE_TREES} /lava-files/.
+fi
+
+make modules
+INSTALL_MOD_PATH=/lava-files/rootfs-${DEBIAN_ARCH}/ make modules_install
+
+if [[ ${DEBIAN_ARCH} = "arm64" ]]; then
+    make Image.lzma
+    mkimage \
+        -f auto \
+        -A arm \
+        -O linux \
+        -d arch/arm64/boot/Image.lzma \
+        -C lzma\
+        -b arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dtb \
+        /lava-files/cheza-kernel
+    KERNEL_IMAGE_NAME+=" cheza-kernel"
+fi
+
+popd
+rm -rf kernel
+

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

@@ -1,9 +1,8 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
-set -uex
+set -ex
 
-export LLVM_CONFIG="llvm-config-${LLVM_VERSION:?"llvm unset!"}"
-LLVM_TAG="llvmorg-15.0.7"
+export LLVM_CONFIG="llvm-config-11"
 
 $LLVM_CONFIG --version
 
@@ -12,12 +11,12 @@ git config --global user.name "Mesa CI"
 git clone \
     https://github.com/llvm/llvm-project \
     --depth 1 \
-    -b "${LLVM_TAG}" \
+    -b llvmorg-12.0.0-rc3 \
     /llvm-project
 
 mkdir /libclc
 pushd /libclc
-cmake -S /llvm-project/libclc -B . -G Ninja -DLLVM_CONFIG="$LLVM_CONFIG" -DLIBCLC_TARGETS_TO_BUILD="spirv-mesa3d-;spirv64-mesa3d-" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DLLVM_SPIRV=/usr/bin/llvm-spirv
+cmake -S /llvm-project/libclc -B . -G Ninja -DLLVM_CONFIG=$LLVM_CONFIG -DLIBCLC_TARGETS_TO_BUILD="spirv-mesa3d-;spirv64-mesa3d-" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DLLVM_SPIRV=/usr/bin/llvm-spirv
 ninja
 ninja install
 popd

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

@@ -1,17 +1,14 @@
-#!/usr/bin/env bash
-# Script used for Android and Fedora builds (Debian builds get their libdrm version
-# from https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo - see PKG_REPO_REV)
+#!/bin/bash
 # shellcheck disable=SC2086 # we want word splitting
 
-set -uex
+set -ex
 
-export LIBDRM_VERSION=libdrm-2.4.122
+export LIBDRM_VERSION=libdrm-2.4.110
 
-curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \
-    https://dri.freedesktop.org/libdrm/"$LIBDRM_VERSION".tar.xz
+wget https://dri.freedesktop.org/libdrm/"$LIBDRM_VERSION".tar.xz
 tar -xvf "$LIBDRM_VERSION".tar.xz && rm "$LIBDRM_VERSION".tar.xz
 cd "$LIBDRM_VERSION"
-meson setup build -D vc4=disabled -D freedreno=disabled -D etnaviv=disabled ${EXTRA_MESON_ARGS:-}
-meson install -C build
+meson build -D vc4=false -D freedreno=false -D etnaviv=false $EXTRA_MESON_ARGS
+ninja -C build install
 cd ..
 rm -rf "$LIBDRM_VERSION"

.gitlab-ci/container/build-llvm-spirv.sh

@@ -1,15 +1,12 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -ex
 
-VER="${LLVM_VERSION:?llvm not set}.0.0"
+wget https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v13.0.0.tar.gz
+tar -xvf v13.0.0.tar.gz && rm v13.0.0.tar.gz
 
-curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    -O "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v${VER}.tar.gz"
-tar -xvf "v${VER}.tar.gz" && rm "v${VER}.tar.gz"
-
-mkdir "SPIRV-LLVM-Translator-${VER}/build"
-pushd "SPIRV-LLVM-Translator-${VER}/build"
+mkdir SPIRV-LLVM-Translator-13.0.0/build
+pushd SPIRV-LLVM-Translator-13.0.0/build
 cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
 ninja
 ninja install
@@ -18,5 +15,5 @@ ninja llvm-spirv
 cp tools/llvm-spirv/llvm-spirv /usr/bin/
 popd
 
-du -sh "SPIRV-LLVM-Translator-${VER}"
-rm -rf "SPIRV-LLVM-Translator-${VER}"
+du -sh SPIRV-LLVM-Translator-13.0.0
+rm -rf SPIRV-LLVM-Translator-13.0.0

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

@@ -2,22 +2,12 @@
 
 set -ex
 
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# ALPINE_X86_64_BUILD_TAG
-# DEBIAN_BASE_TAG
-# DEBIAN_BUILD_TAG
-# FEDORA_X86_64_BUILD_TAG
-# KERNEL_ROOTFS_TAG
-
-MOLD_VERSION="2.32.0"
+MOLD_VERSION="1.9.0"
 
 git clone -b v"$MOLD_VERSION" --single-branch --depth 1 https://github.com/rui314/mold.git
 pushd mold
-
 cmake -DCMAKE_BUILD_TYPE=Release -D BUILD_TESTING=OFF -D MOLD_LTO=ON
-cmake --build . --parallel "${FDO_CI_CONCURRENT:-4}"
-cmake --install . --strip
-
+cmake --build . --parallel
+cmake --install .
 popd
 rm -rf mold

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

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_GL_TAG
-
-set -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

@@ -1,34 +1,26 @@
 #!/bin/bash
 # shellcheck disable=SC2086 # we want word splitting
-set -uex
 
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_GL_TAG
-# DEBIAN_TEST_VK_TAG
-# KERNEL_ROOTFS_TAG
-
-REV="c2b31333926a6171c3c02d182b756efad7770410"
+set -ex
 
 git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
 pushd /piglit
-git checkout "$REV"
+git checkout 1cd716180cfb6ef0c1fc54702460ef49e5115791
 patch -p1 <$OLDPWD/.gitlab-ci/piglit/disable-vs_in.diff
-cmake -S . -B . -G Ninja -DCMAKE_BUILD_TYPE=Release $PIGLIT_OPTS ${EXTRA_CMAKE_ARGS:-}
-ninja ${PIGLIT_BUILD_TARGETS:-}
-find . -depth \( -name .git -o -name '*ninja*' -o -iname '*cmake*' -o -name '*.[chao]' \) \
-       ! -name 'include_test.h' -exec rm -rf {} \;
+cmake -S . -B . -G Ninja -DCMAKE_BUILD_TYPE=Release $PIGLIT_OPTS $EXTRA_CMAKE_ARGS
+ninja $PIGLIT_BUILD_TARGETS
+# shellcheck disable=SC2038,SC2185 # TODO: rewrite find
+find -name .git -o -name '*ninja*' -o -iname '*cmake*' -o -name '*.[chao]' | xargs rm -rf
 rm -rf target_api
-if [ "${PIGLIT_BUILD_TARGETS:-}" = "piglit_replayer" ]; then
-    find . -depth \
-         ! -regex "^\.$" \
+if [ "$PIGLIT_BUILD_TARGETS" = "piglit_replayer" ]; then
+    # shellcheck disable=SC2038,SC2185 # TODO: rewrite find
+    find ! -regex "^\.$" \
          ! -regex "^\.\/piglit.*" \
          ! -regex "^\.\/framework.*" \
          ! -regex "^\.\/bin$" \
          ! -regex "^\.\/bin\/replayer\.py" \
          ! -regex "^\.\/templates.*" \
          ! -regex "^\.\/tests$" \
-         ! -regex "^\.\/tests\/replay\.py" \
-         -exec rm -rf {} \; 2>/dev/null
+         ! -regex "^\.\/tests\/replay\.py" 2>/dev/null | xargs rm -rf
 fi
 popd

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

@@ -11,22 +11,21 @@ set -ex
 mkdir -p "$HOME"/.cargo
 ln -s /usr/local/bin "$HOME"/.cargo/bin
 
-# Rusticl requires at least Rust 1.66.0 and NAK requires 1.73.0
+# Rusticl requires at least Rust 1.59.0
 #
-# Also, pick a specific snapshot from rustup so the compiler doesn't drift on
+# Also, oick a specific snapshot from rustup so the compiler doesn't drift on
 # us.
-RUST_VERSION=1.76.0-2024-02-08
+RUST_VERSION=1.59.0-2022-02-24
 
 # For rust in Mesa, we use rustup to install.  This lets us pick an arbitrary
 # version of the compiler, rather than whatever the container's Debian comes
 # with.
-curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \
-      --default-toolchain $RUST_VERSION \
-      --profile minimal \
-      -y
+wget https://sh.rustup.rs -O - | sh -s -- \
+   --default-toolchain $RUST_VERSION \
+   --profile minimal \
+   -y
 
-rustup component add clippy rustfmt
+rustup component add rustfmt
 
 # Set up a config script for cross compiling -- cargo needs your system cc for
 # linking in cross builds, but doesn't know what you want to use for system cc.

.gitlab-ci/container/build-shader-db.sh

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BUILD_TAG
-
-set -ex
-
-pushd /usr/local
-git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
-rm -rf shader-db/.git
-cd shader-db
-make
-popd

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

@@ -1,38 +1,27 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: MIT
+#!/bin/bash
 #
-# Copyright © 2022 Collabora Limited
+# Copyright (C) 2022 Collabora Limited
 # Author: Guilherme Gallo <guilherme.gallo@collabora.com>
 #
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# KERNEL_ROOTFS_TAG
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 
-set -uex
-
-SKQP_BRANCH=android-cts-12.1_r5
-
-SCRIPT_DIR="$(pwd)/.gitlab-ci/container"
-SKQP_PATCH_DIR="${SCRIPT_DIR}/patches"
-BASE_ARGS_GN_FILE="${SCRIPT_DIR}/build-skqp_base.gn"
-
-case "$DEBIAN_ARCH" in
-  amd64)
-    SKQP_ARCH=x64
-    ;;
-  armhf)
-    SKQP_ARCH=arm
-    ;;
-  arm64)
-    SKQP_ARCH=arm64
-    ;;
-esac
-
-SKIA_DIR=${SKIA_DIR:-$(mktemp -d)}
-SKQP_OUT_DIR=${SKIA_DIR}/out/${SKQP_ARCH}
-SKQP_INSTALL_DIR=${SKQP_INSTALL_DIR:-/skqp}
-SKQP_ASSETS_DIR="${SKQP_INSTALL_DIR}/assets"
-SKQP_BINARIES=(skqp list_gpu_unit_tests list_gms)
 
 create_gn_args() {
     # gn can be configured to cross-compile skia and its tools
@@ -52,10 +41,24 @@ download_skia_source() {
     # Skia cloned from https://android.googlesource.com/platform/external/skqp
     # has all needed assets tracked on git-fs
     SKQP_REPO=https://android.googlesource.com/platform/external/skqp
+    SKQP_BRANCH=android-cts-11.0_r7
 
     git clone --branch "${SKQP_BRANCH}" --depth 1 "${SKQP_REPO}" "${SKIA_DIR}"
 }
 
+set -ex
+
+SCRIPT_DIR=$(realpath "$(dirname "$0")")
+SKQP_PATCH_DIR="${SCRIPT_DIR}"
+BASE_ARGS_GN_FILE="${SCRIPT_DIR}/build-skqp_base.gn"
+
+SKQP_ARCH=${SKQP_ARCH:-x64}
+SKIA_DIR=${SKIA_DIR:-$(mktemp -d)}
+SKQP_OUT_DIR=${SKIA_DIR}/out/${SKQP_ARCH}
+SKQP_INSTALL_DIR=${SKQP_INSTALL_DIR:-/skqp}
+SKQP_ASSETS_DIR="${SKQP_INSTALL_DIR}/assets"
+SKQP_BINARIES=(skqp list_gpu_unit_tests list_gms)
+
 download_skia_source
 
 pushd "${SKIA_DIR}"
@@ -64,12 +67,6 @@ pushd "${SKIA_DIR}"
 cat "${SKQP_PATCH_DIR}"/build-skqp_*.patch |
     patch -p1
 
-# hack for skqp see the clang
-pushd /usr/bin/
-ln -s "../lib/llvm-${LLVM_VERSION:-15}/bin/clang" clang
-ln -s "../lib/llvm-${LLVM_VERSION:-15}/bin/clang++" clang++
-popd
-
 # Fetch some needed build tools needed to build skia/skqp.
 # Basically, it clones repositories with commits SHAs from ${SKIA_DIR}/DEPS
 # directory.

.gitlab-ci/container/build-skqp_base.gn

@@ -1,12 +1,7 @@
 cc = "clang"
 cxx = "clang++"
 
-extra_cflags = [
-        "-Wno-error",
-
-        "-DSK_ENABLE_DUMP_GPU",
-        "-DSK_BUILD_FOR_SKQP"
-    ]
+extra_cflags = [ "-DSK_ENABLE_DUMP_GPU", "-DSK_BUILD_FOR_SKQP" ]
 extra_cflags_cc = [
         "-Wno-error",
 
@@ -27,13 +22,6 @@ extra_cflags_cc = [
         "-Wno-suggest-destructor-override",
         "-Wno-return-std-move-in-c++11",
         "-Wno-extra-semi-stmt",
-        "-Wno-reserved-identifier",
-        "-Wno-bitwise-instead-of-logical",
-        "-Wno-reserved-identifier",
-        "-Wno-psabi",
-        "-Wno-unused-but-set-variable",
-        "-Wno-sizeof-array-div",
-        "-Wno-string-concatenation",
     ]
 
 cc_wrapper = "ccache"

.gitlab-ci/container/build-va-tools.sh

@@ -1,25 +1,18 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # shellcheck disable=SC2086 # we want word splitting
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# KERNEL_ROOTFS_TAG
 
-set -uex
+set -ex
 
 git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"
-
 git clone \
     https://github.com/intel/libva-utils.git \
-    -b 2.18.1 \
+    -b 2.13.0 \
     --depth 1 \
     /va-utils
 
 pushd /va-utils
-# Too old libva in Debian 11. TODO: when this PR gets in, refer to the patch.
-curl -L https://github.com/intel/libva-utils/pull/329.patch | git am
-
-meson setup build -D tests=true -Dprefix=/va ${EXTRA_MESON_ARGS:-}
-meson install -C build
+meson build -D tests=true  -Dprefix=/va $EXTRA_MESON_ARGS
+ninja -C build install
 popd
 rm -rf /va-utils

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

@@ -1,21 +1,18 @@
 #!/bin/bash
 
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_VK_TAG
-# KERNEL_ROOTFS_TAG
 set -ex
 
-VKD3D_PROTON_COMMIT="59d6d4b5ed23766e69fe252408a3401d2fd52ce8"
+VKD3D_PROTON_COMMIT="804751ee1cb108a2ec59e182ce0c052bafef268e"
 
 VKD3D_PROTON_DST_DIR="/vkd3d-proton-tests"
 VKD3D_PROTON_SRC_DIR="/vkd3d-proton-src"
-VKD3D_PROTON_BUILD_DIR="/vkd3d-proton-build"
+VKD3D_PROTON_BUILD_DIR="/vkd3d-proton-$VKD3D_PROTON_VERSION"
 
 function build_arch {
   local arch="$1"
+  shift
 
-  meson setup                              \
+  meson "$@"                               \
         -Denable_tests=true                \
         --buildtype release                \
         --prefix "$VKD3D_PROTON_DST_DIR"   \
@@ -36,11 +33,6 @@ git submodule update --init --recursive
 git submodule update --recursive
 build_arch 64
 build_arch 86
-mkdir "$VKD3D_PROTON_DST_DIR/tests"
-cp \
-  "tests/test-runner.sh" \
-  "tests/d3d12_tests.h" \
-  "$VKD3D_PROTON_DST_DIR/tests/"
 popd
 
 rm -rf "$VKD3D_PROTON_BUILD_DIR"

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

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_GL_TAG
-# KERNEL_ROOTFS_TAG
-
-set -uex
-
-VALIDATION_TAG="snapshot-2024wk39"
-
-git clone -b "$VALIDATION_TAG" --single-branch --depth 1 https://github.com/KhronosGroup/Vulkan-ValidationLayers.git
-pushd Vulkan-ValidationLayers
-python3 scripts/update_deps.py --dir external --config release --generator Ninja
-cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTS=OFF -DBUILD_WERROR=OFF -C external/helper.cmake -S . -B build
-ninja -C build
-cmake --install build --strip
-popd
-rm -rf Vulkan-ValidationLayers

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

@@ -1,32 +1,23 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # shellcheck disable=SC2086 # we want word splitting
 
-set -uex
+set -ex
 
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_BUILD_TAG
-# DEBIAN_TEST_ANDROID_TAG
-# DEBIAN_TEST_GL_TAG
-# DEBIAN_TEST_VK_TAG
-# FEDORA_X86_64_BUILD_TAG
-# KERNEL_ROOTFS_TAG
-
-export LIBWAYLAND_VERSION="1.21.0"
-export WAYLAND_PROTOCOLS_VERSION="1.38"
+export LIBWAYLAND_VERSION="1.18.0"
+export WAYLAND_PROTOCOLS_VERSION="1.24"
 
 git clone https://gitlab.freedesktop.org/wayland/wayland
 cd wayland
 git checkout "$LIBWAYLAND_VERSION"
-meson setup -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true _build ${EXTRA_MESON_ARGS:-}
-meson install -C _build
+meson -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true _build $EXTRA_MESON_ARGS
+ninja -C _build install
 cd ..
 rm -rf wayland
 
 git clone https://gitlab.freedesktop.org/wayland/wayland-protocols
 cd wayland-protocols
 git checkout "$WAYLAND_PROTOCOLS_VERSION"
-meson setup -Dtests=false _build ${EXTRA_MESON_ARGS:-}
-meson install -C _build
+meson _build $EXTRA_MESON_ARGS
+ninja -C _build install
 cd ..
 rm -rf wayland-protocols

.gitlab-ci/container/container_post_build.sh

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

.gitlab-ci/container/container_pre_build.sh

@@ -1,40 +1,33 @@
 #!/bin/sh
 
-if test -x /usr/bin/ccache; then
-    if test -f /etc/debian_version; then
-        CCACHE_PATH=/usr/lib/ccache
-    elif test -f /etc/alpine-release; then
-        CCACHE_PATH=/usr/lib/ccache/bin
-    else
-        CCACHE_PATH=/usr/lib64/ccache
-    fi
-
-    # Common setup among container builds before we get to building code.
-
-    export CCACHE_COMPILERCHECK=content
-    export CCACHE_COMPRESS=true
-    export CCACHE_DIR="/cache/$CI_PROJECT_NAME/ccache"
-    export PATH="$CCACHE_PATH:$PATH"
-
-    # CMake ignores $PATH, so we have to force CC/GCC to the ccache versions.
-    export CC="${CCACHE_PATH}/gcc"
-    export CXX="${CCACHE_PATH}/g++"
-
-    ccache --show-stats
+if test -f /etc/debian_version; then
+    CCACHE_PATH=/usr/lib/ccache
+elif test -f /etc/alpine-release; then
+    CCACHE_PATH=/usr/lib/ccache/bin
+else
+    CCACHE_PATH=/usr/lib64/ccache
 fi
 
+# Common setup among container builds before we get to building code.
+
+export CCACHE_COMPILERCHECK=content
+export CCACHE_COMPRESS=true
+export CCACHE_DIR=/cache/$CI_PROJECT_NAME/ccache
+export PATH=$CCACHE_PATH:$PATH
+
+# CMake ignores $PATH, so we have to force CC/GCC to the ccache versions.
+export CC="${CCACHE_PATH}/gcc"
+export CXX="${CCACHE_PATH}/g++"
+
 # When not using the mold linker (e.g. unsupported architecture), force
 # linkers to gold, since it's so much faster for building.  We can't use
-# lld because we're on old debian and it's buggy.  mingw fails meson builds
+# lld because we're on old debian and it's buggy.  ming fails meson builds
 # with it with "meson.build:21:0: ERROR: Unable to determine dynamic linker"
-if [ -e /usr/bin/ld.gold ]; then
-  find /usr/bin -name \*-ld -o -name ld | \
+find /usr/bin -name \*-ld -o -name ld | \
     grep -v mingw | \
     xargs -n 1 -I '{}' ln -sf '{}.gold' '{}'
-else
-  echo "ld.gold is missing, not replacing ld with it."
-  echo "Builds might be slower, consider installing gold."
-fi
+
+ccache --show-stats
 
 # Make a wrapper script for ninja to always include the -j flags
 {

.gitlab-ci/container/create-android-cross-file.sh

@@ -5,10 +5,9 @@ arch=$2
 cpu_family=$3
 cpu=$4
 cross_file="/cross_file-$arch.txt"
-sdk_version=$5
 
 # armv7 has the toolchain split between two names.
-arch2=${6:-$2}
+arch2=${5:-$2}
 
 # Note that we disable C++ exceptions, because Mesa doesn't use exceptions,
 # and allowing it in code generation means we get unwind symbols that break
@@ -16,22 +15,21 @@ arch2=${6:-$2}
 
 cat > "$cross_file" <<EOF
 [binaries]
-ar = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar'
-c = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}${sdk_version}-clang', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables']
-cpp = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}${sdk_version}-clang++', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-static-libstdc++']
+ar = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/$arch-ar'
+c = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}29-clang', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables']
+cpp = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}29-clang++', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables']
 c_ld = 'lld'
 cpp_ld = 'lld'
-strip = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip'
-pkg-config = ['/usr/bin/pkgconf']
+strip = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/$arch-strip'
+pkgconfig = ['/usr/bin/pkg-config']
 
 [host_machine]
-system = 'android'
+system = 'linux'
 cpu_family = '$cpu_family'
 cpu = '$cpu'
 endian = 'little'
 
 [properties]
 needs_exe_wrapper = true
-pkg_config_libdir = '/usr/local/lib/${arch2}/pkgconfig/:/${ndk}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/${arch2}/pkgconfig/'
 
 EOF

.gitlab-ci/container/create-android-ndk-pc.sh

@@ -10,7 +10,6 @@ pc="$2"
 cflags="$3"
 libs="$4"
 version="$5"
-sdk_version="$6"
 
 sysroot=$ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot
 
@@ -25,7 +24,7 @@ for arch in \
     cat >$pcdir/$pc <<EOF
 prefix=$sysroot
 exec_prefix=$sysroot
-libdir=$sysroot/usr/lib/$arch/$sdk_version
+libdir=$sysroot/usr/lib/$arch/29
 sharedlibdir=$sysroot/usr/lib/$arch
 includedir=$sysroot/usr/include
 
@@ -34,7 +33,7 @@ Description: zlib compression library
 Version: $version
 
 Requires:
-Libs: -L$sysroot/usr/lib/$arch/$sdk_version $libs
+Libs: -L$sysroot/usr/lib/$arch/29 $libs
 Cflags: -I$sysroot/usr/include $cflags
 EOF
 done

.gitlab-ci/container/create-cross-file.sh

@@ -47,8 +47,7 @@ if [[ -n "$GCC_ARCH" ]]; then
         echo "set(CMAKE_SYSTEM_PROCESSOR arm)";
         echo "set(CMAKE_C_COMPILER /usr/lib/ccache/$GCC_ARCH-gcc)";
         echo "set(CMAKE_CXX_COMPILER /usr/lib/ccache/$GCC_ARCH-g++)";
-        echo "set(CMAKE_CXX_FLAGS_INIT \"-Wno-psabi\")";  # makes ABI warnings quiet for ARMv7
-        echo "set(ENV{PKG_CONFIG} \"/usr/bin/$GCC_ARCH-pkgconf\")";
+        echo "set(ENV{PKG_CONFIG} \"/usr/bin/$GCC_ARCH-pkg-config\")";
         echo "set(DE_CPU $DE_CPU)";
     } > "$toolchain_file"
 fi