Merge "Remove basic test suites"

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

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index 9bdbd51d26f36d2910b080c886952f32999dd3fa..d830b59a8bd9aa607117d224057c92ee49f5d3c6 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -7,7 +7,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -45,7 +45,7 @@
           global-settings-file: 'global-settings'
           settings-file: 'autorelease-settings'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           pom: 'pom.xml'
           goals: >
               clean deploy -V -B
@@ -75,7 +75,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     parameters:
       - opendaylight-infra-parameters:
@@ -94,12 +94,12 @@
       - wipe-org-opendaylight-repo
       - jacoco-nojava-workaround
       - releng-fetch-p2zip-if-necessary:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           settings: '{mvn-settings}'
           global-settings: 'global-settings'
       - releng-generate-p2pom
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           pom: 'pom.xml'
           goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r'
           settings: '{mvn-settings}'
@@ -107,7 +107,7 @@
           global-settings: 'global-settings'
           global-settings-type: cfp
       - releng-update-p2composite-metadata:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           settings: '{mvn-settings}'
           global-settings: 'global-settings'