diff options
| author | Holger Levsen <holger@layer-acht.org> | 2017-04-07 17:28:31 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2017-04-07 17:28:31 +0200 |
| commit | 4d89c35fd35e7822e0e3f0063c5d699aa36c2368 (patch) | |
| tree | 902ebec3ab6950b4c49a5c0f7401ddc491845100 | |
| parent | cf06b9b5c219007a254bb56835f188f2556f2bf6 (diff) | |
| download | jenkins.debian.net-4d89c35fd35e7822e0e3f0063c5d699aa36c2368.tar.xz | |
chroot-installation: also test eductation-lang-* metapackages
Signed-off-by: Holger Levsen <holger@layer-acht.org>
| -rwxr-xr-x | bin/chroot-installation.sh | 4 | ||||
| -rwxr-xr-x | job-cfg/chroot-installation.yaml.py | 13 |
2 files changed, 17 insertions, 0 deletions
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 # |