changes to keep j-j-b >= 1.2.0 happy

10 files changed, 69 insertions, 40 deletions

diff --git a/job-cfg/chroot-installation.yaml.py b/job-cfg/chroot-installation.yaml.py
index a3a655d3..ebe43d58 100755
--- a/job-cfg/chroot-installation.yaml.py
+++ b/job-cfg/chroot-installation.yaml.py
@@ -188,8 +188,8 @@ print("""
           url: http://www.profitbricks.co.uk
           text: Sponsored by Profitbricks
           icon: /userContent/images/profitbricks-24x24.png
-      - priority:
-          job-prio: '{my_prio}'
+      - priority-sorter:
+          priority: '{my_prio}'
       - throttle:
           max-total: 6
           max-per-node: 6
diff --git a/job-cfg/d-i.yaml.py b/job-cfg/d-i.yaml.py
index 51b99062..5d178484 100755
--- a/job-cfg/d-i.yaml.py
+++ b/job-cfg/d-i.yaml.py
@@ -197,7 +197,7 @@ def publ(fmt=None,trigger=False,irc=None):
                        'fail-on-error': 'true'}}])
     p.append(publ_email(irc=irc))
     if fmt != None:
-        p.append({'archive': {'artifacts': fmt + '/**/*.*', 'latest_only': True}})
+        p.append({'archive': {'artifacts': fmt + '/**/*.*', 'latest-only': True}})
     return p
 
 
@@ -212,7 +212,7 @@ def prop(type='manual', priority=None):
                       'text': 'Sponsored by Profitbricks',
                       'icon': '/userContent/images/profitbricks-24x24.png'}}]
     if priority != None:
-        p.append( {'priority': {'job-prio': str(priority)}} )
+        p.append( {'priority-sorter': {'priority': str(priority)}} )
     return p
 
 
diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml
index 5ddedab9..2eeaf4cd 100644
--- a/job-cfg/g-i-installation.yaml
+++ b/job-cfg/g-i-installation.yaml
@@ -28,11 +28,11 @@
           body: 'See $BUILD_URL and $BUILD_URL/console and $BUILD_URL/artifact/results/ if there are any.'
       - archive:
           artifacts: 'results/*.*, results/log/*, results/log/installer/*'
-          latest_only: false
-      - imagegallery:
-          title: '{my_title}'
-          includes: 'results/*.png'
-          image-width: 300
+          latest-only: false
+      - image-gallery:
+          - title: '{my_title}'
+            includes: 'results/*.png'
+            image-width: 300
     wrappers:
       - live-screenshot
       - timeout:
@@ -50,8 +50,8 @@
           url: http://www.profitbricks.co.uk
           text: Sponsored by Profitbricks
           icon: /userContent/images/profitbricks-24x24.png
-      - priority:
-          job-prio: '140'
+      - priority-sorter:
+          priority: '140'
       - throttle:
           max-total: 3
           max-per-node: 3
@@ -82,8 +82,8 @@
       - sidebar: *sb01
       - sidebar: *sb10
       - sidebar: *sb99
-      - priority:
-          job-prio: '175'
+      - priority-sorter:
+          priority: '175'
 
 - job-template:
     defaults: g-i-installation-maintenance
diff --git a/job-cfg/lvc.yaml.py b/job-cfg/lvc.yaml.py
index 8a29cdb6..31959171 100755
--- a/job-cfg/lvc.yaml.py
+++ b/job-cfg/lvc.yaml.py
@@ -67,11 +67,11 @@ print("""
           recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
       - archive:
           artifacts: '*.webm, {my_pngs}'
-          latest_only: false
-      - imagegallery:
-          title: '{my_title}'
-          includes: '{my_pngs}'
-          image-width: 300
+          latest-only: false
+      - image-gallery:
+          - title: '{my_title}'
+            includes: '{my_pngs}'
+            image-width: 300
     wrappers:
       - live-screenshot
     builders:
diff --git a/job-cfg/piuparts.yaml b/job-cfg/piuparts.yaml
index 1a1f360e..16d5a3db 100644
--- a/job-cfg/piuparts.yaml
+++ b/job-cfg/piuparts.yaml
@@ -28,10 +28,21 @@
 
 - job-template:
     defaults: piuparts
+    name: '{name}_testsuite_wheezy'
+    publishers:
+      - email:
+          recipients: 'jenkins+debian-qa qa-jenkins-scm@lists.alioth.debian.org piuparts-devel@lists.alioth.debian.org'
+    builders:
+      - shell: '/srv/jenkins/bin/chroot-run.sh {my_distro} {my_shell}'
+
+- job-template:
+    defaults: piuparts
     name: '{name}_testsuite_jessie'
     publishers:
       - email:
           recipients: 'jenkins+debian-qa qa-jenkins-scm@lists.alioth.debian.org piuparts-devel@lists.alioth.debian.org'
+      - trigger:
+          project: '{my_trigger}'
     builders:
       - shell: '/srv/jenkins/bin/chroot-run.sh {my_distro} {my_shell}'
 
@@ -61,13 +72,25 @@
 
 - job-template:
     defaults: piuparts
+    name: '{name}_build_wheezy'
+    publishers:
+      - email:
+          recipients: 'jenkins+debian-qa qa-jenkins-scm@lists.alioth.debian.org piuparts-devel@lists.alioth.debian.org'
+      - archive:
+          artifacts: '*_*.dsc, *_*.tar.*, *_*_*.deb, *_*_*.changes'
+          latest-only: true
+    builders:
+      - shell: 'export ARTIFACTS=true ; /srv/jenkins/bin/chroot-run.sh {my_distro} {my_shell}'
+
+- job-template:
+    defaults: piuparts
     name: '{name}_build_jessie'
     publishers:
       - email:
           recipients: 'jenkins+debian-qa qa-jenkins-scm@lists.alioth.debian.org piuparts-devel@lists.alioth.debian.org'
       - archive:
           artifacts: '*_*.dsc, *_*.tar.*, *_*_*.deb, *_*_*.changes'
-          latest_only: true
+          latest-only: true
     builders:
       - shell: 'export ARTIFACTS=true ; /srv/jenkins/bin/chroot-run.sh {my_distro} {my_shell}'
 
@@ -81,7 +104,7 @@
           project: '{my_trigger}'
       - archive:
           artifacts: '*_*.dsc, *_*.tar.*, *_*_*.deb, *_*_*.changes'
-          latest_only: true
+          latest-only: true
     builders:
       - shell: 'export ARTIFACTS=true ; /srv/jenkins/bin/chroot-run.sh {my_distro} {my_shell}'
 
@@ -95,7 +118,7 @@
           project: '{my_trigger}'
       - archive:
           artifacts: '*_*.dsc, *_*.tar.*, *_*_*.deb, *_*_*.changes'
-          latest_only: true
+          latest-only: true
     builders:
       - shell: 'export ARTIFACTS=true ; /srv/jenkins/bin/chroot-run.sh {my_distro} {my_shell}'
 
@@ -116,6 +139,7 @@
             my_distro: 'jessie'
             my_shell: 'make check'
             my_description: 'run testsuite from piuparts develop branch on jessie.'
+            my_trigger: ''
         - '{name}_build_sid':
             my_distro: 'sid'
             my_shell: 'debuild -uc -us'
diff --git a/job-cfg/rebootstrap.yaml.py b/job-cfg/rebootstrap.yaml.py
index 37ef5ff5..4addfdb2 100755
--- a/job-cfg/rebootstrap.yaml.py
+++ b/job-cfg/rebootstrap.yaml.py
@@ -52,8 +52,8 @@ print("""
           url: http://www.profitbricks.co.uk
           text: Sponsored by Profitbricks
           icon: /userContent/images/profitbricks-24x24.png
-      - priority:
-          job-prio: '150'
+      - priority-sorter:
+          priority: '150'
       - throttle:
           max-total: 8
           max-per-node: 4
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index ba88f711..e7ed8b0b 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -92,8 +92,8 @@
           url: http://www.profitbricks.co.uk
           text: Sponsored by Profitbricks
           icon: /userContent/images/profitbricks-24x24.png
-      - priority:
-          job-prio: '150'
+      - priority-sorter:
+          priority: '150'
       - throttle:
           max-total: 58
           max-per-node: 58
@@ -140,8 +140,8 @@
           url: http://www.profitbricks.co.uk
           text: Sponsored by Profitbricks
           icon: /userContent/images/profitbricks-24x24.png
-      - priority:
-          job-prio: '150'
+      - priority-sorter:
+          priority: '150'
       - throttle:
           max-total: 58
           max-per-node: 58
diff --git a/job-cfg/self.yaml b/job-cfg/self.yaml
index 4608290b..dae08e14 100644
--- a/job-cfg/self.yaml
+++ b/job-cfg/self.yaml
@@ -26,8 +26,8 @@
           url: http://www.profitbricks.co.uk
           text: Sponsored by Profitbricks
           icon: /userContent/images/profitbricks-24x24.png
-      - priority:
-          job-prio: '125'
+      - priority-sorter:
+          priority: '125'
 
 - job-template:
     defaults: self-maintenance
@@ -41,8 +41,12 @@
 - job-template:
     defaults: self-maintenance
     name: '{name}_sub-maintenance'
+
+- job-template:
     defaults: self-maintenance
     name: '{name}_sub-maintenance-squid'
+
+- job-template:
     defaults: self-maintenance
     name: 'rebootstrap_maintenance'
 
diff --git a/job-cfg/torbrowser-launcher.yaml b/job-cfg/torbrowser-launcher.yaml
index 6de3876f..3f29e4b6 100644
--- a/job-cfg/torbrowser-launcher.yaml
+++ b/job-cfg/torbrowser-launcher.yaml
@@ -74,11 +74,11 @@
           fail-on-error: 'true'
       - archive:
           artifacts: 'results/*.*'
-          latest_only: false
-      - imagegallery:
-          title: '{my_description}'
-          includes: 'results/screenshot_*.png'
-          image-width: 300
+          latest-only: false
+      - image-gallery:
+          - title: '{my_description}'
+            includes: 'results/screenshot_*.png'
+            image-width: 300
       - email:
           recipients: '{my_recipients}'
     wrappers:
@@ -130,11 +130,11 @@
           fail-on-error: 'true'
       - archive:
           artifacts: 'results/*.*'
-          latest_only: false
-      - imagegallery:
-          title: '{my_description}'
-          includes: 'results/screenshot_*.png'
-          image-width: 300
+          latest-only: false
+      - image-gallery:
+          - title: '{my_description}'
+            includes: 'results/screenshot_*.png'
+            image-width: 300
       - email:
           recipients: '{my_recipients}'
     wrappers:
diff --git a/update_jdn.sh b/update_jdn.sh
index bfd2e0e8..2de1d31a 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -8,6 +8,7 @@ PVNAME=/dev/vdb      # LVM physical volume for jobs
 VGNAME=jenkins01     # LVM volume group
 STAMP=/var/log/jenkins/update-jenkins.stamp
 TMPFILE=$(mktemp)
+JJB=jenkins-job-builder
 
 explain() {
 	echo "$HOSTNAME: $1"
@@ -434,7 +435,7 @@ if [ "$HOSTNAME" = "jenkins" ] || [ "$HOSTNAME" = "jenkins-test-vm" ] ; then
 	rm -f $TMPFILE
 	for config in *.yaml ; do
 		if [ $config -nt $STAMP ] || [ ! -f $STAMP ] ; then
-			sudo jenkins-jobs update $config
+			$JJB update $config
 		else
 			echo "$config has not changed, nothing to do."
 		fi