Merge "Fix int/dist version in AR"

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

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index ae67c19f6af2b2723b7aade09f2bc35dd4eaca0b..a12acc733d83a4a9cae8ab94a25e962f08be70fc 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: openflowplugin-silicon
+    name: openflowplugin-phosphorus
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -13,7 +13,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: silicon
+    stream: phosphorus
     project: "openflowplugin"
     project-name: "openflowplugin"
     branch: "master"
@@ -34,7 +34,7 @@
     staging-profile-id: a68a76dc1b44c
 
 - project:
-    name: openflowplugin-aluminium
+    name: openflowplugin-silicon
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -47,10 +47,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: silicon
     project: "openflowplugin"
     project-name: "openflowplugin"
-    branch: "stable/aluminium"
+    branch: "stable/silicon"
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     java-version: "openjdk11"
@@ -68,7 +68,7 @@
     staging-profile-id: a68a76dc1b44c
 
 - project:
-    name: openflowplugin-magnesium
+    name: openflowplugin-aluminium
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -81,10 +81,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: "openflowplugin"
     project-name: "openflowplugin"
-    branch: "stable/magnesium"
+    branch: "stable/aluminium"
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     java-version: "openjdk11"
@@ -101,39 +101,6 @@
     # 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
-
 - project:
     name: openflowplugin-sonar
     jobs: