diff options
| -rw-r--r-- | job-cfg/packages-tests.yaml | 54 |
1 files changed, 12 insertions, 42 deletions
diff --git a/job-cfg/packages-tests.yaml b/job-cfg/packages-tests.yaml index 1e235b4a..255f7631 100644 --- a/job-cfg/packages-tests.yaml +++ b/job-cfg/packages-tests.yaml @@ -69,10 +69,10 @@ id: simple name: '{name}_{my_distro}' -#- job-template: -# defaults: packages-tests-junit-exports -# id: junit -# name: '{name}_{my_distro}' +- job-template: + defaults: packages-tests-junit-exports + id: junit + name: '{name}_{my_distro}' - project: name: lintian-tests @@ -82,7 +82,7 @@ my_description: 'Debian/Lintian testsuite' my_distro: *distros_defaults jobs: - - '{name}_{my_distro}' + - simple - project: name: debhelper-tests @@ -96,13 +96,13 @@ - jessie: my_disabled: true jobs: - - '{name}_{my_distro}' + - simple - project: name: dak-tests my_git_url: 'https://ftp-master.debian.org/git/dak.git' my_recipients: 'jenkins+debian-ftp debian-dak@lists.debian.org' - my_shell: 'timeout 1h dpkg-buildpackage -us -uc -tc' + my_shell: '--exports-results timeout 1h dpkg-buildpackage -us -uc -tc' my_description: 'DAK testsuite' my_distro: # DAK tests cannot be run in sid/stretch atm, but still create the jobs @@ -110,39 +110,9 @@ my_disabled: true - stretch: my_disabled: true -# - jessie: -# my_origin_triggers: -# - pollscm: -# cron: '* H/2 * * *' + - jessie: + my_origin_triggers: + - pollscm: + cron: '* H/2 * * *' jobs: - - '{name}_{my_distro}' - -# FIXME go back to delete the explicit dak-tests_jessie and uncomment above once -# jenkins-job-builder 1.5.0 is available to our jenkins. Also see commits -# 0dc3de19105634060ee99fa60051f860e509dccc 5a7b8562671bec94e2c81a98fff66db2932100fb - -- job: - name: dak-tests_jessie - properties: *properties - logrotate: *logrotate - description: 'DAK testsuite running on jessie.<br><br>Job configuration source is <a href="https://anonscm.debian.org/git/qa/jenkins.debian.net.git/tree/job-cfg/packages-tests.yaml">packages-tests.yaml</a>.' - scm: - - git: - url: 'https://ftp-master.debian.org/git/dak.git' - branches: - - master - - 'origin/smoke-me/**' - triggers: - - pollscm: - cron: '* H/2 * * *' - builders: - - shell: '/srv/jenkins/bin/chroot-run.sh jessie --exports-results timeout 1h dpkg-buildpackage -us -uc -tc' - publishers: - - email: - recipients: 'qa-jenkins-scm@lists.alioth.debian.org jenkins+debian-ftp debian-dak@lists.debian.org' - send-to-individuals: true - - trigger: - project: None - - naginator: *naginator - - junit: - results: 'job-exports/test-results/*.xml' + - junit |