Merge "Make builder jobs use a machine with less RAM"

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

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index f678b81eb55ccdbc61b68b791987537f0439544e..80e34c6e638a9e3e5346b7ffe902423ed64d6d0b 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -2,21 +2,13 @@
     name: topoprocessing-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{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: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'master'
@@ -25,7 +17,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'topoprocessing-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -37,21 +29,13 @@
     name: topoprocessing-boron
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{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: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'stable/boron'
@@ -60,7 +44,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'topoprocessing-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -73,18 +57,13 @@
     name: topoprocessing-beryllium
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
         - '{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: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'stable/beryllium'
@@ -94,40 +73,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-settings: 'topoprocessing-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
-
-
-- project:
-    name: topoprocessing-lithium
-    jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{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:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-    project: 'topoprocessing'
-    project-name: 'topoprocessing'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'topoprocessing-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -144,7 +90,7 @@
     branch: 'master'
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'topoprocessing-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'