Merge "Switch global-jjb jobs to use mvn35"

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

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index 10917810ad800e4f8455da46f69fe7e6b25f6259..45fda0b3218e3e9445a5490e8cea136b51214b83 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -9,7 +9,8 @@
     # Default parameters #
     ######################
 
-    mvn-version: mvn33
+    java-version: openjdk8
+    mvn-version: mvn35
 
     #####################
     # Job Configuration #
@@ -23,7 +24,7 @@
     project-type: freestyle
     node: 'centos7-builder-8c-8g'
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -36,6 +37,8 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
+      - integration-distribution-stream:
+          stream: '{stream}'
       - integration-distribution-git-url:
           git-url: '{git-url}'
       - distribution-karaf-version:
@@ -69,6 +72,8 @@
 
     builders:
       - distribution-check-wipe
+      - inject:
+          properties-file: 'allowed_projects.txt'
       - distribution-check-build-project:
           pom: '$GERRIT_PROJECT/pom.xml'
           mvn-opts: '{opendaylight-infra-mvn-opts}'