X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-gradle-jobs.yaml;h=ba15f11915578998d50f7f70ccc6ed89a34c29c1;hb=refs%2Ftags%2Fv0.90.2;hp=b7b93702c8ed77e9ef90cfc5e274cad610e41921;hpb=5f41e6372b08ff7eff1beb4bd0f02aaf584203cb;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-gradle-jobs.yaml b/jjb/lf-gradle-jobs.yaml
index b7b93702..ba15f119 100644
--- a/jjb/lf-gradle-jobs.yaml
+++ b/jjb/lf-gradle-jobs.yaml
@@ -59,7 +59,7 @@
     publishers:
       - lf-infra-publish
 
-    gerrit_gradle_triggers:
+    gerrit_gradle_verify_triggers:
       - patchset-created-event:
           exclude-drafts: true
           exclude-trivial-rebase: false
@@ -68,6 +68,11 @@
       - comment-added-contains-event:
           comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
 
+    gerrit_gradle_merge_triggers:
+      - change-merged-event
+      - comment-added-contains-event:
+          comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$'
+
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: ".*"
@@ -99,13 +104,13 @@
           submodule-recursive: "{submodule-recursive}"
           submodule-timeout: "{submodule-timeout}"
           submodule-disable: "{submodule-disable}"
-          choosing-strategy: default
+          choosing-strategy: gerrit
 
     triggers:
       - timed: "{obj:cron}"
       - gerrit:
           server-name: "{gerrit-server-name}"
-          trigger-on: "{obj:gerrit_gradle_triggers}"
+          trigger-on: "{obj:gerrit_gradle_verify_triggers}"
           projects:
             - project-compare-type: ANT
               project-pattern: "{project}"
@@ -126,8 +131,11 @@
       - lf-infra-docker-login:
           global-settings-file: "global-settings"
           settings-file: "{mvn-settings}"
-      - shell: |
-          ./gradlew build
+      - gradle:
+          wrapper: "{wrapper}"
+          executable: true
+          tasks: |
+            build
 
     scm:
       - lf-infra-github-scm:
@@ -149,3 +157,46 @@
           github-hooks: true
           white-list-target-branches:
             - "{branch}"
+
+- job-template:
+    name: "{project-name}-gradle-publish-jar-{stream}"
+    id: gerrit-gradle-publish-jar
+    <<: *lf_gradle_common
+
+    builders:
+      - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
+      - lf-infra-docker-login:
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
+      - gradle:
+          wrapper: "{wrapper}"
+          executable: true
+          tasks: |
+            shadowJar
+            publish
+
+    scm:
+      - lf-infra-gerrit-scm:
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          git-url: "{git-url}"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "$GERRIT_BRANCH"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
+          choosing-strategy: default
+
+    triggers:
+      - timed: "{obj:cron}"
+      - gerrit:
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_gradle_merge_triggers}"
+          projects:
+            - project-compare-type: ANT
+              project-pattern: "{project}"
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: "**/{branch}"
+              file-paths: "{obj:gerrit_trigger_file_paths}"