drop webcheck jobs. if debian-www (or anybody else from Debian) wants tests here, i'd be happy to support them...

5 files changed, 2 insertions, 324 deletions

diff --git a/README b/README
index e57b5f46..baa2a556 100644
--- a/README
+++ b/README
@@ -143,13 +143,6 @@ jenkins@jenkins:~$ /srv/jenkins/bin/reproducible_blacklist.sh package1
 * FIXME: describe dvswitch jobs
 
 
-=== webcheck jobs
-
-* three jobs for running webcheck against www.debian.org, www.debian.org/News and www.debian.org/security
-* several webcheck jobs for running again various debconf.org websites
-
-These jobs are only run on the first day of each month.
-
 === self jobs
 
 These are jobs for making sure jenkins.debian.net is running smoothly.
diff --git a/bin/webcheck_url.sh b/bin/webcheck_url.sh
deleted file mode 100755
index af23d474..00000000
--- a/bin/webcheck_url.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/bash
-
-# Copyright 2012,2014 Holger Levsen <holger@layer-acht.org>
-# released under the GPLv=2
-
-DEBUG=false
-. /srv/jenkins/bin/common-functions.sh
-common_init "$@"
-
-# convert params to variables
-if [ "$1" == "" ] ; then
-	echo "need at least one URL to act on"
-	echo '# $1 = URL'
-	exit 1
-fi
-URL=$1
-PATTERNS=$2
-
-#
-# Don't use --continue on first run
-#
-if [ ! -e webcheck.dat ] ; then
-	PARAMS=""
-else
-	PARAMS="-c -f"
-fi
-
-#
-# if $URL ends with / then run webcheck with -b
-#
-if [ "${URL: -1}" = "/" ] ; then
-	echo "URL ending in / - adding '-b' to parameters."
-	PARAMS="$PARAMS -b"
-fi
-
-#
-# ignore some extra patterns (=all translations) when checking www.debian.org
-#
-if [ "${URL:0:21}" = "http://www.debian.org" ] ; then
-	echo "URL starts with http://www.debian.org - so better ignore lots of translated documents. (Checking translations is out of scope for this test.)"
-	# originly was TRANSLATIONS=$(curl www.debian.org 2>/dev/null|grep index|grep lang=|cut -d "." -f2)
-	# but then I had to add some and then some more... so I reached to the conclusion to hardcode them all
-	TRANSLATIONS="ar bg ca cs da de el es eo fa fr ko hy hr id it he lt hu nl ja nb pl pt ro ru sk fi sv ta tr uk zh-cn zh-hk zh-tw ml vi"
-	for LANG in $TRANSLATIONS pt_BR zh_CN zh_HK zh_TW ; do
-		PARAMS="$PARAMS -y \.${LANG}\.html -y html\.${LANG} -y \.${LANG}\.txt -y \.txt\.${LANG} -y \.${LANG}\.pdf -y \.pdf\.${LANG}"
-	done
-fi
-
-#
-# ignore some extra patterns (=the installation manual for all releases and all archs) when checking www.debian.org
-#
-if [ "${URL:0:21}" = "http://www.debian.org" ] && [ "${URL: -1}" != "/" ] ; then
-	echo "URL is http://www.debian.org - so better ignore all those manuals for all releases (and the architecture permutations). (Checking these manuals is out of scope for this test.)"
-	RELEASES="slink potato woody sarge etch lenny squeeze wheezy stable"
-	SLINK="i386 m68k alpha sparc source"
-	POTATO="$SLINK powerpc arm"
-	WOODY="$POTATO hppa ia64 mips mipsel s390"
-	SARGE=$WOODY
-	ETCH="$SARGE amd64"
-	LENNY="$ETCH armel"
-	SQUEEZE="amd64 i386 armel sparc powerpc ia64 mips mipsel s390 kfreebsd-amd64 kfreebsd-i386"
-	STABLE=$SQUEEZE
-	WHEEZY="$SQUEEZE armhf s390x"
-	JESSIE="amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390x"
-	# jessie eventually needs to be added to RELEASES above
-	for RELEASE in $RELEASES ; do
-		RELEASEVAR=$(echo $RELEASE | tr  "[:lower:]" "[:upper:]")
-		for ARCH in ${!RELEASEVAR} ; do
-			PARAMS="$PARAMS -y www\.debian\.org/releases/$RELEASE/+$ARCH/"
-		done
-	done
-	#
-	# Remind, that this needs to be updated manually
-	#
-	if [ $(date +%Y) -gt 2014 ] ; then
-		echo "next Warning: It's not 2014 anymore, check which architectures Jessie has for real."
-	fi
-fi
-
-#
-# $PATTERNS can only be used to ignore patterns atm
-#
-if [ "$PATTERNS" != "" ] ; then
-	PARAMS="$PARAMS $(for i in $PATTERNS ; do echo -n " -y $i" ; done)"
-fi
-
-#
-# actually run webcheck
-#
-echo "Now running: webcheck $URL $PARAMS"
-echo
-webcheck $URL $PARAMS
diff --git a/debian/control b/debian/control
index 1b4e2083..f3f7e9aa 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Description: Stuff to setup a jenkins.debian.net instance
 
 Package: jenkins.debian.net-bin
 Architecture: all
