From e32742ef3cf2f7c925a550ace074b0aaf6167757 Mon Sep 17 00:00:00 2001 From: Ludovico de Nittis <ludovico.denittis@collabora.com> Date: Wed, 9 Sep 2020 11:20:31 +0200 Subject: [PATCH] Fix and enable Archlinux CI test job Signed-off-by: Ludovico de Nittis <ludovico.denittis@collabora.com> --- debian/gitlab-ci.yml | 9 +++++++-- tests/containers.py | 6 ++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml index 53c55d0e1..700e39002 100644 --- a/debian/gitlab-ci.yml +++ b/debian/gitlab-ci.yml @@ -293,18 +293,23 @@ test:focal: test:archlinux: extends: .test_template image: archlinux:latest - # TODO this test does not work yet - when: manual # Do not use the global before_script because it is only for Debian based # distros before_script: - | set -eux + # Enable multilib repository + echo -e "\n[multilib]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf + pacman -Syu --needed --noconfirm --noprogressbar \ base-devel \ git \ + lib32-glibc \ + lib32-mesa \ python \ + python-chardet \ + python-six \ python-tappy \ sudo \ ${NULL+} diff --git a/tests/containers.py b/tests/containers.py index e011a1d58..fc3c61b10 100755 --- a/tests/containers.py +++ b/tests/containers.py @@ -922,12 +922,14 @@ class TestContainers(BaseTest): if os.path.isfile('/usr/bin/locale'): link = os.path.join(tree, 'usr', 'bin', 'locale') target = os.readlink(link) - self.assertEqual(target, '/run/host/usr/bin/locale') + # Might be either /usr/bin/locale or /usr/sbin/locale + self.assertRegex(target, r'^/run/host/usr/') if os.path.isfile('/usr/bin/localedef'): link = os.path.join(tree, 'usr', 'bin', 'localedef') target = os.readlink(link) - self.assertEqual(target, '/run/host/usr/bin/localedef') + # Might be either /usr/bin/localedef or /usr/sbin/localedef + self.assertRegex(target, r'^/run/host/usr/') for ldso, scout_impl in ( ( -- GitLab