X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopenflowplugin%2Fopenflowplugin.yaml;h=a4478d62fd5869c4b77b81edb6db63298b29ae63;hb=dbaf11b391d13e7f17c8154ee120c1943bec37d5;hp=ae67c19f6af2b2723b7aade09f2bc35dd4eaca0b;hpb=b839a835f780cf9a899ca4275ae92f1e4aee5578;p=releng%2Fbuilder.git

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index ae67c19f6..a4478d62f 100644
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -1,9 +1,10 @@
 ---
 - project:
-    name: openflowplugin-silicon
+    name: openflowplugin-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
           doc-dir: .tox/docs/tmp/html
@@ -12,29 +13,28 @@
           rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17
 
-    stream: silicon
+    stream: sulfur
     project: "openflowplugin"
     project-name: "openflowplugin"
     branch: "master"
-    build-node: centos7-builder-2c-8g
+    build-node: centos8-builder-4c-4g
     build-timeout: 90
     java-version: "openjdk11"
     mvn-settings: "openflowplugin-settings"
     mvn-goals: "clean deploy javadoc:aggregate"
-    mvn-opts: "-Xmx1024m"
     dependencies: >
       odlparent-merge-{stream},
       yangtools-merge-{stream},
       controller-merge-{stream},
       openflowjava-merge-{stream}
     email-upstream: "[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]"
-
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
 - project:
-    name: openflowplugin-aluminium
+    name: openflowplugin-phosphorus
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -47,28 +47,26 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: phosphorus
     project: "openflowplugin"
     project-name: "openflowplugin"
-    branch: "stable/aluminium"
-    build-node: centos7-builder-2c-8g
+    branch: "stable/phosphorus"
+    build-node: centos7-builder-4c-4g
     build-timeout: 90
     java-version: "openjdk11"
     mvn-settings: "openflowplugin-settings"
     mvn-goals: "clean deploy javadoc:aggregate"
-    mvn-opts: "-Xmx1024m"
     dependencies: >
       odlparent-merge-{stream},
       yangtools-merge-{stream},
       controller-merge-{stream},
       openflowjava-merge-{stream}
     email-upstream: "[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]"
-
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
 - project:
-    name: openflowplugin-magnesium
+    name: openflowplugin-silicon
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -81,10 +79,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: silicon
     project: "openflowplugin"
     project-name: "openflowplugin"
-    branch: "stable/magnesium"
+    branch: "stable/silicon"
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     java-version: "openjdk11"
@@ -97,40 +95,6 @@
       controller-merge-{stream},
       openflowjava-merge-{stream}
     email-upstream: "[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]"
-
-    # Used by the release job
-    staging-profile-id: a68a76dc1b44c
-
-- project:
-    name: openflowplugin-sodium
-    jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          doc-dir: .tox/docs/tmp/html
-          project-pattern: openflowplugin
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
-          rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: sodium
-    project: "openflowplugin"
-    project-name: "openflowplugin"
-    branch: "stable/sodium"
-    build-node: centos7-builder-2c-8g
-    build-timeout: 90
-    mvn-settings: "openflowplugin-settings"
-    mvn-goals: "clean deploy javadoc:aggregate"
-    mvn-opts: "-Xmx1024m"
-    dependencies: >
-      odlparent-merge-{stream},
-      yangtools-merge-{stream},
-      controller-merge-{stream},
-      openflowjava-merge-{stream}
-    email-upstream: "[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]"
-
     # Used by the release job
     staging-profile-id: a68a76dc1b44c
 
@@ -142,12 +106,11 @@
     project: "openflowplugin"
     project-name: "openflowplugin"
     branch: "master"
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-4c-4g
     build-timeout: 90
     java-version: "openjdk11"
     mvn-settings: "openflowplugin-settings"
     mvn-goals: "clean deploy javadoc:aggregate"
-    mvn-opts: "-Xmx1024m"
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-api-token: "{sonarcloud_api_token}"