Fix version number extraction for all cases

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

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index eb2c701..9671ebb 100644 (file)
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -725,15 +725,9 @@
           sign-artifacts: '{sign-artifacts}'
           sign-dir: '$WORKSPACE/m2repo'
       - lf-maven-stage
-      - conditional-step:
-          condition-kind: boolean-expression
-          condition-expression: '{mvn-central}'
-          steps:
-            - lf-infra-create-netrc:
-                server-id: 'ossrh'
-            - inject:
-                properties-content: 'OSSRH_PROFILE_ID={ossrh-profile-id}'
-            - shell: !include-raw-escape: ../shell/maven-central.sh
+      - lf-maven-central:
+          mvn-central: '{mvn-central}'
+          ossrh-profile-id: '{ossrh-profile-id}'
       - lf-provide-maven-settings-cleanup
 
 - job-template:
@@ -947,12 +941,18 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
+      # Build weekly on Saturdays
+      - timed: 'H H * * 6'
       - github-pull-request:
           trigger-phrase: '^run-sonar$'
-          only-trigger-phrase: false
+          only-trigger-phrase: true
           status-context: 'Maven Sonar'
           permit-all: true
           github-hooks: true
+          org-list:
+            - '{github-org}'
+          white-list: '{obj:github_pr_whitelist}'
+          admin-list: '{obj:github_pr_admin_list}'
           white-list-target-branches:
             - '{branch}'