Update jobs for jenkins-job-builder 6.4.2

diff --git a/jenkins/pgapt-jobs.yaml b/jenkins/pgapt-jobs.yaml
index cad33ac70b17b90c508f34f090302a7eadc2f9ac..a628fe93328aea46b0d8a3fa1d8dc971d4198b73 100644 (file)
--- a/jenkins/pgapt-jobs.yaml
+++ b/jenkins/pgapt-jobs.yaml
@@ -3,7 +3,7 @@
 - defaults:
     name: global
 
-    properties:
+    properties: &properties
         - &build_discarder_property
           build-discarder:
             days-to-keep: 180
@@ -13,14 +13,6 @@
         - &copyartifact_property
           copyartifact:
             projects: '*'
-    properties_with_throttle: &properties_with_throttle
-        - *build_discarder_property
-        - *copyartifact_property
-        - throttle:
-            option: category
-            categories: [ test-and-snapshot ]
-            matrix-builds: false
-            matrix-configs: true
 
     wrappers:
         - timestamps
@@ -54,9 +46,6 @@
     beta-cron: ''
     snapshot-cron: ''
 
-- yamltemplates:
-    name: yamltemplates
-
     revision_string: &revision_string
         name: revision
         default: '1'
@@ -372,7 +361,7 @@
                                 disable: '{disable_submodules}'
                                 recursive: true
                         clean:
-                                before: true
+                                before: {}
 
 - job-template:
         <<: *git_source_template
@@ -503,7 +492,7 @@
         <<: *binaries_template
         name: '{name}-binaries-snapshot'
         id: 'binaries-snapshot'
-        properties: *properties_with_throttle
+        properties: *properties
         parameters:
                 - string: *supported_versions_param
                 - string: *deb_build_options_param
@@ -532,7 +521,7 @@
 
             {notes}
         project-type: matrix
-        properties: *properties_with_throttle
+        properties: *properties
         execution-strategy:
                 combination-filter: *filter_pattern
                 touchstone:
@@ -570,7 +559,7 @@
         id: 'upgrade'
         description: 'Test upgrades from PostgreSQL {oldversion} to {newversion}'
         project-type: matrix
-        properties: *properties_with_throttle
+        properties: *properties
         parameters:
                 - matrix-combinations: *matrix_combination_parameter
         execution-strategy:
@@ -834,10 +823,10 @@
                         which-build: upstream-build
                         fallback-to-last-successful: true
                         do-not-fingerprint: true
-                - shell: 'c=$(ls */*.changes | head -1); echo "${c##*/} ($queue, $upload)" > version.txt'
+                - shell: 'c=$(ls */*.changes | head -1); echo "${{c##*/}} ($queue, $upload)" > version.txt'
                 - build-name-setter: &build_name_setter_plain
                         <<: *build_name_setter
-                        template: '#${BUILD_NUMBER} '
+                        template: '#${{BUILD_NUMBER}} '
                 - shell: '$HOME/apt.postgresql.org/jenkins/dput-pgdg $queue'
         publishers:
                 - ircbot:
@@ -902,7 +891,7 @@
                           sudo schroot -c $(basename $session) -e
                           rc=1
                         done
-                        exit ${rc:-0}
+                        exit ${{rc:-0}}
         publishers:
                 - ircbot:
                         strategy: any-failure