Merge "Remove Mongo dependency from Spectrometer"

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

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 29370953915526319606ed91921013d09f292ae4..5c40b899e4e6885e8608bbe1612a03147e0fd95e 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -6,16 +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: 'tsdr'
     project-name: 'tsdr'
     branch: 'master'
@@ -24,7 +18,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'tsdr-settings'
     mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -40,16 +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: 'tsdr'
     project-name: 'tsdr'
     branch: 'stable/boron'
@@ -58,7 +46,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'tsdr-settings'
     mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -74,13 +62,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: 'tsdr'
     project-name: 'tsdr'
     branch: 'stable/beryllium'
@@ -90,7 +75,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'tsdr-settings'
     mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'