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

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index e18ea7e82..a4478d62f 100644
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -1,162 +1,132 @@
 ---
 - project:
-    name: openflowplugin-sodium
+    name: openflowplugin-sulfur
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
+      - "{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
-
-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
-    block_on_csit: false
-
-    stream: sodium
-    project: 'openflowplugin'
-    project-name: 'openflowplugin'
-    branch: 'master'
-    build-node: centos7-builder-2c-8g
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17
+
+    stream: sulfur
+    project: "openflowplugin"
+    project-name: "openflowplugin"
+    branch: "master"
+    build-node: centos8-builder-4c-4g
     build-timeout: 90
-    mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean deploy javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: "openjdk11"
+    mvn-settings: "openflowplugin-settings"
+    mvn-goals: "clean deploy javadoc:aggregate"
     dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream}
-    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
-
+      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-neon
+    name: openflowplugin-phosphorus
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-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
-
-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
-    block_on_csit: false
-
-    stream: neon
-    project: 'openflowplugin'
-    project-name: 'openflowplugin'
-    branch: 'stable/neon'
-    build-node: centos7-builder-2c-8g
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    stream: phosphorus
+    project: "openflowplugin"
+    project-name: "openflowplugin"
+    branch: "stable/phosphorus"
+    build-node: centos7-builder-4c-4g
     build-timeout: 90
-    mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean deploy javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: "openjdk11"
+    mvn-settings: "openflowplugin-settings"
+    mvn-goals: "clean deploy javadoc:aggregate"
     dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream}
-    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
-
+      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-fluorine
+    name: openflowplugin-silicon
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-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-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: fluorine
-    project: 'openflowplugin'
-    project-name: 'openflowplugin'
-    branch: 'stable/fluorine'
+    stream: silicon
+    project: "openflowplugin"
+    project-name: "openflowplugin"
+    branch: "stable/silicon"
     build-node: centos7-builder-2c-8g
     build-timeout: 90
-    mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean deploy javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    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]'
-
+      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-oxygen
+    name: openflowplugin-sonar
     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
+      - gerrit-maven-sonar
 
-    stream: oxygen
-    project: 'openflowplugin'
-    project-name: 'openflowplugin'
-    branch: 'stable/oxygen'
-    build-node: centos7-builder-2c-8g
+    project: "openflowplugin"
+    project-name: "openflowplugin"
+    branch: "master"
+    build-node: centos7-builder-4c-4g
     build-timeout: 90
-    mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean deploy javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream}
-    email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]'
-    disable-job: true
-
-    # Used by the release job
-    staging-profile-id: a68a76dc1b44c
+    java-version: "openjdk11"
+    mvn-settings: "openflowplugin-settings"
+    mvn-goals: "clean deploy javadoc:aggregate"
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
-    name: openflowplugin-sonar
+    name: openflowplugin-info
     jobs:
-      - gerrit-maven-sonar
-
-    project: 'openflowplugin'
-    project-name: 'openflowplugin'
-    branch: 'master'
-    build-node: centos7-builder-2c-8g
-    build-timeout: 90
-    mvn-settings: 'openflowplugin-settings'
-    mvn-goals: 'clean deploy javadoc:aggregate'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      - gerrit-info-yaml-verify
+    project: openflowplugin
+    project-name: openflowplugin
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: openflowplugin-view
     views:
       - project-view
-    project-name: 'openflowplugin'
-
-- project:
-    name: openflowplugin-oxygen-view
-    views:
-      - common-view
-    view-name: 'openflowplugin-oxygen'
-    view-regex: '^openflowplugin-.*-oxygen'
+    project-name: "openflowplugin"