Skip to content
Commits on Source (3)
Show whitespace changes
Inline Side-by-side
bin/chroot-installation.sh
View file @ 476c9031
......@@ -206,11 +206,6 @@ trap cleanup_all INT TERM EXIT
LXQT="lxqt"
case $1 in
jessie) DISTRO="jessie"
SPECIFIC="libreoffice virt-manager mplayer2 chromium"
LXQT="" # not present in jessie
FIREFOX="iceweasel"
;;
stretch) DISTRO="stretch"
SPECIFIC="libreoffice virt-manager mplayer chromium"
FIREFOX="iceweasel"
......@@ -249,14 +244,7 @@ if [ "$2" != "" ] ; then
;;
qt4) install_binary_packages qt4 qt4-x11 qtwebkit
;;
qt5) # qt5 is >=jessie…
if [ "$DISTRO" = "jessie" ] ; then
# only in jessie, removed for stretch
QT_EXTRA="qtquick1-opensource-src"
else
QT_EXTRA=""
fi
install_binary_packages qt5 qtbase-opensource-src qtchooser qtimageformats-opensource-src qtx11extras-opensource-src qtscript-opensource-src qtxmlpatterns-opensource-src qtdeclarative-opensource-src qtconnectivity-opensource-src qtsensors-opensource-src qtlocation-opensource-src qtwebkit-opensource-src qtwebkit-examples-opensource-src qttools-opensource-src qtdoc-opensource-src qtgraphicaleffects-opensource-src qtquickcontrols-opensource-src qtserialport-opensource-src qtsvg-opensource-src qtmultimedia-opensource-src qtenginio-opensource-src qtwebsockets-opensource-src qttranslations-opensource-src qtcreator $QT_EXTRA
qt5) install_binary_packages qt5 qtbase-opensource-src qtchooser qtimageformats-opensource-src qtx11extras-opensource-src qtscript-opensource-src qtxmlpatterns-opensource-src qtdeclarative-opensource-src qtconnectivity-opensource-src qtsensors-opensource-src qtlocation-opensource-src qtwebkit-opensource-src qtwebkit-examples-opensource-src qttools-opensource-src qtdoc-opensource-src qtgraphicaleffects-opensource-src qtquickcontrols-opensource-src qtserialport-opensource-src qtsvg-opensource-src qtmultimedia-opensource-src qtenginio-opensource-src qtwebsockets-opensource-src qttranslations-opensource-src qtcreator
;;
full_desktop) install_packages full_desktop $FULL_DESKTOP
;;
......@@ -264,16 +252,7 @@ if [ "$2" != "" ] ; then
;;
developer) install_build_depends developer $FULL_DESKTOP
;;
debconf-video) case $1 in
jessie) install_packages ack-grep htop iftop iotop moreutils tmux vnstat icecast2 mplayer vlc cu
;;
stretch) install_packages ack-grep htop iftop iotop moreutils tmux vnstat icecast2 mplayer vlc cu voctomix voctomix-outcasts
;;
sid) install_packages ack-grep htop iftop iotop moreutils tmux vnstat icecast2 mplayer vlc cu voctomix voctomix-outcasts # hdmi2usb-mode-switch hdmi2usb-udev
;;
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 # only in stretch, removed for buster
debconf-video) install_packages ack-grep htop iftop iotop moreutils tmux vnstat icecast2 mplayer vlc cu voctomix voctomix-outcasts hdmi2usb-mode-switch hdmi2usb-udev
;;
education-lang-*) install_packages "Debian Edu task" $2 # only in stretch, removed for buster
;;
......@@ -291,7 +270,7 @@ fi
if [ "$3" != "" ] ; then
case $3 in
jessie|stretch|buster|bullseye|sid) upgrade2 $3;;
stretch|buster|bullseye|sid) upgrade2 $3;;
*) echo "unsupported distro." ; exit 1 ;;
esac
fi
......
bin/common-functions.sh
View file @ 476c9031
......@@ -225,7 +225,7 @@ jenkins_zombie_check() {
# and we dont know why and when that happens,
# so just report those zombies here.
#
ZOMBIES=$(ls -1d /var/lib/jenkins/jobs/* | egrep 'strip-nondeterminism|reprotest|reproducible_(builder_(amd64|i386|armhf|arm64)|setup_(pbuilder|schroot)_testing)|chroot-installation_wheezy|aptdpkg|odc2a|stretch_install_education-thin-client-server|jessie_multiarch_versionskew|dpkg_stretch_find_trigger_cycles|sid_install_education-services|buster_install_education-services|lvc|chroot-installation_stretch_.*_upgrade_to_sid|piuparts_.*_jessie|udd_stretch|d-i_pu-build|debsums-tests_stretch|debian-archive-keyring-tests_stretch|chroot-installation_jessie' || true)
ZOMBIES=$(ls -1d /var/lib/jenkins/jobs/* | egrep 'strip-nondeterminism|reprotest|reproducible_(builder_(amd64|i386|armhf|arm64)|setup_(pbuilder|schroot)_testing)|chroot-installation_wheezy|aptdpkg|odc2a|stretch_install_education-thin-client-server|jessie_multiarch_versionskew|dpkg_stretch_find_trigger_cycles|sid_install_education-services|buster_install_education-services|lvc|chroot-installation_stretch_.*_upgrade_to_sid|piuparts_.*_jessie|udd_stretch|d-i_pu-build|debsums-tests_stretch|debian-archive-keyring-tests_stretch|chroot-installation_jessie|chroot-installation_.*education-lang-' || true)
if [ ! -z "$ZOMBIES" ] ; then
DIRTY=true
figlet 'zombies!!!'
......
job-cfg/chroot-installation.yaml.py
View file @ 476c9031
......@@ -58,16 +58,6 @@ 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',
......@@ -101,9 +91,6 @@ def is_target_in_distro(distro, target):
# education-services is obsolete since buster…
if distro not in ('stretch') and target == 'education-services':
return False
# education-lang-* packages only exist in stretch
elif distro not in ('stretch') and target[:15] == 'education-lang-':
return False
# parl-desktop* packages have been removed from stretch.
elif distro in ('stretch') and target[:12] == 'parl-desktop':
return False
......