summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2017-09-09 13:27:05 +0200
committerHolger Levsen <holger@layer-acht.org>2017-09-09 13:27:05 +0200
commit0f3a5c04d4234ea736eda11e6792403419a29c17 (patch)
treec8162d48dd6e554ee2cad04a0bcb9088ebc4f93e
parent229889c7c91867fa1963cd4f530553126240d2c0 (diff)
downloadjenkins.debian.net-0f3a5c04d4234ea736eda11e6792403419a29c17.tar.xz
chroot-installs: add tests for lxqt
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rw-r--r--README2
-rwxr-xr-xbin/chroot-installation.sh4
-rwxr-xr-xjob-cfg/chroot-installation.yaml.py2
3 files changed, 6 insertions, 2 deletions
diff --git a/README b/README
index cab29c8a..3fe2455f 100644
--- a/README
+++ b/README
@@ -88,7 +88,7 @@ Installation tests inside chroot environments.
* $distro-install jobs (and $distro-install+upgrade jobs):
** `debootstrap $distro`, install a *$set_of_packages* (and upgrade to *$2nd_distro*)
-** these $set_of_packages exist: 'gnome', 'kde', 'kde-full', 'lxde', 'xfc', 'full_desktop' (all five desktops plus `vlc evince iceweasel chromium cups build-essential devscripts wine texlive-full asciidoc vim emacs` and (`libreoffice virt-manager mplayer` (stretch/sid) and 'develop'
+** these $set_of_packages exist: 'gnome', 'kde', 'kde-full', 'lxde', 'lxqt', 'xfc', 'full_desktop' (all six desktops plus `vlc evince iceweasel chromium cups build-essential devscripts wine texlive-full asciidoc vim emacs` and (`libreoffice virt-manager mplayer` (stretch/sid) and 'develop'
*** install is done with `apt-get install`, except for 'develop' where `apt-get build-dep` is used to install the build dependencies of these packages.
** Then there are also all the corresponding upgrade jobs, eg 'chroot-installation_wheezy_install_gnome_upgrade_to_jessie'
diff --git a/bin/chroot-installation.sh b/bin/chroot-installation.sh
index 4f0305b9..e2e467a0 100755
--- a/bin/chroot-installation.sh
+++ b/bin/chroot-installation.sh
@@ -217,7 +217,7 @@ esac
bootstrap $DISTRO
if [ "$2" != "" ] ; then
- FULL_DESKTOP="$SPECIFIC desktop-base gnome kde-plasma-desktop kde-full kde-standard xfce4 lxde vlc evince iceweasel cups build-essential devscripts wine texlive-full asciidoc vim emacs"
+ FULL_DESKTOP="$SPECIFIC desktop-base gnome kde-plasma-desktop kde-full kde-standard xfce4 lxde lxqt vlc evince iceweasel cups build-essential devscripts wine texlive-full asciidoc vim emacs"
case $2 in
none) ;;
gnome) install_packages gnome gnome desktop-base
@@ -232,6 +232,8 @@ if [ "$2" != "" ] ; then
;;
lxde) install_packages lxde lxde desktop-base
;;
+ lxqt) install_packages lxqt lxqt desktop-base
+ ;;
qt4) install_binary_packages qt4 qt4-x11 qtwebkit
;;
qt5) # qt5 is >=jessie…
diff --git a/job-cfg/chroot-installation.yaml.py b/job-cfg/chroot-installation.yaml.py
index 2616f750..35d3e295 100755
--- a/job-cfg/chroot-installation.yaml.py
+++ b/job-cfg/chroot-installation.yaml.py
@@ -38,6 +38,7 @@ all_targets = [
'kde-full',
'cinnamon',
'lxde',
+ 'lxqt',
'xfce',
'full_desktop',
'qt4',
@@ -161,6 +162,7 @@ spoken_names = {
'kde-full': 'complete KDE desktop',
'cinnamon': 'Cinnamon',
'lxde': 'LXDE',
+ 'lxqt': 'LXQT',
'xfce': 'Xfce',
'qt4': 'Qt4 cross-platform C++ application framework',
'qt5': 'Qt5 cross-platform C++ application framework',