Module: Mesa Branch: main Commit: f7d05865240f622d7d5d394a1bb62cb09c2d3f9b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7d05865240f622d7d5d394a1bb62cb09c2d3f9b
Author: Sergi Blanch Torne <[email protected]> Date: Mon Jul 17 08:54:58 2023 +0200 Integrate ci-kdl in the building process and launch process. Modify the build process for the images to include the build to have ci-kdl available in the Mesa jobs. Modify also the init-stage2 to launch in the background the process that will collect data and store a json file with the relative changes on the recorded data. Signed-off-by: Sergi Blanch Torne <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24177> --- .gitlab-ci/bare-metal/rootfs-setup.sh | 1 + .gitlab-ci/common/init-stage2.sh | 9 +++++++++ .gitlab-ci/container/lava_build.sh | 7 +++++++ .gitlab-ci/image-tags.yml | 2 +- .gitlab-ci/lava/lava-submit.sh | 1 + 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/bare-metal/rootfs-setup.sh b/.gitlab-ci/bare-metal/rootfs-setup.sh index 31862d5f732..6d33dd0a249 100644 --- a/.gitlab-ci/bare-metal/rootfs-setup.sh +++ b/.gitlab-ci/bare-metal/rootfs-setup.sh @@ -19,6 +19,7 @@ date +'%F %T' cp $CI_COMMON/capture-devcoredump.sh $rootfs_dst/ cp $CI_COMMON/intel-gpu-freq.sh $rootfs_dst/ +cp $CI_COMMON/kdl.sh $rootfs_dst/ cp "$SCRIPTS_DIR/setup-test-env.sh" "$rootfs_dst/" set +x diff --git a/.gitlab-ci/common/init-stage2.sh b/.gitlab-ci/common/init-stage2.sh index c36eaa3a1bd..bc7717322f0 100755 --- a/.gitlab-ci/common/init-stage2.sh +++ b/.gitlab-ci/common/init-stage2.sh @@ -127,6 +127,15 @@ if [ "$HWCI_FREQ_MAX" = "true" ]; then /intel-gpu-freq.sh -s 70% --cpu-set-max 65% -g all -d fi +# Start a little daemon to capture sysfs records and produce a JSON file +if [ -x /kdl.sh ]; then + echo "launch kdl.sh!" + /kdl.sh & + BACKGROUND_PIDS="$! $BACKGROUND_PIDS" +else + echo "kdl.sh not found!" +fi + # Increase freedreno hangcheck timer because it's right at the edge of the # spilling tests timing out (and some traces, too) if [ -n "$FREEDRENO_HANGCHECK_MS" ]; then diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index 0ae9d455506..94e22b69fa9 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -130,6 +130,7 @@ apt-get install -y --no-remove \ python3-mako \ python3-numpy \ python3-serial \ + python3-venv \ unzip \ zstd @@ -291,6 +292,12 @@ if [[ ${DEBIAN_ARCH} = "amd64" ]]; then mv /usr/local/libexec/virgl* $ROOTFS/usr/local/libexec/ fi +############### Build ci-kdl +section_start kdl "Prepare a venv for kdl" +. .gitlab-ci/container/build-kdl.sh +mv ci-kdl.venv $ROOTFS +section_end kdl + ############### Build local stuff for use by igt and kernel testing, which ############### will reuse most of our container build process from a specific ############### hash of the Mesa tree. diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 08b13ed183d..4d459f5cac9 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -21,7 +21,7 @@ variables: ALPINE_X86_64_BUILD_TAG: "2023-05-01-3.18-bump-1" ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version" FEDORA_X86_64_BUILD_TAG: "2023-05-05-ccache-on" - KERNEL_ROOTFS_TAG: "2023-07-18-vvl" + KERNEL_ROOTFS_TAG: "2023-07-19-kdl-5056f71b" KERNEL_TAG: "v6.3.13-for-mesa-ci-bbe75e512c76" WINDOWS_X64_VS_PATH: "windows/x64_vs" diff --git a/.gitlab-ci/lava/lava-submit.sh b/.gitlab-ci/lava/lava-submit.sh index e1269d5c6d6..e02bcb24cba 100755 --- a/.gitlab-ci/lava/lava-submit.sh +++ b/.gitlab-ci/lava/lava-submit.sh @@ -21,6 +21,7 @@ mkdir -p results/job-rootfs-overlay/ cp artifacts/ci-common/capture-devcoredump.sh results/job-rootfs-overlay/ cp artifacts/ci-common/init-*.sh results/job-rootfs-overlay/ cp artifacts/ci-common/intel-gpu-freq.sh results/job-rootfs-overlay/ +cp artifacts/ci-common/kdl.sh results/job-rootfs-overlay/ cp "$SCRIPTS_DIR"/setup-test-env.sh results/job-rootfs-overlay/ # Prepare env vars for upload.
