X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Fovsdb.yaml;h=2e745ee31961a349a785993dd2371389f96b6541;hb=0e0e34daa29f5cd386428cc72571b1e3dee6abfa;hp=ac2760784489acdb1854da41de84862f58537f6f;hpb=095880b5d82b82c0ed8725ff9aedc3a6d12b6652;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index ac27607844..2e745ee319 100644
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,13 +1,12 @@
 ---
 - project:
-    name: ovsdb-oxygen
+    name: ovsdb-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'master'
@@ -16,52 +15,26 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68b188166958
 
 - project:
-    name: ovsdb-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'ovsdb'
-    project-name: 'ovsdb'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'ovsdb-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
-
-    # Used by the release job
-    staging-profile-id: a68b188166958
-
-- project:
-    name: ovsdb-carbon
+    name: ovsdb-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'stable/carbon'
+    branch: 'stable/oxygen'
     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}'
     email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68b188166958