diff options
| -rwxr-xr-x | bin/chroot-installation.sh | 10 | ||||
| -rwxr-xr-x | bin/g-i-installation.sh | 5 | ||||
| -rw-r--r-- | etc/squid/squid.conf | 6 | ||||
| -rw-r--r-- | job-cfg/chroot-installation.yaml | 12 | ||||
| -rw-r--r-- | job-cfg/g-i-installation.yaml | 8 | ||||
| -rwxr-xr-x | job-cfg/rebootstrap.yaml.py | 13 |
6 files changed, 30 insertions, 24 deletions
diff --git a/bin/chroot-installation.sh b/bin/chroot-installation.sh index 3b56cae4..1a7242cb 100755 --- a/bin/chroot-installation.sh +++ b/bin/chroot-installation.sh @@ -117,16 +117,16 @@ trap cleanup_all INT TERM EXIT case $1 in squeeze) DISTRO="squeeze" - SPECIFIC="openoffice.org virtualbox-ose mplayer" + SPECIFIC="openoffice.org virtualbox-ose mplayer chromium" ;; wheezy) DISTRO="wheezy" - SPECIFIC="libreoffice virtualbox mplayer" + SPECIFIC="libreoffice virtualbox mplayer chromium" ;; jessie) DISTRO="jessie" - SPECIFIC="libreoffice virt-manager mplayer2" + SPECIFIC="libreoffice virt-manager mplayer2 chromium-browser" ;; sid) DISTRO="sid" - SPECIFIC="libreoffice virt-manager mplayer2" + SPECIFIC="libreoffice virt-manager mplayer2 chromium-browser" ;; *) echo "unsupported distro." exit 1 @@ -135,7 +135,7 @@ esac bootstrap $DISTRO if [ "$2" != "" ] ; then - FULL_DESKTOP="$SPECIFIC desktop-base gnome kde-plasma-desktop kde-full kde-standard xfce4 lxde vlc evince iceweasel chromium cups build-essential devscripts wine texlive-full asciidoc vim emacs" + FULL_DESKTOP="$SPECIFIC desktop-base gnome kde-plasma-desktop kde-full kde-standard xfce4 lxde vlc evince iceweasel cups build-essential devscripts wine texlive-full asciidoc vim emacs" case $2 in none) ;; gnome) install_packages gnome gnome desktop-base diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 59d20f77..6d73a389 100755 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -865,7 +865,7 @@ monitor_system() { rm snapshot_${PRINTF_NR}.jpg else echo "$PRINTF_NR: $(date) - could not take vncsnapshot from $DISPLAY - using a blank fake one instead" - convert -size $VIDEOSIZE xc:none snapshot_${PRINTF_NR}.ppm + convert -size $VIDEOSIZE xc:none -depth 8 snapshot_${PRINTF_NR}.ppm fi # give signal we are still running if [ $(($NR % 14)) -eq 0 ] ; then @@ -1077,7 +1077,8 @@ if [ ! -z "$IMAGE" ] ; then fetch_if_newer "$IMAGE" "$URL" # is this really an .iso? if [ $(file "$IMAGE" | grep -cE '(ISO 9660|DOS/MBR boot sector)') -eq 1 ] ; then - # yes, so let's mount it + # yes, so let's md5sum and mount it + md5sum $IMAGE sudo mkdir -p $IMAGE_MNT grep -q $IMAGE_MNT /proc/mounts && sudo umount -l $IMAGE_MNT sleep 1 diff --git a/etc/squid/squid.conf b/etc/squid/squid.conf index 5f4680f4..94870637 100644 --- a/etc/squid/squid.conf +++ b/etc/squid/squid.conf @@ -2748,7 +2748,11 @@ access_log /var/log/squid/access.log squid refresh_pattern ^ftp: 1440 20% 10080 refresh_pattern ^gopher: 1440 0% 1440 refresh_pattern -i (/cgi-bin/|\?) 0 0% 0 -refresh_pattern (Release|Packages(.gz)*)$ 0 20% 2880 +refresh_pattern /(|In)Release(|\.gpg)$ 0 0% 0 +refresh_pattern /(Packages|Sources)(|\.gz|\.bz2|\.xz)$ 0 0% 0 +refresh_pattern \.deb$ 129600 100% 129600 +refresh_pattern \.udeb$ 129600 100% 129600 +refresh_pattern \.tar\.(gz|bz2|xz|lzma)$ 129600 100% 129600 refresh_pattern . 0 20% 4320 # TAG: quick_abort_min (KB) diff --git a/job-cfg/chroot-installation.yaml b/job-cfg/chroot-installation.yaml index fdb513ca..238d7c0c 100644 --- a/job-cfg/chroot-installation.yaml +++ b/job-cfg/chroot-installation.yaml @@ -32,8 +32,8 @@ - priority: job-prio: '130' - throttle: - max-total: 4 - max-per-node: 4 + max-total: 6 + max-per-node: 6 enabled: True option: category categories: @@ -74,8 +74,8 @@ - priority: job-prio: '131' - throttle: - max-total: 4 - max-per-node: 4 + max-total: 6 + max-per-node: 6 enabled: True option: category categories: @@ -119,8 +119,8 @@ - priority: job-prio: '135' - throttle: - max-total: 4 - max-per-node: 4 + max-total: 6 + max-per-node: 6 enabled: True option: category categories: diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml index c45bc9ab..053782eb 100644 --- a/job-cfg/g-i-installation.yaml +++ b/job-cfg/g-i-installation.yaml @@ -41,8 +41,8 @@ - priority: job-prio: '140' - throttle: - max-total: 3 - max-per-node: 3 + max-total: 4 + max-per-node: 4 enabled: True option: category categories: @@ -82,8 +82,8 @@ - priority: job-prio: '175' - throttle: - max-total: 3 - max-per-node: 3 + max-total: 4 + max-per-node: 4 enabled: True option: category categories: diff --git a/job-cfg/rebootstrap.yaml.py b/job-cfg/rebootstrap.yaml.py index 287b12a3..de70f5d9 100755 --- a/job-cfg/rebootstrap.yaml.py +++ b/job-cfg/rebootstrap.yaml.py @@ -1,17 +1,18 @@ #!/usr/bin/python architectures = """ - arm arm64 armel armhf i386 hppa - mips mipsel + mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x + sh4 sparc sparc64 x32 """.split() mono_architectures = """ + arm armel armhf arm64 alpha ia64 m68k @@ -20,7 +21,7 @@ mono_architectures = """ architectures += mono_architectures -gcc_versions = """4.8 4.9""".split() +gcc_versions = """4.9""".split() print(""" - defaults: @@ -42,8 +43,8 @@ print(""" - priority: job-prio: '150' - throttle: - max-total: 2 - max-per-node: 2 + max-total: 5 + max-per-node: 5 enabled: True option: category categories: @@ -51,7 +52,7 @@ print(""" description: '{my_description}{do_not_edit}' logrotate: daysToKeep: 365 - numToKeep: 365 + numToKeep: 20 artifactDaysToKeep: -1 artifactNumToKeep: -1 scm: |