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

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index eaa4ef87..cde9177e 100644
--- 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 #
@@ -236,7 +234,7 @@
     stream: master
     submodule-recursive: true
 
-    gerrit_javadoc_merge_triggers:
+    gerrit_merge_triggers:
       - change-merged-event
       - comment-added-contains-event:
           comment-contains-value: remerge$
@@ -283,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}'
@@ -359,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 #
@@ -378,7 +376,7 @@
     stream: master
     submodule-recursive: true
 
-    gerrit_javadoc_verify_triggers:
+    gerrit_verify_triggers:
       - patchset-created-event:
           exclude-drafts: true
           exclude-trivial-rebase: false
@@ -421,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}'
@@ -646,6 +644,7 @@
     mvn-opts: ''
     mvn-params: ''
     mvn-version: mvn33
+    staging-profile-id: ''  # Unused in this job
     stream: master
     submodule-recursive: true
 
@@ -653,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 #
     #####################
@@ -806,6 +802,7 @@
     mvn-opts: ''
     mvn-params: '-Dstream=$STREAM'
     mvn-version: mvn33
+    staging-profile-id: ''  # Unused in this job
     stream: master
     submodule-recursive: true