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 <sergi.blanch.torne@collabora.com> Reviewed-by: Eric Engestrom <eric@engestrom.ch> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24177>
This commit is contained in:

committed by
Marge Bot

parent
8a1c95caab
commit
f7d0586524
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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.
|
||||
|
@@ -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"
|
||||
|
@@ -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.
|
||||
|
Reference in New Issue
Block a user