Merge "Exclude mininet-2.6 for Ubuntu 14.04"

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

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index b49de338d8c0f646c2da3b2ec3b7fe1a56918db2..766d13fa1860b03fa68a3387c75251457b6f4050 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -23,6 +23,7 @@
           project: '{project}'
           stream: '{stream}'
           branch: '{branch}'
+          lftools-version: '{lftools-version}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - autorelease-release-tag:
@@ -50,7 +51,7 @@
           refspec: '$GERRIT_REFSPEC'
           branches:
             - '$GERRIT_BRANCH'
-          choosing-strategy: 'gerrit'
+          choosing-strategy: default
           skip-tag: true
           submodule:
             recursive: true
@@ -75,6 +76,7 @@
           autorelease-settings: 'autorelease-settings'
           global-settings: 'odl-global-settings'
       - autorelease-generate-release-patches
+      - autorelease-generate-artifact-versions
       - autorelease-distribute-taglist
       - distribute-build-url:
           path: 'integration/distribution/$KARAF_ARTIFACT/src/main/assembly'
@@ -154,6 +156,7 @@
           project: releng/builder
           branch: '{branch}'
           stream: '{stream}'
+          lftools-version: '{lftools-version}'
 
     scm:
       - lf-infra-gerrit-scm:
@@ -213,6 +216,7 @@
           branch: '{branch}'
           stream: '{stream}'
           refspec: 'refs/heads/{branch}'
+          lftools-version: '{lftools-version}'
       - string:
           name: RELEASE_TAG
           default: '{next-release-tag}'
@@ -277,6 +281,7 @@
           project: '{project}'
           branch: '{branch}'
           stream: '{stream}'
+          lftools-version: '{lftools-version}'
 
     scm:
       - lf-infra-gerrit-scm:
@@ -320,7 +325,7 @@
     project-type: freestyle
     node: '{build-node}'
     concurrent: true
-    jdk: '{jdk}'
+    jdk: openjdk8
 
     properties:
       - lf-infra-properties:
@@ -331,6 +336,7 @@
           project: '{project}'
           stream: '{stream}'
           branch: '{branch}'
+          lftools-version: '{lftools-version}'
       - autorelease-release-tag:
           release-tag: validate
       - string: