Merge "Remove centinel carbon jobs"

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

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 652820f2622322e4dc6ab22c63101377011a3d2f..ee9d84b7fc9c83a7d7b058e005ef32051fb9d06c 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-    name: ovsdb-oxygen
+    name: ovsdb-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'master'
@@ -20,16 +20,16 @@
     staging-profile-id: a68b188166958
 
 - project:
-    name: ovsdb-nitrogen
+    name: ovsdb-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'stable/nitrogen'
+    branch: 'stable/oxygen'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'ovsdb-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -40,18 +40,17 @@
     staging-profile-id: a68b188166958
 
 - project:
-    name: ovsdb-carbon
+    name: ovsdb-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'stable/carbon'
+    branch: 'stable/nitrogen'
     build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
     mvn-settings: 'ovsdb-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'