-Depends:, ${misc:Depends}, debootstrap, sudo, figlet, graphviz, mr, subversion, subversion-tools, vnstat, webcheck, poxml, qemu, vncsnapshot, imagemagick, ffmpeg2theora, python-twisted, python-imaging, gocr, guestmount (>>1:1.18.1-1+deb7u1), schroot
+Depends:, ${misc:Depends}, debootstrap, sudo, figlet, graphviz, mr, subversion, subversion-tools, vnstat, poxml, qemu, vncsnapshot, imagemagick, ffmpeg2theora, python-twisted, python-imaging, gocr, guestmount (>>1:1.18.1-1+deb7u1), schroot
 Description: Stuff to make jenkins.debian.net run and debug
  Scripts and configuration files for running and debugging jobs run on 
  jenkins.debian.net.
diff --git a/job-cfg/webcheck.yaml b/job-cfg/webcheck.yaml
deleted file mode 100644
index c410778d..00000000
--- a/job-cfg/webcheck.yaml
+++ /dev/null
@@ -1,223 +0,0 @@
-
-- defaults:
-    name: webcheck
-    description: 'Run <a href="http://arthurdejong.org/webcheck/">webcheck</a> on {webcheck_url} on the first day of a month. These patters are ignored: <pre>{webcheck_ignore_patterns}</pre>{do_not_edit}'
-    logrotate:
-      daysToKeep: 90
-      numToKeep: 30
-      artifactDaysToKeep: -1
-      artifactNumToKeep: -1
-    triggers:
-      - timed: "{timed}"
-    builders:
-      - shell: "/srv/jenkins/bin/webcheck_url.sh {webcheck_url} '{webcheck_ignore_patterns}'"
-    publishers:
-      - logparser:
-          parse-rules: '/srv/jenkins/logparse/debian.rules'
-          unstable-on-warning: 'false'
-          fail-on-error: 'false'
-      - htmlpublisher:
-          name: 'Webcheck report'
-          directory: '.'
-          indexfiles: 'index.html'
-          keepall: True
-      - email:
-          recipients: holger@layer-acht.org
-    properties:
-      - sidebar:
-          url: https://jenkins.debian.net/userContent/about.html
-          text: About jenkins.debian.net
-          icon: /userContent/images/debian-swirl-24x24.png
-      - sidebar:
-          url: https://jenkins.debian.net/view/webcheck/
-          text: All webcheck jobs
-          icon: /userContent/images/debian-jenkins-24x24.png
-      - sidebar:
-          url: http://www.profitbricks.com
-          text: Sponsored by Profitbricks
-          icon: /userContent/images/profitbricks-24x24.png
-      - priority:
-          job-prio: '120'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_www_debian_org'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_www_debian_org_security'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_www_debian_org_news'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_www_debconf_org'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_debconf13_debconf_org'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_debconf12_debconf_org'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_debconf11_debconf_org'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_debconf10_debconf_org'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_debconf9_debconf_org'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_debconf8_debconf_org'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_debconf7_debconf_org'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_debconf6_debconf_org'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_debconf5_debconf_org'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_debconf4_debconf_org'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_debconf3_debconf_org'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_debconf2_debconf_org'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_debconf1_debconf_org'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_debconf0_debconf_org'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_media_debconf_org'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_debian_edu_squeeze_manual'
-    disabled: true
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_debian_edu_wheezy_manual'
-
-- job-template:
-    defaults: webcheck
-    name: '{name}_debian_edu_jessie_manual'
-
-- project:
-    name: webcheck
-    do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/job-cfg/webcheck.yaml">webcheck.yaml</a>.'
-    jobs:
-      - '{name}_www_debian_org':
-         webcheck_url: 'http://www.debian.org'
-         webcheck_ignore_patterns: '^mailto: action/edit action/history Special: oldid= printable=yes limit= redirect=no qa.debian.org/developer.php security.debian.org/pool packages.debian.org i18n.debian.org/material cve.mitre.org/cgi-bin online.securityfocus.com/bid bugs.debian.org/\d\d\d bugs.debian.org/cgi-bin/ \.dsc$ \.diff.gz$ \.tar.gz \.deb$ www.debian.org/security www.debian.org/News www.debian.org/mirror/list \.\./\.\. www.debian.org/doc/.* www.debian.org/devel/website/stats/.*'
-         timed: "0 1 1 * *"
-      - '{name}_www_debian_org_security':
-         webcheck_url: 'http://www.debian.org/security/'
-         webcheck_ignore_patterns: '^mailto: action/edit action/history Special: oldid= printable=yes limit= redirect=no qa.debian.org/developer.php security.debian.org/pool packages.debian.org i18n.debian.org/material cve.mitre.org/cgi-bin online.securityfocus.com/bid bugs.debian.org/\d\d\d bugs.debian.org/cgi-bin/ \.dsc$ \.diff.gz$ \.tar.gz \.deb$ www.debian.org/News lists.debian.org'
-         timed: "30 1 1 * *"
-      - '{name}_www_debian_org_news':
-         webcheck_url: 'http://www.debian.org/News/'
-         webcheck_ignore_patterns: '^mailto: action/edit action/history Special: oldid= printable=yes limit= redirect=no qa.debian.org/developer.php security.debian.org/pool packages.debian.org i18n.debian.org/material cve.mitre.org/cgi-bin online.securityfocus.com/bid bugs.debian.org/\d\d\d bugs.debian.org/cgi-bin/ \.dsc$ \.diff.gz$ \.tar.gz \.deb$ www.debian.org/security lists.debian.org'
-         timed: "35 1 1 * *"
-      - '{name}_www_debconf_org':
-         webcheck_url: 'http://www.debconf.org'
-         webcheck_ignore_patterns: '^mailto: action/edit action/history Special: oldid= printable=yes limit= redirect=no'
-         timed: "2 1 1 * *"
-      - '{name}_debconf13_debconf_org':
-         webcheck_url: 'http://debconf13.debconf.org'
-         webcheck_ignore_patterns: '^mailto: action/edit action/history Special: oldid= printable=yes limit= redirect=no'
-         timed: "4 1 1 * *"
-      - '{name}_debconf12_debconf_org':
-         webcheck_url: 'http://debconf12.debconf.org'
-         webcheck_ignore_patterns: '^mailto: action/edit action/history Special: oldid= printable=yes limit= redirect=no'
-         timed: "6 1 1 * *"
-      - '{name}_debconf11_debconf_org':
-         webcheck_url: 'http://debconf11.debconf.org'
-         webcheck_ignore_patterns: '^mailto: action/edit action/history Special: oldid= printable=yes limit= redirect=no'
-         timed: "8 1 1 * *"
-      - '{name}_debconf10_debconf_org':
-         webcheck_url: 'http://debconf10.debconf.org'
-         webcheck_ignore_patterns: '^mailto: action/edit action/history Special: oldid= printable=yes limit= redirect=no'
-         timed: "10 1 1 * *"
-      - '{name}_debconf9_debconf_org':
-         webcheck_url: 'http://debconf9.debconf.org'
-         webcheck_ignore_patterns: '^mailto: action/edit action/history Special: oldid= printable=yes limit= redirect=no'
-         timed: "12 1 1 * *"
-      - '{name}_debconf8_debconf_org':
-         webcheck_url: 'http://debconf8.debconf.org'
-         webcheck_ignore_patterns: '^mailto: action/edit action/history Special: oldid= printable=yes limit= redirect=no'
-         timed: "14 1 1 * *"
-      - '{name}_debconf7_debconf_org':
-         webcheck_url: 'http://debconf7.debconf.org'
-         webcheck_ignore_patterns: '^mailto: action/edit action/history Special: oldid= printable=yes limit= redirect=no'
-         timed: "16 1 1 * *"
-      - '{name}_debconf6_debconf_org':
-         webcheck_url: 'http://debconf6.debconf.org'
-         webcheck_ignore_patterns: '^mailto: action/edit action/history Special: oldid= printable=yes limit= redirect=no'
-         timed: "18 1 1 * *"
-      - '{name}_debconf5_debconf_org':
-         webcheck_url: 'http://debconf5.debconf.org'
-         webcheck_ignore_patterns: '^mailto: action/edit action/history Special: oldid= printable=yes limit= redirect=no'
-         timed: "20 1 1 * *"
-      - '{name}_debconf4_debconf_org':
-         webcheck_url: 'http://debconf4.debconf.org'
-         webcheck_ignore_patterns: '^mailto: action/edit action/history Special: oldid= printable=yes limit= redirect=no'
-         timed: "22 1 1 * *"
-      - '{name}_debconf3_debconf_org':
-         webcheck_url: 'http://debconf3.debconf.org'
-         webcheck_ignore_patterns: '^mailto: action/edit action/history Special: oldid= printable=yes limit= redirect=no'
-         timed: "24 1 1 * *"
-      - '{name}_debconf2_debconf_org':
-         webcheck_url: 'http://debconf2.debconf.org'
-         webcheck_ignore_patterns: '^mailto: action/edit action/history Special: oldid= printable=yes limit= redirect=no'
-         timed: "26 1 1 * *"
-      - '{name}_debconf1_debconf_org':
-         webcheck_url: 'http://debconf1.debconf.org'
-         webcheck_ignore_patterns: '^mailto: action/edit action/history Special: oldid= printable=yes limit= redirect=no'
-         timed: "28 1 1 * *"
-      - '{name}_debconf0_debconf_org':
-         webcheck_url: 'http://debconf0.debconf.org'
-         webcheck_ignore_patterns: '^mailto: action/edit action/history Special: oldid= printable=yes limit= redirect=no'
-         timed: "30 1 1 * *"
-      - '{name}_media_debconf_org':
-         webcheck_url: 'http://media.debconf.org'
-         webcheck_ignore_patterns: '^mailto:'
-         timed: "32 1 1 * *"
-      - '{name}_debian_edu_squeeze_manual':
-         webcheck_url: 'http://maintainer.skolelinux.org/debian-edu-doc/en/debian-edu-squeeze-manual.html'
-         webcheck_ignore_patterns: '^mailto: \?C= http://maintainer.skolelinux.org/debian-edu-doc/$'
-         timed: "34 1 1,8,15,22 * *"
-      - '{name}_debian_edu_wheezy_manual':
-         webcheck_url: 'http://maintainer.skolelinux.org/debian-edu-doc/en/debian-edu-wheezy-manual.html'
-         webcheck_ignore_patterns: '^mailto: \?C= http://maintainer.skolelinux.org/debian-edu-doc/$'
-         timed: "34 1 1,8,15,22 * *"
-      - '{name}_debian_edu_jessie_manual':
-         webcheck_url: 'http://maintainer.skolelinux.org/debian-edu-doc/en/debian-edu-jessie-manual.html'
-         webcheck_ignore_patterns: '^mailto: \?C= http://maintainer.skolelinux.org/debian-edu-doc/$'
-         timed: "34 2 1,8,15,22 * *"
-
diff --git a/update_jdn.sh b/update_jdn.sh
index 1e458e19..e8a9ca29 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -59,7 +59,7 @@ fi
 #
 sudo apt-get install vim screen less etckeeper moreutils curl mtr-tiny dstat devscripts bash-completion shorewall shorewall6 cron-apt apt-listchanges munin munin-plugins-extra calamaris visitors procmail libjson-rpc-perl libfile-touch-perl zutils ip2host pigz \
 	build-essential python-setuptools \
-	debootstrap sudo figlet graphviz apache2 python-yaml python-pip mr subversion subversion-tools vnstat webcheck poxml vncsnapshot imagemagick ffmpeg2theora python-twisted python-imaging gocr guestmount schroot sqlite3\
+	debootstrap sudo figlet graphviz apache2 python-yaml python-pip mr subversion subversion-tools vnstat poxml vncsnapshot imagemagick ffmpeg2theora python-twisted python-imaging gocr guestmount schroot sqlite3\
 	unzip python-hachoir-metadata ghc python-rpy2 libsoap-lite-perl
 # debootstrap is affected by #766459 in wheezy
 sudo apt-get install -t wheezy-backports qemu debootstrap