Merge "Create Carbon jobs for csit"

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

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index e5f611a2618658f6800606bea8eff07805eef8d6..2709065f0a6f626a9529873498545cf5403a9845 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{name}-release-java'
+    name: '{project-name}-release-java'
 
     # Job template for producing a release candidate by creating a staging repo
     # in Nexus.
@@ -55,14 +55,14 @@
         - releng-stage-release
 
     publishers:
-        - archive-artifacts:
-            artifacts: '*.log'
         - email-notification:
             email-prefix: '[releng]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 
 - job-template:
-    name: '{name}-publish-p2repo'
+    name: '{project-name}-publish-p2repo'
 
     # Job template for publishing a p2 repo given a URL to a zipped p2repo.
 
@@ -108,11 +108,13 @@
     publishers:
         - email-notification:
             email-prefix: '[releng]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 # Python Related
 
 - job-template:
-    name: '{name}-verify-python-{stream}'
+    name: '{project-name}-verify-python-{stream}'
 
     # Job template for python verify jobs
     #
@@ -123,7 +125,7 @@
     #     stream:    release stream (eg. stable-lithium or beryllium)
     #     branch:    git branch (eg. stable/lithium or master)
     #     toxdir:    directory containing the project's tox.ini relative to
-    #                the workspace.
+    #                the workspace. Empty works if tox.ini is at project root.
 
     project-type: freestyle
     node: '{build-node}'
@@ -193,9 +195,11 @@
     publishers:
         - email-notification:
             email-prefix: '[{project}]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 - job-template:
-    name: '{name}-merge-rtd-{stream}'
+    name: '{project-name}-merge-rtd-{stream}'
     # Template for ReadTheDocs triggering
 
     project-type: freestyle
@@ -225,11 +229,13 @@
     publishers:
         - email-notification:
             email-prefix: '[{project}]'
+        - archive-build:
+            maven-version: '{mvn33}'
 
 # Node related
 
 - job-template:
-    name: '{name}-verify-node-{stream}'
+    name: '{project-name}-verify-node-{stream}'
 
     # Job template for python verify jobs
     #
@@ -318,3 +324,5 @@
     publishers:
         - email-notification:
             email-prefix: '[{project}]'
+        - archive-build:
+            maven-version: '{mvn33}'