X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fmdsal%2Fmdsal.yaml;h=2f9a39a92e283e9fe73a6aedba1ec320d243bd61;hb=40cd0dcce74258b1f890881773514c12ae0e3284;hp=53a64638562fbea71d7942afed5d3de0fa8f2cba;hpb=ed9d1200f2d0a1b8bcc2186170550d831ea3c11b;p=releng%2Fbuilder.git

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 53a646385..2f9a39a92 100644
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -1,85 +1,46 @@
 ---
 - project:
-    name: mdsal-oxygen
+    name: mdsal-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - '{project-name}-distribution-check-{stream}':
+          mvn-version: 'mvn35'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[mdsal] [odlparent] [yangtools]'
-    archive-artifacts: ''
-
-    # Used by the release job
-    staging-profile-id: a674173c7b29d
-
-- project:
-    name: mdsal-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
-
-    stream: nitrogen
-    project: 'mdsal'
-    project-name: 'mdsal'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
+    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-carbon
+    name: mdsal-oxygen
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
+      - '{project-name}-distribution-check-{stream}':
+          mvn-version: 'mvn35'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'mdsal'
     project-name: 'mdsal'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
+    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a674173c7b29d
@@ -87,10 +48,11 @@
 - project:
     name: mdsal-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'master'
+    build-node: centos7-builder-8c-8g
     mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean install -Dintegrationtests'
+    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'