Merge "Do not run determine-merge-order script on Beryllium"

[releng/builder.git] / jjb / releng-templates-java.yaml

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 9904fa7b79fea124b0608c69afe17803bb41917c..87e2a26ad24292703d7f00a40efbc86da99eaf88 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -135,7 +135,7 @@
     #            the patch, and triggers the distribution deploy test
 
     name: '{project-name}-distribution-check-{stream}'
-    disabled: '{obj:disable_distribution_check}'
+    disabled: false
 
     project-type: freestyle
     node: '{build-node}'
@@ -154,7 +154,8 @@
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
             artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
-        - integration-distribution-git-url
+        - integration-distribution-git-url:
+            git-url: '{git-url}'
 
     scm:
         - integration-gerrit-scm:
@@ -173,29 +174,11 @@
             build-timeout: '60'
 
     triggers:
-        - gerrit:
-            server-name: 'OpenDaylight'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'true'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'true'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'redistcheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-            skip-vote:
-                successful: false
-                failed: false
-                unstable: false
-                notbuilt: false
+        - gerrit-trigger-patch-submitted:
+            server: '{server-name}'
+            project: '{project}'
+            branch: '{branch}'
+            files: '**'
 
     builders:
         - maven-target:
@@ -351,6 +334,7 @@
     triggers:
         - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
+            server-name: '{server-name}'
             name: '{project}'
             branch: '{branch}'
 
@@ -514,7 +498,9 @@
     triggers:
         - timed: 'H H * * 6'
         - gerrit-trigger-patch-sonar:
+            server-name: '{server-name}'
             name: '{project}'
+            # FIXME: Make sure this does not alter Gerrit votes, then update docs.
 
     builders:
         - jacoco-nojava-workaround
@@ -554,7 +540,7 @@
 
 - job-template:
     name: '{project-name}-validate-autorelease-{stream}'
-    disabled: '{obj:disable_autorelease}'
+    disabled: false
 
     project-type: freestyle
     node: '{build-node}'
@@ -576,7 +562,7 @@
             release-branch: '{branch}'
         - string:
             name: CLONE_URL
-            default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/releng/autorelease'
+            default: '{git-url}/releng/autorelease'
             description: "Autorelease clone URL"
 
     scm:
@@ -596,27 +582,11 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit:
-            server-name: 'OpenDaylight'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'true'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'true'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'revalidate'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: '**/*.xml'
+        - gerrit-trigger-patch-submitted:
+            server: '{server-name}'
+            project: '{project}'
+            branch: '{branch}'
+            files: '**/*.xml'
 
     builders:
         - jacoco-nojava-workaround
@@ -688,8 +658,10 @@
 
     triggers:
         - gerrit-trigger-patch-submitted:
-            name: '{project}'
+            server: '{server-name}'
+            project: '{project}'
             branch: '{branch}'
+            files: '**'
 
     builders:
         - jacoco-nojava-workaround