X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Fovsdb.yaml;h=12798dde4e19b7bc62ba7076cdf04c4e82bfd8fc;hb=cb52af35b0fa1272dec4181513fd3227b4df9f4c;hp=189317cfa04b8820c1faced68d8b3a9e6d9f447b;hpb=fb2739d3662e7e6c0348ef7b21e92eecbec3c142;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 189317cfa..60064bd31 100644
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,84 +1,81 @@
+---
 - project:
-    name: ovsdb-carbon
+    name: ovsdb-fluorine
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: fluorine
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'master'
-    jdk: openjdk8
-    jdks:
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+    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]'
+
+    # Used by the release job
+    staging-profile-id: a68b188166958
+
+- project:
+    name: ovsdb-oxygen
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: oxygen
+    project: 'ovsdb'
+    project-name: 'ovsdb'
+    branch: 'stable/oxygen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'ovsdb-settings'
-    mvn-goals: 'clean install'
     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-boron
+    name: ovsdb-nitrogen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: nitrogen
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'stable/boron'
-    jdk: openjdk8
-    jdks:
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'ovsdb-settings'
-    mvn-goals: 'clean install'
     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-beryllium
+    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}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    stream: beryllium
+    stream: carbon
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+    branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
+    karaf-version: karaf3
     mvn-settings: 'ovsdb-settings'
-    mvn-goals: 'clean install'
     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