summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@debian.org>2017-05-29 23:19:59 +0200
committerHolger Levsen <holger@layer-acht.org>2017-05-29 23:52:53 +0200
commite4dc3f91a05a537dbd7336044452aa1adeb0bc63 (patch)
tree0a0d027d4b271e9f347f004b07965394d62ccda0
parentd204c5ae7c1a1dfcb0789084947b0704bba5bfa2 (diff)
downloadjenkins.debian.net-e4dc3f91a05a537dbd7336044452aa1adeb0bc63.tar.xz
packages-tests: go back to the shorter way of specifying junit jobs (also this file was actually not compilable with newer j-j-b)
Signed-off-by: Mattia Rizzolo <mattia@debian.org> Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rw-r--r--job-cfg/packages-tests.yaml54
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