Standardize gerrit_[merge|verify]_triggers

[releng/global-jjb.git] / jjb / lf-maven-jobs.yaml

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index be9004e..cde9177 100644 (file)
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -116,12 +116,10 @@
     mvn-opts: ''
     mvn-params: ''
     mvn-version: mvn33
+    staging-profile-id: ''  # Unused in this job
     stream: master
     submodule-recursive: true
 
-    # Staging repos do not make sense for CLM jobs so set it blank.
-    staging-profile-id: ''
-
     #####################
     # Job Configuration #
     #####################
@@ -217,7 +215,7 @@
     #     :submodule-recursive: Whether to checkout submodules recursively.
     #         (default: true)
     #
-    #     :gerrit_javadoc_merge_triggers: Override Gerrit Triggers.
+    #     :gerrit_merge_triggers: Override Gerrit Triggers.
 
     ######################
     # Default parameters #
@@ -232,10 +230,11 @@
     mvn-opts: ''
     mvn-params: ''
     mvn-version: mvn33
+    staging-profile-id: ''  # Unused by the javadoc jobs
     stream: master
     submodule-recursive: true
 
-    gerrit_javadoc_merge_triggers:
+    gerrit_merge_triggers:
       - change-merged-event
       - comment-added-contains-event:
           comment-contains-value: remerge$
@@ -282,7 +281,7 @@
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_javadoc_merge_triggers}'
+          trigger-on: '{obj:gerrit_merge_triggers}'
           projects:
             - project-compare-type: ANT
               project-pattern: '{project}'
@@ -358,7 +357,7 @@
     #     :submodule-recursive: Whether to checkout submodules recursively.
     #         (default: true)
     #
-    #     :gerrit_javadoc_verify_triggers: Override Gerrit Triggers.
+    #     :gerrit_verify_triggers: Override Gerrit Triggers.
 
     ######################
     # Default parameters #
@@ -373,12 +372,13 @@
     mvn-opts: ''
     mvn-params: ''
     mvn-version: mvn33
+    staging-profile-id: ''  # Unused by the javadoc jobs
     stream: master
     submodule-recursive: true
 
-    gerrit_javadoc_verify_triggers:
+    gerrit_verify_triggers:
       - patchset-created-event:
-          exclude-drafts: false
+          exclude-drafts: true
           exclude-trivial-rebase: false
           exclude-no-code-change: false
       - draft-published-event
@@ -419,7 +419,7 @@
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_javadoc_verify_triggers}'
+          trigger-on: '{obj:gerrit_verify_triggers}'
           projects:
             - project-compare-type: ANT
               project-pattern: '{project}'
@@ -473,12 +473,14 @@
     # directory can then be reused later to deploy to Nexus.
     #
     # Required parameters:
-    #     build-node:    The node to run build on.
-    #     jenkins-ssh-credential: Credential to use for SSH. (Generally should
-    #                             be configured in defaults.yaml)
-    #     mvn-settings: The name of settings file containing credentials for
-    #                   the project.
-    #     staging-profile-id: Profile ID of the project's Nexus staging profile.
+    #     :build-node: The node to run build on.
+    #     :jenkins-ssh-credential: Credential to use for SSH. (Generally should
+    #                              be configured in defaults.yaml)
+    #     :mvn-settings: The name of settings file containing credentials for
+    #                    the project.
+    #     :mvn-staging-id: Maven Server ID from settings.xml to pull credentials from.
+    #         (Note: This setting should be configured in defaults.yaml.)
+    #     :staging-profile-id: Profile ID of the project's Nexus staging profile.
     #
     # Optional parameters:
     #     :gerrit_verify_triggers: Override Gerrit Triggers.
@@ -521,7 +523,7 @@
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
       - lf-infra-create-netrc:
-          server-id: opendaylight-staging
+          server-id: '{mvn-staging-id}'
       - shell: !include-raw-escape:
           - ../shell/lftools-install.sh
           - ../shell/common-variables.sh
@@ -642,6 +644,7 @@
     mvn-opts: ''
     mvn-params: ''
     mvn-version: mvn33
+    staging-profile-id: ''  # Unused in this job
     stream: master
     submodule-recursive: true
 
@@ -649,9 +652,6 @@
       - comment-added-contains-event:
           comment-contains-value: run-sonar$
 
-    # Staging repos do not make sense for CLM jobs so set it blank.
-    staging-profile-id: ''
-
     #####################
     # Job Configuration #
     #####################
@@ -802,12 +802,13 @@
     mvn-opts: ''
     mvn-params: '-Dstream=$STREAM'
     mvn-version: mvn33
+    staging-profile-id: ''  # Unused in this job
     stream: master
     submodule-recursive: true
 
     gerrit_verify_triggers:
       - patchset-created-event:
-          exclude-drafts: false
+          exclude-drafts: true
           exclude-trivial-rebase: false
           exclude-no-code-change: false
       - draft-published-event