X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-maven-jobs.yaml;h=7a57470048b1b7404d7536c7e652908e0569ec88;hb=refs%2Fchanges%2F11%2F12311%2F1;hp=6112f91a5c32a2c36c55018c9e734f5da671c0fd;hpb=ab9889f17775e4716a50ecbe879d8519b56c6976;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 6112f91a..7a574700 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -11,7 +11,7 @@
     jobs:
       - gerrit-maven-clm
       - gerrit-maven-merge
-      - gerrit-maven-release
+      - gerrit-maven-stage
       - gerrit-maven-verify
       - gerrit-maven-verify-dependencies
 
@@ -25,7 +25,7 @@
     jobs:
       - github-maven-clm
       - github-maven-merge
-      - github-maven-release
+      - github-maven-stage
       - github-maven-verify
 
 - job-group:
@@ -162,6 +162,7 @@
     build-days-to-keep: 30  # 30 days for troubleshooting purposes
     build-timeout: 60
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-opts: ''
@@ -172,7 +173,7 @@
     stream: master
     submodule-recursive: true
 
-    nexus-iq-scan-patterns:
+    nexus_iq_scan_patterns:
       - '**/*.ear'
       - '**/*.jar'
       - '**/*.tar.gz'
@@ -223,7 +224,7 @@
           stage: '{nexus-iq-stage}'
           application-type: 'manual'
           application-id: '{project-name}'
-          scan-patterns: '{nexus-iq-scan-patterns}'
+          scan-patterns: '{obj:nexus_iq_scan_patterns}'
           fail-build-network-error: true
 
 - job-template:
@@ -271,7 +272,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -287,7 +288,7 @@
       - timed: 'H H * * 6'
       - github-pull-request:
           trigger-phrase: '^run-clm$'
-          only-trigger-phrase: false
+          only-trigger-phrase: true
           status-context: 'CLM'
           permit-all: true
           github-hooks: true
@@ -295,6 +296,8 @@
             - '{github-org}'
           white-list: '{obj:github_pr_whitelist}'
           admin-list: '{obj:github_pr_admin_list}'
+          white-list-target-branches:
+            - '{branch}'
 
 #########################
 # Maven Javadoc Publish #
@@ -311,6 +314,7 @@
     build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
     build-timeout: 60
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-opts: ''
@@ -388,7 +392,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -413,6 +417,8 @@
             - '{github-org}'
           white-list: '{obj:github_pr_whitelist}'
           admin-list: '{obj:github_pr_admin_list}'
+          white-list-target-branches:
+            - '{branch}'
 
 ########################
 # Maven Javadoc Verify #
@@ -429,6 +435,7 @@
     build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
     build-timeout: 60
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-opts: ''
@@ -504,7 +511,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -522,6 +529,8 @@
           status-context: 'Maven Javadoc Verify'
           permit-all: true
           github-hooks: true
+          white-list-target-branches:
+            - '{branch}'
 
 ###############
 # Maven Merge #
@@ -539,6 +548,7 @@
     build-timeout: 60
     cron: 'H H * * 0'  # push fresh snapshot weekly
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-goals: clean deploy
@@ -638,7 +648,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -663,14 +673,16 @@
             - '{github-org}'
           white-list: '{obj:github_pr_whitelist}'
           admin-list: '{obj:github_pr_admin_list}'
+          white-list-target-branches:
+            - '{branch}'
           included-regions: '{obj:github_included_regions}'
 
-#################
-# Maven Release #
-#################
+###############
+# Maven Stage #
+###############
 
-- lf_maven_release: &lf_maven_release
-    name: lf-maven-release
+- lf_maven_stage: &lf_maven_stage
+    name: lf-maven-stage
 
     ######################
     # Default parameters #
@@ -681,6 +693,7 @@
     build-timeout: 60
     cron: ''
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-goals: clean deploy
@@ -692,7 +705,7 @@
 
     gerrit_release_triggers:
       - comment-added-contains-event:
-          comment-contains-value: build release$
+          comment-contains-value: stage-release$
 
     #####################
     # Job Configuration #
@@ -718,11 +731,11 @@
       - lf-provide-maven-settings-cleanup
 
 - job-template:
-    name: '{project-name}-maven-release-{stream}'
-    id: gerrit-maven-release
+    name: '{project-name}-maven-stage-{stream}'
+    id: gerrit-maven-stage
     <<: *lf_maven_common
     # yamllint disable-line rule:key-duplicates
-    <<: *lf_maven_release
+    <<: *lf_maven_stage
 
     scm:
       - lf-infra-gerrit-scm:
@@ -746,17 +759,17 @@
                   branch-pattern: '**/{branch}'
 
 - job-template:
-    name: '{project-name}-maven-release-{stream}'
-    id: github-maven-release
+    name: '{project-name}-maven-stage-{stream}'
+    id: github-maven-stage
     <<: *lf_maven_common
     # yamllint disable-line rule:key-duplicates
-    <<: *lf_maven_release
+    <<: *lf_maven_stage
 
     properties:
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -775,6 +788,8 @@
           status-context: 'Maven Release'
           permit-all: true
           github-hooks: true
+          white-list-target-branches:
+            - '{branch}'
 
 ###############
 # Maven Sonar #
@@ -792,6 +807,7 @@
     build-timeout: 60
     cron: 'H H * * 6'  # run weekly
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-opts: ''
@@ -908,7 +924,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -926,6 +942,8 @@
           status-context: 'Maven Sonar'
           permit-all: true
           github-hooks: true
+          white-list-target-branches:
+            - '{branch}'
 
 ################
 # Maven Verify #
@@ -942,6 +960,7 @@
     build-days-to-keep: 7
     build-timeout: 60
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-goals: clean deploy
@@ -1034,7 +1053,7 @@
       - lf-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
       - github:
-          url: '{git-url}/{github-org}/{project}'
+          url: '{github-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
@@ -1052,6 +1071,8 @@
           status-context: 'Maven Verify'
           permit-all: true
           github-hooks: true
+          white-list-target-branches:
+            - '{branch}'
           included-regions: '{obj:github_included_regions}'
 
 #############################
@@ -1069,6 +1090,7 @@
     build-days-to-keep: 7
     build-timeout: 60
     git-url: '$GIT_URL/$PROJECT'
+    github-url: 'https://github.com'
     java-version: openjdk8
     mvn-global-settings: global-settings
     mvn-goals: clean deploy