[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] chroot-install: drop education-lang tests for releases != stretch

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
217184cb by Holger Levsen at 2019-01-12T16:21:08Z
chroot-install: drop education-lang tests for releases != stretch

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


2 changed files:

- bin/chroot-installation.sh
- job-cfg/chroot-installation.yaml.py


Changes:

=====================================
bin/chroot-installation.sh
=====================================
@@ -1,7 +1,7 @@
 #!/bin/bash
 # vim: set noexpandtab:
 
-# Copyright 2012-2018 Holger Levsen <holger at layer-acht.org>
+# Copyright 2012-2019 Holger Levsen <holger at layer-acht.org>
 #           2018      Mattia Rizzolo <mattia at debian.org>
 # released under the GPLv=2
 
@@ -273,9 +273,9 @@ if [ "$2" != "" ] ; then
 					;;
 				esac
 				;;
-		education-lang-da|education-lang-he|education-lang-ja|education-lang-no|education-lang-zh-tw)	install_packages "Debian Edu task" $2 $2-desktop
+		education-lang-da|education-lang-he|education-lang-ja|education-lang-no|education-lang-zh-tw)	install_packages "Debian Edu task" $2 $2-desktop	# only in stretch, removed for buster
 				;;
-		education-lang-*)	install_packages "Debian Edu task" $2
+		education-lang-*)	install_packages "Debian Edu task" $2	# only in stretch, removed for buster
 				;;
 		education*)	install_packages "Debian Edu task" $2
 				;;


=====================================
job-cfg/chroot-installation.yaml.py
=====================================
@@ -115,8 +115,11 @@ def is_target_in_distro(distro, target):
          # lxqt is only available since stretch
          elif distro in ('jessie') and target == 'lxqt':
              return False
-         # education-lang-*, parl-desktop* and design-desktop* packages only exist since stretch
-         elif distro in ('jessie') and (target[:15] == 'education-lang-' or target[:12] == 'parl-desktop' or target[:14] == 'design-desktop'):
+         # education-lang-* packages only exist in stretch
+         elif distro not in ('stretch') and target[:15] == 'education-lang-':
+             return False
+         # parl-desktop* and design-desktop* packages only exist since stretch
+         elif distro in ('jessie') and (target[:12] == 'parl-desktop' or target[:14] == 'design-desktop'):
              return False
          # education-desktop-lxqt, education-primaryschool and education-video packages only exist since buster
          elif distro in ('jessie', 'stretch') and target in ('education-desktop-lxqt', 'education-primaryschool', 'education-video'):



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/217184cb4ea1b9c080834e860847390771b0f538

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/217184cb4ea1b9c080834e860847390771b0f538
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20190112/ce32a5da/attachment-0001.html>