From 6449ee9daec4d8a6c659716234783db83b88d0d3 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Wed, 24 Jul 2024 19:35:20 +0300 Subject: [PATCH] gitlab-ci: Use virtme-ng for running our tests virtme-ng is the an update version of virtme, and this patch uses that instead of the one we had partially modified. Besides that this partially reverts ad039cdfd2b47, 'backend-drm: Enable atomic async flip support' and makes our CI happier. Specifically ad039cdfd2b47 updated our kernel version from 6.3 to 6.9 but did not do a FDO bum,p and with that, no container images were rebuilt. Effectively we were still using 6.3. Now, with the FDO bump, in this patch, we noticed that the drm-writeback test is failing with linux kernel version 6.9. So far, only 6.3 and 6.4 kernel versions seems to be working, that is, without that drm writeback test timing out. The safest bet for the time being, would be to keep our CI just use 6.3 kernel, until we have proper version to update to. Signed-off-by: Daniel Stone Signed-off-by: Marius Vlad --- .gitlab-ci.yml | 4 ++-- .gitlab-ci/build-deps.sh | 6 +++--- .gitlab-ci/debian-install.sh | 4 ++++ .gitlab-ci/virtme-scripts/run-weston-tests.sh | 4 ---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bde13711..259900ca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ variables: FDO_UPSTREAM_REPO: wayland/weston FDO_REPO_SUFFIX: "$BUILD_OS-$FDO_DISTRIBUTION_VERSION/$BUILD_ARCH" - FDO_DISTRIBUTION_TAG: '2024-02-14-00-lcms2' + FDO_DISTRIBUTION_TAG: '2024-07-24-00-virtme-ng' include: @@ -280,7 +280,7 @@ aarch64-debian-container_prep: - ninja -k0 -j${FDO_CI_CONCURRENT:-4} - ninja install - test -n "${QEMU_SMP}" || QEMU_SMP=${FDO_CI_CONCURRENT:-4} - - virtme-run --rw --pwd --kimg /weston-virtme/${KERNEL_IMAGE} --kopt quiet --kopt log_buf_len=2M --script-dir ../.gitlab-ci/virtme-scripts --qemu-opts -m 4096 -smp ${QEMU_SMP} + - virtme-run --rw --pwd --kimg /weston-virtme/${KERNEL_IMAGE} --kopt quiet --kopt log_buf_len=2M --script-sh ../.gitlab-ci/virtme-scripts/run-weston-tests.sh --qemu-opts -m 4096 -smp ${QEMU_SMP} - TEST_RES=$(cat $TESTS_RES_PATH) - rm $TESTS_RES_PATH - cp -R /weston-virtme ./ diff --git a/.gitlab-ci/build-deps.sh b/.gitlab-ci/build-deps.sh index b4af6fe2..21d8d592 100755 --- a/.gitlab-ci/build-deps.sh +++ b/.gitlab-ci/build-deps.sh @@ -64,7 +64,8 @@ pip3 install $PIP_ARGS sphinx_rtd_theme==1.0.0 # The fork pulls in this support from the original GitHub PR, rebased on top of # a newer upstream version which fixes AArch64 support. if [[ -n "$KERNEL_DEFCONFIG" ]]; then - git clone --depth=1 --branch=v6.9 https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git linux + # 6.3 is (still) used as >= 6.5 drm-writeback test will timeout + git clone --depth=1 --branch=v6.3 https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git linux cd linux if [[ "${BUILD_ARCH}" = "x86-64" ]]; then @@ -102,9 +103,8 @@ if [[ -n "$KERNEL_DEFCONFIG" ]]; then mv linux/.config /weston-virtme/.config rm -rf linux - git clone https://github.com/fooishbar/virtme + git clone --depth=1 --branch=v1.25 --recurse-submodules https://github.com/arighi/virtme-ng.git virtme cd virtme - git checkout -b snapshot 036fc0c8b3ee0881a035abc47ab4f152546a4408 ./setup.py install cd .. fi diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 6f2fffdc..6999097b 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -115,6 +115,10 @@ apt-get -y --no-install-recommends install \ sysvinit-core \ x11proto-dev \ xwayland \ + python3-argcomplete \ + flake8 pylint \ + cargo rustc \ + iproute2 udev \ $MESA_DEV_PKGS \ $MESA_RUNTIME_PKGS \ $LINUX_DEV_PKGS \ diff --git a/.gitlab-ci/virtme-scripts/run-weston-tests.sh b/.gitlab-ci/virtme-scripts/run-weston-tests.sh index 33a936b1..98ba5779 100755 --- a/.gitlab-ci/virtme-scripts/run-weston-tests.sh +++ b/.gitlab-ci/virtme-scripts/run-weston-tests.sh @@ -47,7 +47,3 @@ echo 0x00 > /sys/module/drm/parameters/debug # - 1 means the tests failed, so the job itself should fail TESTS_RES_PATH=$(pwd)/tests-res.txt echo $TEST_RES > $TESTS_RES_PATH - -# shutdown virtme -sync -poweroff -f