X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-maven-jobs.yaml;h=eaa4ef87a965d7277aba32c8fe3eeb18cf6ddfac;hb=0a73ead08015c47fe48c55645208dde65f4e83f5;hp=be9004e251b0e7d9117e907b56a5987b9da98b7b;hpb=e399aea1a5da089f150fa847478ea53354945e00;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index be9004e2..eaa4ef87 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -232,6 +232,7 @@
     mvn-opts: ''
     mvn-params: ''
     mvn-version: mvn33
+    staging-profile-id: ''  # Unused by the javadoc jobs
     stream: master
     submodule-recursive: true
 
@@ -373,12 +374,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:
       - patchset-created-event:
-          exclude-drafts: false
+          exclude-drafts: true
           exclude-trivial-rebase: false
           exclude-no-code-change: false
       - draft-published-event
@@ -473,12 +475,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 +525,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
@@ -807,7 +811,7 @@
 
     gerrit_verify_triggers:
       - patchset-created-event:
-          exclude-drafts: false
+          exclude-drafts: true
           exclude-trivial-rebase: false
           exclude-no-code-change: false
       - draft-published-event