Skip to content
Snippets Groups Projects
Commit e32742ef authored by Ludovico de Nittis's avatar Ludovico de Nittis
Browse files

Fix and enable Archlinux CI test job

parent 6972a322
No related branches found
No related tags found
No related merge requests found
...@@ -293,18 +293,23 @@ test:focal: ...@@ -293,18 +293,23 @@ test:focal:
test:archlinux: test:archlinux:
extends: .test_template extends: .test_template
image: archlinux:latest 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 # Do not use the global before_script because it is only for Debian based
# distros # distros
before_script: before_script:
- | - |
set -eux set -eux
# Enable multilib repository
echo -e "\n[multilib]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf
pacman -Syu --needed --noconfirm --noprogressbar \ pacman -Syu --needed --noconfirm --noprogressbar \
base-devel \ base-devel \
git \ git \
lib32-glibc \
lib32-mesa \
python \ python \
python-chardet \
python-six \
python-tappy \ python-tappy \
sudo \ sudo \
${NULL+} ${NULL+}
......
...@@ -922,12 +922,14 @@ class TestContainers(BaseTest): ...@@ -922,12 +922,14 @@ class TestContainers(BaseTest):
if os.path.isfile('/usr/bin/locale'): if os.path.isfile('/usr/bin/locale'):
link = os.path.join(tree, 'usr', 'bin', 'locale') link = os.path.join(tree, 'usr', 'bin', 'locale')
target = os.readlink(link) 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'): if os.path.isfile('/usr/bin/localedef'):
link = os.path.join(tree, 'usr', 'bin', 'localedef') link = os.path.join(tree, 'usr', 'bin', 'localedef')
target = os.readlink(link) 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 ( for ldso, scout_impl in (
( (
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment