Revert "Switch global-jjb to lfdocs-conf"

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

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 47c2555..8b3f3ac 100644 (file)
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -10,6 +10,7 @@
     # TODO: Add Maven Merge job to this list once it's been fully tested.
     jobs:
       - gerrit-maven-clm
+      - gerrit-maven-merge
       - gerrit-maven-release
       - gerrit-maven-verify
       - gerrit-maven-verify-dependencies
@@ -23,6 +24,7 @@
     # TODO: Add Maven Merge job to this list once it's been fully tested.
     jobs:
       - github-maven-clm
+      - github-maven-merge
       - github-maven-release
       - github-maven-verify
 
@@ -53,6 +55,21 @@
 - lf_maven_common: &lf_maven_common
     name: lf-maven-common
 
+    ######################
+    # Default parameters #
+    ######################
+
+    archive-artifacts: >
+      **/*.log
+      **/hs_err_*.log
+      **/target/**/feature.xml
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/target/surefire-reports/*-output.txt
+
+    #####################
+    # Job Configuration #
+    #####################
+
     project-type: freestyle
     node: '{build-node}'
     jdk: '{java-version}'
@@ -101,7 +118,6 @@
     # Default parameters #
     ######################
 
-    archive-artifacts: ''
     branch: master
     build-days-to-keep: 30  # 30 days for troubleshooting purposes
     build-timeout: 30
@@ -215,7 +231,6 @@
     # Default parameters #
     ######################
 
-    archive-artifacts: ''
     branch: master
     build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
     build-timeout: 30
@@ -329,7 +344,6 @@
     # Default parameters #
     ######################
 
-    archive-artifacts: ''
     branch: master
     build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
     build-timeout: 30
@@ -440,7 +454,6 @@
     # Default parameters #
     ######################
 
-    archive-artifacts: ''
     branch: master
     build-days-to-keep: 30  # 30 days in case we need to troubleshoot
     build-timeout: 30
@@ -571,7 +584,6 @@
     # Default parameters #
     ######################
 
-    archive-artifacts: ''
     branch: master
     build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
     build-timeout: 30
@@ -683,7 +695,6 @@
     # Default parameters #
     ######################
 
-    archive-artifacts: ''
     branch: master  # Sonar should always be run on master branch
     build-days-to-keep: 7
     build-timeout: 30
@@ -834,7 +845,6 @@
     # Default parameters #
     ######################
 
-    archive-artifacts: ''
     branch: master
     build-days-to-keep: 7
     build-timeout: 60
@@ -956,7 +966,6 @@
     # Default parameters #
     ######################
 
-    archive-artifacts: ''
     branch: master
     build-days-to-keep: 7
     build-timeout: 60