mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-07 09:38:06 +02:00
tests: don't install unnecessary package in gitlab-ci tests
REQUIRED_PACKAGES has two uses:
- to setup a system for developing NetworkManager. This installs
convenience packages like "cscope".
- to install the packages required for unit testing in gitlab-ci.
For gitlab-ci we should only install the packages that we actually
need.
(cherry picked from commit 1a2a5b37b4)
This commit is contained in:
parent
888718d6f4
commit
6ff16a48bb
2 changed files with 14 additions and 4 deletions
|
|
@ -16,7 +16,7 @@ stages:
|
||||||
|
|
||||||
- date '+%Y%m%d-%H%M%S'; ! grep -q '^NAME=.*\(CentOS\)' /etc/os-release || (yum install -y glibc-common && localedef -c -i pl_PL -f UTF-8 pl_PL.UTF-8 && locale -a)
|
- date '+%Y%m%d-%H%M%S'; ! grep -q '^NAME=.*\(CentOS\)' /etc/os-release || (yum install -y glibc-common && localedef -c -i pl_PL -f UTF-8 pl_PL.UTF-8 && locale -a)
|
||||||
|
|
||||||
- date '+%Y%m%d-%H%M%S'; NM_INSTALL="yum install -y" ./contrib/fedora/REQUIRED_PACKAGES
|
- date '+%Y%m%d-%H%M%S'; NM_NO_EXTRA=1 NM_INSTALL="yum install -y" ./contrib/fedora/REQUIRED_PACKAGES
|
||||||
- date '+%Y%m%d-%H%M%S'; yum install -y glibc-langpack-pl ccache clang which
|
- date '+%Y%m%d-%H%M%S'; yum install -y glibc-langpack-pl ccache clang which
|
||||||
|
|
||||||
# containers have "tsflags=nodocs" in /etc/dnf/dnf.conf. We need /usr/shared/gtk-doc/html
|
# containers have "tsflags=nodocs" in /etc/dnf/dnf.conf. We need /usr/shared/gtk-doc/html
|
||||||
|
|
|
||||||
|
|
@ -28,14 +28,23 @@ install_ignore_missing() {
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if test "$NM_NO_EXTRA" != 1; then
|
||||||
|
# these packages are convenient for developing, but not necessary
|
||||||
|
# for CI testing.
|
||||||
|
EXTRA_PACKAGES=(
|
||||||
|
bash-completion \
|
||||||
|
cscope \
|
||||||
|
)
|
||||||
|
else
|
||||||
|
EXTRA_PACKAGES=()
|
||||||
|
fi
|
||||||
|
|
||||||
install \
|
install \
|
||||||
ModemManager-devel \
|
ModemManager-devel \
|
||||||
ModemManager-glib-devel \
|
ModemManager-glib-devel \
|
||||||
audit-libs-devel \
|
audit-libs-devel \
|
||||||
bash-completion \
|
|
||||||
bluez-libs-devel \
|
bluez-libs-devel \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
cscope \
|
|
||||||
dbus-devel \
|
dbus-devel \
|
||||||
dbus-python \
|
dbus-python \
|
||||||
dbus-x11 \
|
dbus-x11 \
|
||||||
|
|
@ -58,6 +67,7 @@ install \
|
||||||
libuuid-devel \
|
libuuid-devel \
|
||||||
make \
|
make \
|
||||||
meson \
|
meson \
|
||||||
|
mobile-broadband-provider-info-devel \
|
||||||
newt-devel \
|
newt-devel \
|
||||||
nss-devel \
|
nss-devel \
|
||||||
polkit-devel \
|
polkit-devel \
|
||||||
|
|
@ -75,7 +85,7 @@ install \
|
||||||
vala-tools \
|
vala-tools \
|
||||||
valgrind \
|
valgrind \
|
||||||
wireless-tools-devel \
|
wireless-tools-devel \
|
||||||
#end
|
"${EXTRA_PACKAGES[@]}"
|
||||||
|
|
||||||
# some packages don't exist in certain distributions. Install them one-by-one, and ignore errors.
|
# some packages don't exist in certain distributions. Install them one-by-one, and ignore errors.
|
||||||
install_ignore_missing \
|
install_ignore_missing \
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue