summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-03-03 13:03:00 +0100
committerHolger Levsen <holger@layer-acht.org>2016-03-03 13:03:00 +0100
commit0faf8ce6326a769371d5ddd588362055245c539b (patch)
tree93216ba79f5d62a195fcce10e3314000aade4357
parentdba4d7bce5bef29f50b640efcc9c34bac0d5e161 (diff)
downloadjenkins.debian.net-0faf8ce6326a769371d5ddd588362055245c539b.tar.xz
Remove all squeeze (oldoldstable) related jobs + logic
-rw-r--r--README2
-rw-r--r--TODO2
-rwxr-xr-xbin/chroot-installation.sh5
-rwxr-xr-xjob-cfg/chroot-installation.yaml.py14
4 files changed, 5 insertions, 18 deletions
diff --git a/README b/README
index 08de6b22..3f20e9d4 100644
--- a/README
+++ b/README
@@ -81,11 +81,9 @@ Installation tests inside chroot environments.
** make sure chroots have been cleaned up properly
** runs daily at 05:00 UTC and triggers the $distro specific bootstrap job on success
** wheezy is only triggered on the 4th day and 18th of each month (as it was released on the 4th)
-** squeeze only on the 25th of each month
* $distro-bootstrap jobs:
** just `debootstrap $distro` (install a base Debian distribution $distro)
** there is one job for *sid*, one for *wheezy* and one for *jessie*: 'chroot-installation_sid_bootstrap', 'chroot-installation_wheezy_bootstrap' and 'chroot-installation_jessie_bootstrap'
-* plus there is 'chroot-installation_squeeze_bootstrap_upgrade_to_wheezy', which bootstraps *squeeze* and upgrades that to *wheezy*
** on successful run of the bootstrap job, six $distro-install(+upgrade) jobs are triggered.
* $distro-install jobs (and $distro-install+upgrade jobs):
diff --git a/TODO b/TODO
index 936ab62e..12149cbd 100644
--- a/TODO
+++ b/TODO
@@ -491,7 +491,7 @@ The following ideas should really only be implemented for the new 'lvc*' tests..
=== Test them all
-* build packages from all team repos on alioth with jenkins-debian-glue on team request (eg, via a .txt file in a git.repo) for specific branches (which shall also be automated, eg. to be able to only have squeeze+sid branches build, but not all other branches.)
+* build packages from all team repos on alioth with jenkins-debian-glue on team request (eg, via a .txt file in a git.repo) for specific branches (which shall also be automated, eg. to be able to only have jessie+sid branches build, but not all other branches.)
== Debian Packaging related
diff --git a/bin/chroot-installation.sh b/bin/chroot-installation.sh
index 6c65bbe4..721405ee 100755
--- a/bin/chroot-installation.sh
+++ b/bin/chroot-installation.sh
@@ -204,9 +204,6 @@ upgrade2() {
trap cleanup_all INT TERM EXIT
case $1 in
- squeeze) DISTRO="squeeze"
- SPECIFIC="openoffice.org virtualbox-ose mplayer chromium-browser"
- ;;
wheezy) DISTRO="wheezy"
SPECIFIC="libreoffice virtualbox mplayer chromium"
;;
@@ -261,7 +258,7 @@ fi
if [ "$3" != "" ] ; then
case $3 in
- squeeze|wheezy|jessie|stretch|sid) upgrade2 $3;;
+ wheezy|jessie|stretch|sid) upgrade2 $3;;
*) echo "unsupported distro." ; exit 1 ;;
esac
fi
diff --git a/job-cfg/chroot-installation.yaml.py b/job-cfg/chroot-installation.yaml.py
index 46d80cd1..6a427c20 100755
--- a/job-cfg/chroot-installation.yaml.py
+++ b/job-cfg/chroot-installation.yaml.py
@@ -12,7 +12,6 @@ except ImportError:
base_distros = [
- 'squeeze',
'wheezy',
'jessie',
'stretch',
@@ -20,17 +19,13 @@ base_distros = [
]
distro_upgrades = {
- 'squeeze': 'wheezy',
'wheezy': 'jessie',
'jessie': 'stretch',
'stretch': 'sid',
}
-oldoldstable = 'squeeze'
-
# ftp.de.debian.org runs mirror updates at 03:25, 09:25, 15:25 and 21:25 UTC and usually they run 10m...
trigger_times = {
- 'squeeze': '30 16 25 * *',
'wheezy': '30 16 1,15 * *',
'jessie': '30 10 * * 1,4',
'stretch': '30 10 */2 * *',
@@ -85,9 +80,6 @@ all_targets = [
# not all packages are available in all distros
#
def is_target_in_distro(distro, target):
- # haskell, cinnamon, qt5 and edu tests not in squeeze
- if distro == 'squeeze' and ( target == 'haskell' or target[:10] == 'education-' or target == 'cinnamon' or target == 'qt5' ):
- return False
# qt5, education-desktop-mate and cinnamon weren't in wheezy
if distro == 'wheezy' and ( target == 'education-desktop-mate' or target == 'cinnamon' or target == 'qt5' ):
return False
@@ -120,7 +112,7 @@ def get_view(target, distro):
if target == 'haskell':
return 'haskell'
elif target[:10] == 'education-':
- if distro in ('squeeze', 'wheezy'):
+ if distro in ('wheezy'):
return 'edu_stable'
else:
return 'edu_devel'
@@ -163,7 +155,7 @@ jobspecs = [
'd_ext': '',
's_ext': '',
'dist_func': (lambda d: d),
- 'distfilter': (lambda d: tuple(set(d) - set([oldoldstable]))),
+ 'distfilter': (lambda d: tuple(set(d))),
'skiptaryet': (lambda t: False)
},
{ 'j_ext': '_upgrade_to_{dist2}',
@@ -177,7 +169,7 @@ jobspecs = [
'd_ext': ', then upgrade apt and dpkg to {dist2} and then everything else',
's_ext': ' {dist2}',
'dist_func': (lambda d: [{dist: {'dist2': distro_upgrades[dist]}} for dist in d]),
- 'distfilter': (lambda d: tuple((set(d) & set(distro_upgrades)) - set([oldoldstable]))),
+ 'distfilter': (lambda d: tuple((set(d) & set(distro_upgrades)))),
'skiptaryet': (lambda t: t[:10] == 'education-')
},
]