Merge "Make distribution-check job an ODL-releng templated job"

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

diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml
index 0929863663f3201ebf382765081e6ee3f53e3445..476b044d83fdf000430c341134c98bf5e7c6c1b6 100644 (file)
--- a/jjb/integration/distribution/distribution.yaml
+++ b/jjb/integration/distribution/distribution.yaml
@@ -19,7 +19,6 @@
             jdk: openjdk8
             jdks:
                 - openjdk8
-                - openjdk7
             disable_autorelease: False
         - beryllium:
             branch: 'stable/beryllium'
@@ -39,10 +38,11 @@
 
 - job-template:
     name: 'distribution-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -99,6 +99,7 @@
 
 - job-template:
     name: 'distribution-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify