Feat: Branch cut for stable/sulfur stream

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

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 094b331fcecf8cf2b2f2b2ab7bf749255cc4e952..58709ec7301c7829f7828ef33cb8a34950615999 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,9 +1,10 @@
 ---
 - project:
-    name: ovsdb-sulfur
+    name: ovsdb-chlorine
     jobs:
       - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: ovsdb
@@ -12,7 +13,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: sulfur
+    stream: chlorine
     project: "ovsdb"
     project-name: "ovsdb"
     branch: "master"
@@ -26,10 +27,11 @@
     staging-profile-id: a68b188166958
 
 - project:
-    name: ovsdb-phosphorus
+    name: ovsdb-sulfur
     jobs:
       - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: ovsdb
@@ -38,10 +40,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: phosphorus
+    stream: sulfur
     project: "ovsdb"
     project-name: "ovsdb"
-    branch: "stable/phosphorus"
+    branch: "stable/sulfur"
     build-node: centos7-builder-4c-4g
     java-version: "openjdk11"
     mvn-settings: "ovsdb-settings"
@@ -52,7 +54,7 @@
     staging-profile-id: a68b188166958
 
 - project:
-    name: ovsdb-silicon
+    name: ovsdb-phosphorus
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -64,14 +66,13 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: silicon
+    stream: phosphorus
     project: "ovsdb"
     project-name: "ovsdb"
-    branch: "stable/silicon"
-    build-node: centos7-builder-2c-8g
+    branch: "stable/phosphorus"
+    build-node: centos7-builder-4c-4g
     java-version: "openjdk11"
     mvn-settings: "ovsdb-settings"
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
     email-upstream: "[ovsdb] [odlparent] [controller] [yangtools]"
 
@@ -79,7 +80,7 @@
     staging-profile-id: a68b188166958
 
 - project:
-    name: ovsdb-aluminium
+    name: ovsdb-silicon
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -91,10 +92,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: "ovsdb"
     project-name: "ovsdb"
-    branch: "stable/aluminium"
+    branch: "stable/silicon"
     build-node: centos7-builder-2c-8g
     java-version: "openjdk11"
     mvn-settings: "ovsdb-settings"
@@ -116,6 +117,7 @@
     build-node: centos7-builder-4c-4g
     build-timeout: 90
     java-version: "openjdk11"
+    mvn-version: mvn38
     mvn-settings: "ovsdb-settings"
     mvn-goals: "clean deploy javadoc:aggregate"
     sonarcloud: true