Simplify val-autorelease and distro-check state definition

[releng/builder.git] / jjb / netconf / netconf.yaml

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index e769446825a5aad1deb1d2d716e49c64afa4b0a5..844b9e5bf5505e32d2ab644f8e8a5dd60adb42ad 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -10,10 +10,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'
@@ -42,10 +39,7 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: boron
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/boron'
@@ -73,16 +67,8 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
-            disable_autorelease: False
-            disable_distribution_check: False
 
+    stream: beryllium
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/beryllium'