PROVISORY: ci: testbed: install minidlna and avahi packages at runtime
Currently the gmap upnp and dnssd cram tests (066-gmap-mod-upnp.t,
068-gmap-mod-dnssd.t) each duplicate apt source fixing and package
installation inline, which is fragile, slow and inconsistent with
the established pattern of pre-installing test dependencies.
So lets fix this by moving the runtime apt package installation
(minidlna, avahi-daemon, avahi-utils, dbus) into the testbed
before_script, following the pattern from commit d247c51ed663
("ci: cram: remove runtime pip install calls from tests").
The proper fix is to pre-install these packages in the testbed
Docker image, which is blocked on the container pipeline rebuild.
References: PPW-1258
Signed-off-by: Petr Štetiar <petr.stetiar@prplfoundation.org>
This commit is contained in:
parent
1544ea8630
commit
6792ba6b95
@ -56,6 +56,10 @@
|
||||
- sudo ip link set $TESTBED_WAN_INTERFACE up 2> /dev/null
|
||||
- sleep 10
|
||||
|
||||
- sudo sed -i 's|http://deb.debian.org/debian|http://archive.debian.org/debian|g' /etc/apt/sources.list 2>/dev/null
|
||||
- sudo sed -i 's|http://deb.debian.org/debian-security|http://archive.debian.org/debian-security|g' /etc/apt/sources.list 2>/dev/null
|
||||
- sudo apt-get update && sudo apt-get install --yes --no-install-recommends minidlna avahi-daemon avahi-utils dbus
|
||||
|
||||
- mkdir -p ~/.ssh; chmod 700 ~/.ssh
|
||||
- >
|
||||
if echo "$CI_RUNNER_DESCRIPTION" | grep -q testbed-01; then
|
||||
|
||||
@ -2,12 +2,6 @@ Create R alias:
|
||||
|
||||
$ alias R="${CRAM_REMOTE_COMMAND:-}"
|
||||
|
||||
Install minidlna if not already present:
|
||||
|
||||
$ sudo sed -i 's|http://deb.debian.org/debian|http://archive.debian.org/debian|g' /etc/apt/sources.list 2>/dev/null
|
||||
$ sudo sed -i 's|http://deb.debian.org/debian-security|http://archive.debian.org/debian-security|g' /etc/apt/sources.list 2>/dev/null
|
||||
$ which minidlnad >/dev/null 2>&1 || (sudo apt-get update >/dev/null 2>&1 && sudo apt-get install -y minidlna >/dev/null 2>&1)
|
||||
|
||||
Test 1: Service Advertisement (start minidlna):
|
||||
|
||||
Create minidlna configuration:
|
||||
|
||||
@ -1,12 +1,6 @@
|
||||
Create R alias:
|
||||
$ alias R="${CRAM_REMOTE_COMMAND:-}"
|
||||
|
||||
Install avahi if not already present:
|
||||
|
||||
$ sudo sed -i 's|http://deb.debian.org/debian|http://archive.debian.org/debian|g' /etc/apt/sources.list 2>/dev/null
|
||||
$ sudo sed -i 's|http://deb.debian.org/debian-security|http://archive.debian.org/debian-security|g' /etc/apt/sources.list 2>/dev/null
|
||||
$ which avahi-daemon >/dev/null 2>&1 || (sudo apt-get update >/dev/null 2>&1 && sudo apt-get install -y avahi-daemon avahi-utils dbus >/dev/null 2>&1)
|
||||
|
||||
Ensure avahi-daemon is running:
|
||||
|
||||
$ sudo service dbus start 2>&1 | grep -v "unable to resolve host" | tee /dev/stderr | grep -q "Starting system message bus: dbus." && echo "dbus started OK" || echo "dbus may have failed to start"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user