X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-release-jobs.yaml;h=200b14b5f95224330b8aacfba4e35940a18380fb;hb=1873622e1b5bf98150db6850901d190dd6c35422;hp=328c65aa61ceaf3e9dc2d0c8d68b0cdd56ac8dca;hpb=1ee4662cfbe497af58e3f11d3edfecc378c5b0a3;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml
index 328c65aa..200b14b5 100644
--- a/jjb/lf-release-jobs.yaml
+++ b/jjb/lf-release-jobs.yaml
@@ -14,14 +14,6 @@
 - lf_release_common: &lf_release_common
     name: lf-release-common
 
-    ######################
-    # Default parameters #
-    ######################
-
-    gerrit_trigger_file_paths:
-      - compare-type: ANT
-        pattern: "releases/*.yaml"
-
     #####################
     # Job Configuration #
     #####################
@@ -38,6 +30,8 @@
           project: "{project}"
           branch: "$GERRIT_BRANCH"
           stream: "$GERRIT_BRANCH"
+      - lf-build-with-parameters-maven-release:
+          use-release-file: "{use-release-file}"
 
     publishers:
       - lf-infra-publish
@@ -58,6 +52,7 @@
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     gerrit-skip-vote: false
+    use-release-file: true
 
     gerrit_verify_triggers:
       - patchset-created-event:
@@ -66,7 +61,7 @@
           exclude-no-code-change: false
       - draft-published-event
       - comment-added-contains-event:
-          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
+          comment-contains-value: "^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$"
 
     #####################
     # Job Configuration #
@@ -76,6 +71,16 @@
 
     builders:
       - lf-infra-pre-build
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "^.*-docker-.*"
+          label: "{build-node}"
+          steps:
+            - lf-provide-maven-settings:
+                global-settings-file: "global-settings"
+                settings-file: "{mvn-settings}"
+            - shell: !include-raw-escape: ../shell/docker-login.sh
+            - lf-provide-maven-settings-cleanup
       - config-file-provider:
           files:
             - file-id: sigul-config
@@ -123,7 +128,9 @@
               branches:
                 - branch-compare-type: "ANT"
                   branch-pattern: "**"
-              file-paths: "{obj:gerrit_trigger_file_paths}"
+              file-paths:
+                - compare-type: REG_EXP
+                  pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
           skip-vote:
             successful: "{gerrit-skip-vote}"
             failed: "{gerrit-skip-vote}"
@@ -145,6 +152,7 @@
     build-timeout: 15
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
+    use-release-file: true
 
     gerrit_merge_triggers:
       - change-merged-event
@@ -159,6 +167,16 @@
 
     builders:
       - lf-infra-pre-build
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "^.*-docker-.*"
+          label: "{build-node}"
+          steps:
+            - lf-provide-maven-settings:
+                global-settings-file: "global-settings"
+                settings-file: "{mvn-settings}"
+            - shell: !include-raw-escape: ../shell/docker-login.sh
+            - lf-provide-maven-settings-cleanup
       - config-file-provider:
           files:
             - file-id: sigul-config
@@ -206,4 +224,6 @@
               branches:
                 - branch-compare-type: "ANT"
                   branch-pattern: "**"
-              file-paths: "{obj:gerrit_trigger_file_paths}"
+              file-paths:
+                - compare-type: REG_EXP
+                  pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'