Revert "Preserve Karaf logs in autorelease jobs"

[releng/builder.git] / jjb / autorelease / autorelease-templates.yaml

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 560f30a362a3eb9be8444947c65a47bd7202d3ee..7f1d6b76ca33e9c0aa1ad51863c7a6f2bfa28727 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -54,11 +54,12 @@
 - job-template:
     name: 'autorelease-release-{stream}'
 
-    ############
-    # Defaults #
-    ############
+    ######################
+    # Default parameters #
+    ######################
 
     build-node: '{build-node}'
+    cron: 'H 0 * * *'
     java-version: openjdk8
     mvn-version: mvn33
     extra-mvn-opts: ''
@@ -70,7 +71,6 @@
     project-type: freestyle
     node: '{build-node}'
     jdk: '{java-version}'
-    cron: 'H 0 * * *'
 
     properties:
       - lf-infra-properties:
@@ -153,7 +153,6 @@
               $EXTRA_MVN_OPTS
               -Pintegrationtests,docs,repoBuild
               -Dcheckstyle.skip=true
-              -Dkaraf.keep.unpack=true
               -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage
               {opendaylight-infra-mvn-opts}
           java-opts:
@@ -173,11 +172,6 @@
       - shell: |
           mkdir -p archives/
           cp *.log *.prop $_
-          for file in $(find . -name karaf.log); do
-              module="${{file%%/target/*}}"
-              module="${{module##*/}}"
-              cp "$file" "archives/${{module}}-karaf.log"
-          done
 
     publishers:
       - opendaylight-infra-notify-status
@@ -210,6 +204,17 @@
 
 - job-template:
     name: autorelease-update-validate-jobs-{stream}
+
+    ######################
+    # Default parameters #
+    ######################
+
+    cron: '@weekly'
+
+    #####################
+    # Job configuration #
+    #####################
+
     project-type: freestyle
     node: centos7-builder-2c-1g
 
@@ -234,6 +239,7 @@
           choosing-strategy: default
 
     triggers:
+      - timed: '{cron}'
       - gerrit:
           server-name: '{gerrit-server-name}'
           trigger-on:
@@ -494,7 +500,6 @@
           goals: |
               clean validate
               -Pq
-              -Dkaraf.keep.unpack=true
               {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
@@ -505,11 +510,6 @@
       - shell: |
           mkdir -p archives/
           cp *.log $_
-          for file in $(find . -name karaf.log); do
-              module="${{file%%/target/*}}"
-              module="${{module##*/}}"
-              cp "$file" "archives/${{module}}-karaf.log"
-          done
 
     publishers:
       - email-notification: