Merge "Use odl-mdsal-benchmark feature in dsbenchmark jobs"

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 825c8313996b37aa6e887839ef1cfabf43cbc4b5..07799ed2e6818a95e59c06a412a3252e215d764a 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -24,3 +24,4 @@
         integration-test: stable-lithium
 
     project: 'releng/autorelease'
+    archive-artifacts: '**/*.prop **/*.log **/patches/*.bundle **/patches/*.patch **/patches/*.log **/*.log project-reports/*.log'

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 8485cb07efdcff86d7937d996cb3da6e92cd2607..60e7231ae093109328884694241d4b7018a2fd3a 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -75,8 +75,6 @@
         - autorelease-sys-stats
 
     publishers:
-    - archive-artifacts:
-        artifacts: '*.prop,*.log,patches/*.bundle,patches/*.patch,patches/*.log'
     - email-notification:
         email-prefix: '[autorelease]'
     - trigger-parameterized-builds:
@@ -84,6 +82,8 @@
           condition: UNSTABLE_OR_BETTER
           property-file: variables.prop
           fail-on-missing: true
+    - archive-build:
+        maven-version: '{mvn33}'
 
 - job-template:
     name: 'autorelease-project-report-{stream}'
@@ -135,8 +135,6 @@
         - autorelease-sys-stats
 
     publishers:
-    - archive-artifacts:
-        artifacts: '*.log,project-reports/*.log'
     - email-ext:
         attachments: 'project-reports/*.log'
         recipients: 'skitt@redhat.com thanh.ha@linuxfoundation.org'
@@ -150,6 +148,8 @@
 
             Archive also available on Jenkins at $BUILD_URL
         always: true
+    - archive-build:
+        maven-version: '{mvn33}'
 
 ###
 ### Maven Sites

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 63137322dbdd2c542c466555d7a3a961a42d2569..8d7a7c70958bf35f9dbea3a17578e0652b8f1926 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -18,7 +18,6 @@
             disable_distribution_check: False
     project: 'tsdr'
     project-name: 'tsdr'
-    branch: 'stable/beryllium'
     branch: 'master'
     jdk: openjdk8
     jdks:
@@ -54,7 +53,6 @@
     project: 'tsdr'
     project-name: 'tsdr'
     branch: 'stable/boron'
-    branch: 'master'
     jdk: openjdk8
     jdks:
         - openjdk8