ci: do not install i386 sub-architecture in VK images

Not required by apitrace.

debian/x86_test-vk image size:
previous: 1.8G
after:    1.0G

v2: added back winehq-stable (missing symlinks)

Acked-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17834>

diff --git a/.gitlab-ci/container/debian/x86_test-vk.sh b/.gitlab-ci/container/debian/x86_test-vk.sh
index e092b1f..6efacfa 100644 (file)
--- a/.gitlab-ci/container/debian/x86_test-vk.sh
+++ b/.gitlab-ci/container/debian/x86_test-vk.sh
@@ -60,9 +60,6 @@ apt-get install -y --no-remove \
       xserver-xorg-video-amdgpu \
       xserver-xorg-video-ati
 
-# We need multiarch for Wine
-dpkg --add-architecture i386
-
 # Install a more recent version of Wine than exists in Debian.
 apt-key add .gitlab-ci/container/debian/winehq.gpg.key
 apt-add-repository https://dl.winehq.org/wine-builds/debian/
@@ -72,7 +69,16 @@ apt-get update -q
 # hardware on the test devices.
 pip3 install gfxinfo-mupuf==0.0.9
 
-apt-get install -y --no-remove --install-recommends winehq-stable
+# workaround wine needing 32-bit
+# https://bugs.winehq.org/show_bug.cgi?id=53393
+apt-get install -y --no-remove wine-stable-amd64  # a requirement for wine-stable
+WINE_PKG="wine-stable"
+WINE_PKG_DROP="wine-stable-i386"
+apt-get download "${WINE_PKG}"
+dpkg --ignore-depends="${WINE_PKG_DROP}" -i "${WINE_PKG}"*.deb
+rm "${WINE_PKG}"*.deb
+sed -i "/${WINE_PKG_DROP}/d" /var/lib/dpkg/status
+apt-get install -y --no-remove winehq-stable  # symlinks-only, depends on wine-stable
 
 ############### Install DXVK
 
@@ -83,7 +89,7 @@ apt-get install -y --no-remove --install-recommends winehq-stable
 
 . .gitlab-ci/container/install-wine-apitrace.sh
 # Add the apitrace path to the registry
-wine \
+wine64 \
     reg add "HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment" \
     /v Path \
     /t REG_EXPAND_SZ \

diff --git a/.gitlab-ci/container/setup-wine.sh b/.gitlab-ci/container/setup-wine.sh
index d476f06..74fc107 100755 (executable)
--- a/.gitlab-ci/container/setup-wine.sh
+++ b/.gitlab-ci/container/setup-wine.sh
@@ -13,7 +13,7 @@ Windows Registry Editor Version 5.00
 EOF
 
 # Set the wine prefix and disable the crash dialog
-wine regedit crashdialog.reg
+wine64 regedit crashdialog.reg
 rm crashdialog.reg
 
 # An immediate wine command may fail with: "${WINEPREFIX}: Not a

diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 673c384..e3c2660 100644 (file)
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -12,7 +12,7 @@ variables:
 
    DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl"
    DEBIAN_X86_TEST_GL_TAG: "2022-08-04-deqp-runner"
-   DEBIAN_X86_TEST_VK_TAG: "2022-08-04-deqp-runner"
+   DEBIAN_X86_TEST_VK_TAG: "2022-08-15-drop-wine-i386"
 
    FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5"
    KERNEL_ROOTFS_TAG: "2022-08-08-skqp"

diff --git a/.gitlab-ci/valve/traces-runner.sh b/.gitlab-ci/valve/traces-runner.sh
index 267e30a..a21d499 100755 (executable)
--- a/.gitlab-ci/valve/traces-runner.sh
+++ b/.gitlab-ci/valve/traces-runner.sh
@@ -48,7 +48,7 @@ sleep 1
 # when asked to load PE executables.
 # TODO: Have boot2container mount this filesystem for all jobs?
 mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
-echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register
+echo ':DOSWin:M::MZ::/usr/bin/wine64:' > /proc/sys/fs/binfmt_misc/register
 
 # Set environment for DXVK.
 export DXVK_LOG_LEVEL="info"
@@ -68,7 +68,7 @@ if [ ${TEST_START_XORG:-0} -eq 1 ]; then
     export DISPLAY=:0
 fi
 
-wine --version
+wine64 --version
 
 SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD | tee /tmp/version.txt | grep \"Mesa $MESA_VERSION\(\s\|$\)\""