From b6948375466b3bdeac9c01eabb284e88d65a8837 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 2 Dec 2016 12:55:25 +0100 Subject: use Naginator plugin to retry git cloning in case of alioth/network failures - done for all jobs using git checkouts except those in job-cfg/d-i.yaml Signed-off-by: Holger Levsen --- INSTALL | 1 + job-cfg/debsums-tests.yaml | 15 +++++++++++++++ job-cfg/edu-packages.yaml | 5 +++++ job-cfg/haskell-package-plan.yaml | 5 +++++ job-cfg/packages-tests.yaml | 6 +++++- job-cfg/piuparts.yaml | 30 ++++++++++++++++++++++++++++++ job-cfg/rebootstrap.yaml.py | 5 +++++ job-cfg/reproducible.yaml | 10 ++++++++++ job-cfg/torbrowser-launcher.yaml | 5 +++++ 9 files changed, 81 insertions(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index b1ff8a61..8f5ee097 100644 --- a/INSTALL +++ b/INSTALL @@ -43,6 +43,7 @@ We would prefer to run a jenkins package from jessie-backports. * Console Column Plugin * Priority Sorter Plugin * Throttle Concurrent Builds Plugin +* Naginator Plugin * Next Executions * Parameterized Trigger plugin * Environment Injector Plugin diff --git a/job-cfg/debsums-tests.yaml b/job-cfg/debsums-tests.yaml index 2265c34d..b56290a7 100644 --- a/job-cfg/debsums-tests.yaml +++ b/job-cfg/debsums-tests.yaml @@ -34,6 +34,11 @@ publishers: - email: recipients: 'jenkins+debian-qa qa-jenkins-scm@lists.alioth.debian.org pkg-perl-maintainers@lists.alioth.debian.org' + - naginator: + progressive-delay-increment: 5 + progressive-delay-maximum: 15 + max-failed-builds: 5 + regular-expression: 'Caused by: hudson.plugins.git.GitException: Command "git fetch' - job-template: defaults: debsums-tests @@ -43,6 +48,11 @@ recipients: 'jenkins+debian-qa qa-jenkins-scm@lists.alioth.debian.org pkg-perl-maintainers@lists.alioth.debian.org' - trigger: project: '{my_trigger}' + - naginator: + progressive-delay-increment: 5 + progressive-delay-maximum: 15 + max-failed-builds: 5 + regular-expression: 'Caused by: hudson.plugins.git.GitException: Command "git fetch' - job-template: defaults: debsums-tests @@ -55,6 +65,11 @@ recipients: 'jenkins+debian-qa qa-jenkins-scm@lists.alioth.debian.org pkg-perl-maintainers@lists.alioth.debian.org' - trigger: project: '{my_trigger}' + - naginator: + progressive-delay-increment: 5 + progressive-delay-maximum: 15 + max-failed-builds: 5 + regular-expression: 'Caused by: hudson.plugins.git.GitException: Command "git fetch' - project: name: debsums-tests diff --git a/job-cfg/edu-packages.yaml b/job-cfg/edu-packages.yaml index f6af5763..6b03da23 100644 --- a/job-cfg/edu-packages.yaml +++ b/job-cfg/edu-packages.yaml @@ -33,6 +33,11 @@ publishers: - email: recipients: 'jenkins+debian-edu debian-edu-commits@lists.alioth.debian.org' + - naginator: + progressive-delay-increment: 5 + progressive-delay-maximum: 15 + max-failed-builds: 5 + regular-expression: 'Caused by: hudson.plugins.git.GitException: Command "git fetch' - job-template: diff --git a/job-cfg/haskell-package-plan.yaml b/job-cfg/haskell-package-plan.yaml index 16c20ff7..8eb1e2f7 100644 --- a/job-cfg/haskell-package-plan.yaml +++ b/job-cfg/haskell-package-plan.yaml @@ -48,6 +48,11 @@ # format: csv # # inclusion-flag: include-by-string # # exclude: total + - naginator: + progressive-delay-increment: 5 + progressive-delay-maximum: 15 + max-failed-builds: 5 + regular-expression: 'Caused by: hudson.plugins.git.GitException: Command "git fetch' scm: - git: url: 'git://anonscm.debian.org/pkg-haskell/package-plan.git' diff --git a/job-cfg/packages-tests.yaml b/job-cfg/packages-tests.yaml index 7a4f85b4..b587a70a 100644 --- a/job-cfg/packages-tests.yaml +++ b/job-cfg/packages-tests.yaml @@ -33,7 +33,11 @@ recipients: 'qa-jenkins-scm@lists.alioth.debian.org {my_recipients}' - trigger: project: '{my_trigger}' - + - naginator: + progressive-delay-increment: 5 + progressive-delay-maximum: 15 + max-failed-builds: 5 + regular-expression: 'Caused by: hudson.plugins.git.GitException: Command "git fetch' - job-template: defaults: packages-tests diff --git a/job-cfg/piuparts.yaml b/job-cfg/piuparts.yaml index 9085d36e..90245821 100644 --- a/job-cfg/piuparts.yaml +++ b/job-cfg/piuparts.yaml @@ -34,6 +34,11 @@ recipients: 'jenkins+debian-qa qa-jenkins-scm@lists.alioth.debian.org piuparts-devel@lists.alioth.debian.org' - trigger: project: '{my_trigger}' + - naginator: + progressive-delay-increment: 5 + progressive-delay-maximum: 15 + max-failed-builds: 5 + regular-expression: 'Caused by: hudson.plugins.git.GitException: Command "git fetch' builders: - shell: '/srv/jenkins/bin/chroot-run.sh {my_distro} {my_shell}' @@ -45,6 +50,11 @@ recipients: 'jenkins+debian-qa qa-jenkins-scm@lists.alioth.debian.org piuparts-devel@lists.alioth.debian.org' - trigger: project: '{my_trigger}' + - naginator: + progressive-delay-increment: 5 + progressive-delay-maximum: 15 + max-failed-builds: 5 + regular-expression: 'Caused by: hudson.plugins.git.GitException: Command "git fetch' builders: - shell: '/srv/jenkins/bin/chroot-run.sh {my_distro} {my_shell}' @@ -59,6 +69,11 @@ recipients: 'jenkins+debian-qa qa-jenkins-scm@lists.alioth.debian.org piuparts-devel@lists.alioth.debian.org' - trigger: project: '{my_trigger}' + - naginator: + progressive-delay-increment: 5 + progressive-delay-maximum: 15 + max-failed-builds: 5 + regular-expression: 'Caused by: hudson.plugins.git.GitException: Command "git fetch' builders: - shell: '/srv/jenkins/bin/chroot-run.sh {my_distro} {my_shell}' @@ -71,6 +86,11 @@ - archive: artifacts: '*_*.dsc, *_*.tar.*, *_*_*.deb, *_*_*.changes' latest-only: true + - naginator: + progressive-delay-increment: 5 + progressive-delay-maximum: 15 + max-failed-builds: 5 + regular-expression: 'Caused by: hudson.plugins.git.GitException: Command "git fetch' builders: - shell: 'export ARTIFACTS=true ; /srv/jenkins/bin/chroot-run.sh {my_distro} {my_shell}' @@ -85,6 +105,11 @@ - archive: artifacts: '*_*.dsc, *_*.tar.*, *_*_*.deb, *_*_*.changes' latest-only: true + - naginator: + progressive-delay-increment: 5 + progressive-delay-maximum: 15 + max-failed-builds: 5 + regular-expression: 'Caused by: hudson.plugins.git.GitException: Command "git fetch' builders: - shell: 'export ARTIFACTS=true ; /srv/jenkins/bin/chroot-run.sh {my_distro} {my_shell}' @@ -99,6 +124,11 @@ - archive: artifacts: '*_*.dsc, *_*.tar.*, *_*_*.deb, *_*_*.changes' latest-only: true + - naginator: + progressive-delay-increment: 5 + progressive-delay-maximum: 15 + max-failed-builds: 5 + regular-expression: 'Caused by: hudson.plugins.git.GitException: Command "git fetch' builders: - shell: 'export ARTIFACTS=true ; /srv/jenkins/bin/chroot-run.sh {my_distro} {my_shell}' diff --git a/job-cfg/rebootstrap.yaml.py b/job-cfg/rebootstrap.yaml.py index 2e93bbff..20a19422 100755 --- a/job-cfg/rebootstrap.yaml.py +++ b/job-cfg/rebootstrap.yaml.py @@ -80,6 +80,11 @@ print(""" publishers: - email: recipients: 'jenkins+debian-bootstrap helmutg@debian.org' + - naginator: + progressive-delay-increment: 5 + progressive-delay-maximum: 15 + max-failed-builds: 5 + regular-expression: 'Caused by: hudson.plugins.git.GitException: Command "git fetch' triggers: - pollscm: cron: '*/6 * * * *' diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index e7b60b9d..6a169b34 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -58,6 +58,11 @@ - logparser: *logparse - email: recipients: '{my_recipients}' + - naginator: + progressive-delay-increment: 5 + progressive-delay-maximum: 15 + max-failed-builds: 5 + regular-expression: 'Caused by: hudson.plugins.git.GitException: Command "git fetch' scm: - git: url: '{my_gitrepo}' @@ -208,6 +213,11 @@ fail-on-error: 'true' - email: recipients: '{my_recipients}' + - naginator: + progressive-delay-increment: 5 + progressive-delay-maximum: 15 + max-failed-builds: 5 + regular-expression: 'Caused by: hudson.plugins.git.GitException: Command "git fetch' scm: - git: url: '{my_gitrepo}' diff --git a/job-cfg/torbrowser-launcher.yaml b/job-cfg/torbrowser-launcher.yaml index 9d1c1f57..efe1b404 100644 --- a/job-cfg/torbrowser-launcher.yaml +++ b/job-cfg/torbrowser-launcher.yaml @@ -75,6 +75,11 @@ image-width: 300 - email: recipients: '{my_recipients}' + - naginator: + progressive-delay-increment: 5 + progressive-delay-maximum: 15 + max-failed-builds: 5 + regular-expression: 'Caused by: hudson.plugins.git.GitException: Command "git fetch' wrappers: - live-screenshot scm: -- cgit v1.2.3-54-g00ecf