Module: Mesa Branch: main Commit: 4bfcbe3f69eef0702d6494af513d902ad932496d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4bfcbe3f69eef0702d6494af513d902ad932496d
Author: Tomeu Vizoso <[email protected]> Date: Wed Nov 17 08:33:46 2021 +0100 ci: Remove syslogd Crosvm doesn't need it any more. Signed-off-by: Tomeu Vizoso <[email protected]> Reviewed-by: Corentin Noël <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12828> --- .gitlab-ci.yml | 2 +- .gitlab-ci/container/debian/x86_test-gl.sh | 1 - .gitlab-ci/crosvm-runner.sh | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77553c3e014..6c6a04cf1fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -410,7 +410,7 @@ debian/x86_test-gl: variables: FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh' KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.15-for-mesa-ci-540a4af22d71/linux-v5.15-for-mesa-ci-540a4af22d71.tar.bz2"; - MESA_IMAGE_TAG: &debian-x86_test-gl "2021-11-02-deqp" + MESA_IMAGE_TAG: &debian-x86_test-gl "2021-11-17-syslogd-removal" # Debian 11 based x86 test image for VK debian/x86_test-vk: diff --git a/.gitlab-ci/container/debian/x86_test-gl.sh b/.gitlab-ci/container/debian/x86_test-gl.sh index ce9bec8b91a..9dff100318f 100644 --- a/.gitlab-ci/container/debian/x86_test-gl.sh +++ b/.gitlab-ci/container/debian/x86_test-gl.sh @@ -53,7 +53,6 @@ STABLE_EPHEMERAL=" \ apt-get install -y --no-remove \ $STABLE_EPHEMERAL \ clinfo \ - inetutils-syslogd \ iptables \ libclang-common-11-dev \ libclang-cpp11 \ diff --git a/.gitlab-ci/crosvm-runner.sh b/.gitlab-ci/crosvm-runner.sh index b3ddfcf161e..8f767078227 100755 --- a/.gitlab-ci/crosvm-runner.sh +++ b/.gitlab-ci/crosvm-runner.sh @@ -27,9 +27,6 @@ unset XDG_RUNTIME_DIR /usr/sbin/iptables-legacy -t nat -A POSTROUTING -o eth0 -j MASQUERADE echo 1 > /proc/sys/net/ipv4/ip_forward -# Crosvm wants this -syslogd > /dev/null - # We aren't testing LLVMPipe here, so we don't need to validate NIR on the host export NIR_VALIDATE=0
