Merge "Add git-review to base system"

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

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index a2472d9925cdc38c8e001bb5b0dcf59c1909d4dd..3b3c7e581b87154ed0cf78f904cbf446efd6f1d8 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -6,17 +6,10 @@
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: carbon
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'master'
@@ -25,7 +18,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'yangtools-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -41,17 +34,10 @@
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: boron
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'stable/boron'
@@ -60,9 +46,9 @@
         - openjdk8
     maven:
         - mvn32:
-            mvn-version: '{mvn32}'
+            mvn-version: 'mvn32'
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'yangtools-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -78,15 +64,10 @@
         - '{project-name}-distribution-check-{stream}'
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: beryllium
     project: 'yangtools'
     project-name: 'yangtools'
     branch: 'stable/beryllium'
@@ -96,9 +77,9 @@
       - openjdk8
     maven:
         - mvn32:
-            mvn-version: '{mvn32}'
+            mvn-version: 'mvn32'
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'yangtools-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'