X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-release-jobs.yaml;h=fbef3fae4774cfabea1323d52985791b6302a964;hb=5fe7f08ff027accd25c96df8bc3f88030f89ffb7;hp=3f226db45b05e2b6e5cc3d8260d1cdc490542da7;hpb=b90575cb41db51adb64514bafb85b37bda47b9c0;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml
index 3f226db4..fbef3fae 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 #
     #####################
@@ -33,17 +25,6 @@
       - lf-infra-properties:
           build-days-to-keep: 7
 
-    parameters:
-      - lf-infra-parameters:
-          project: "{project}"
-          branch: "master"
-          stream: "{stream}"
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: "{build-timeout}"
-          jenkins-ssh-credential: "{jenkins-ssh-release-credential}"
-
     publishers:
       - lf-infra-publish
 
@@ -58,13 +39,12 @@
     # Default parameters #
     ######################
 
-    branch: master
-    stream: master
     build-days-to-keep: 7
     build-timeout: 15
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     gerrit-skip-vote: false
+    use-release-file: true
 
     gerrit_verify_triggers:
       - patchset-created-event:
@@ -73,7 +53,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 #
@@ -81,8 +61,26 @@
 
     disabled: "{disable-job}"
 
+    parameters:
+      - lf-infra-parameters:
+          project: "{project}"
+          branch: "$GERRIT_BRANCH"
+          stream: "$GERRIT_BRANCH"
+      - lf-build-with-parameters-maven-release:
+          use-release-file: "{use-release-file}"
+
     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
@@ -98,22 +96,27 @@
       - lf-release
 
 - job-template:
-    name: "{project-name}-release-verify-{stream}"
+    name: "{project-name}-release-verify"
     id: gerrit-release-verify
     <<: *lf_release_common
     # yamllint disable-line rule:key-duplicates
     <<: *lf_release_verify
 
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+
     scm:
       - lf-infra-gerrit-scm:
           git-url: "{git-url}"
           refspec: "$GERRIT_REFSPEC"
-          branch: "master"
+          branch: "$GERRIT_BRANCH"
           submodule-disable: true
           submodule-recursive: false
           submodule-timeout: 10
           choosing-strategy: gerrit
-          jenkins-ssh-credential: "{jenkins-ssh-release-credential}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - gerrit:
@@ -124,8 +127,10 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
-                  branch-pattern: "**/{branch}"
-              file-paths: "{obj:gerrit_trigger_file_paths}"
+                  branch-pattern: "**"
+              file-paths:
+                - compare-type: REG_EXP
+                  pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
           skip-vote:
             successful: "{gerrit-skip-vote}"
             failed: "{gerrit-skip-vote}"
@@ -143,12 +148,11 @@
     # Default parameters #
     ######################
 
-    branch: master
-    stream: master
     build-days-to-keep: 7
     build-timeout: 15
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
+    use-release-file: true
 
     gerrit_merge_triggers:
       - change-merged-event
@@ -161,8 +165,31 @@
 
     disabled: "{disable-job}"
 
+    parameters:
+      - lf-infra-parameters:
+          project: "{project}"
+          branch: "$GERRIT_BRANCH"
+          stream: "$GERRIT_BRANCH"
+      - lf-build-with-parameters-maven-release:
+          use-release-file: "{use-release-file}"
+      - bool:
+          name: DRY_RUN
+          default: false
+          description: |
+            If DRY_RUN is enabled artifacts are not published.
+
     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
@@ -178,15 +205,20 @@
       - lf-release
 
 - job-template:
-    name: "{project-name}-release-merge-{stream}"
+    name: "{project-name}-release-merge"
     id: gerrit-release-merge
     <<: *lf_release_common
     # yamllint disable-line rule:key-duplicates
     <<: *lf_release_merge
 
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-release-credential}"
+
     scm:
       - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: "{jenkins-ssh-release-credential}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
           git-url: "{git-url}"
           refspec: "$GERRIT_REFSPEC"
           branch: "$GERRIT_BRANCH"
@@ -204,5 +236,7 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
-                  branch-pattern: "**/{branch}"
-              file-paths: "{obj:gerrit_trigger_file_paths}"
+                  branch-pattern: "**"
+              file-paths:
+                - compare-type: REG_EXP
+                  pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'