Remove project distribution job

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

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 1607e1d36527efdc27eecf32eabec13c34d7ca19..07cd2074f761286d76c47445923e325793cbdae2 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,23 +1,14 @@
-# ODL Releng build templates
 - project:
-    name: ovsdb-boron
+    name: ovsdb-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:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: carbon
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'master'
@@ -26,7 +17,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'ovsdb-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -35,34 +26,25 @@
     archive-artifacts: ''
 
 - project:
-    name: ovsdb-beryllium
+    name: ovsdb-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:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
-
+    stream: boron
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/boron'
+    jdk: openjdk8
     jdks:
-        - openjdk7
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'ovsdb-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -71,33 +53,26 @@
     archive-artifacts: ''
 
 - project:
-    name: ovsdb-lithium
+    name: ovsdb-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:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
-
+    stream: beryllium
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'stable/lithium'
+    branch: 'stable/beryllium'
     jdk: openjdk7
     jdks:
         - openjdk7
+        - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'ovsdb-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'