From 4d89c35fd35e7822e0e3f0063c5d699aa36c2368 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 7 Apr 2017 17:28:31 +0200 Subject: chroot-installation: also test eductation-lang-* metapackages Signed-off-by: Holger Levsen --- bin/chroot-installation.sh | 4 ++++ job-cfg/chroot-installation.yaml.py | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/bin/chroot-installation.sh b/bin/chroot-installation.sh index f9bb3af0..da4622f5 100755 --- a/bin/chroot-installation.sh +++ b/bin/chroot-installation.sh @@ -264,6 +264,10 @@ if [ "$2" != "" ] ; then ;; esac ;; + education-lang-se) install_packages "Debian Edu task" $2 + ;; + education-lang-*) install_packages "Debian Edu task" $2 $2-desktop $-desktop-kde + ;; education*) install_packages "Debian Edu task" $2 ;; *) echo "unsupported component." diff --git a/job-cfg/chroot-installation.yaml.py b/job-cfg/chroot-installation.yaml.py index 45b4b761..cb6934d9 100755 --- a/job-cfg/chroot-installation.yaml.py +++ b/job-cfg/chroot-installation.yaml.py @@ -62,6 +62,16 @@ all_targets = [ 'education-geography', 'education-graphics', 'education-language', + 'education-lang-da', + 'education-lang-de', + 'education-lang-es', + 'education-lang-fr', + 'education-lang-he', + 'education-lang-it', + 'education-lang-ja', + 'education-lang-no', + 'education-lang-se', + 'education-lang-zh-tw', 'education-laptop', 'education-logic-games', 'education-ltsp-server', @@ -95,6 +105,9 @@ def is_target_in_distro(distro, target): # education-thin-client-server is obsolete since stretch… elif distro in ('sid', 'buster') and target == 'education-thin-client-server': return False + # education-lang-* packages only exist since stretch + elif distro in ('wheezy', 'jessie') and target[:15] == 'education-lang-': + return False return True # -- cgit v1.2.3-70-g09d2