X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgenius%2Fgenius.yaml;h=ee4fad157806f9ccf9831d7d6f82d1e8047041aa;hb=6737d651d0b72d9f2a4a127bee152da831d0a917;hp=e70e2fa96974eecc9c826225c4d5e52c33db201c;hpb=bac8fa8f1bbaafa4a430bf5da708b18b04d2480e;p=releng%2Fbuilder.git

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index e70e2fa96..ee4fad157 100644
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -1,127 +1,64 @@
 ---
 - project:
-    name: genius-fluorine
+    name: genius-master
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: genius
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
           rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: fluorine
-    project: 'genius'
-    project-name: 'genius'
-    branch: 'master'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    stream: master
+    project: "genius"
+    project-name: "genius"
+    branch: "master"
+    build-node: centos7-builder-4c-4g
+    java-version: "openjdk11"
+    mvn-settings: "genius-settings"
     build-timeout: 90
     dependencies: >
-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream}
-    email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
+      controller-merge-{stream},
+      yangtools-merge-{stream},
+      odlparent-merge-{stream},
+      openflowplugin-merge-{stream},
+      neutron-merge-{stream}
+    email-upstream:
+      "[genius] [controller] [yangtools] [odlparent] [openflowplugin]\
+      \ [neutron]"
 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
 
 - project:
-    name: genius-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
-          project-pattern: genius
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
-          rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'genius'
-    project-name: 'genius'
-    branch: 'stable/oxygen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    build-timeout: 90
-    dependencies: >
-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream}
-    email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
-
-    # Used by the release job
-    staging-profile-id: 96fb4b6d9d1ee
-
-- project:
-    name: genius-nitrogen
+    name: genius-sonar
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
-          project-pattern: genius
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
-          rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'genius'
-    project-name: 'genius'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: >
-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream}
-    email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
-
-    # Used by the release job
-    staging-profile-id: 96fb4b6d9d1ee
+      - gerrit-maven-sonar
+    project: "genius"
+    project-name: "genius"
+    branch: "master"
+    build-node: centos7-builder-4c-4g
+    java-version: "openjdk11"
+    mvn-settings: "genius-settings"
+    mvn-opts: "-Xmx1024m"
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
-    name: genius-carbon
+    name: genius-info
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: carbon
-    project: 'genius'
-    project-name: 'genius'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: >
-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream}
-    email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
-
-    # Used by the release job
-    staging-profile-id: 96fb4b6d9d1ee
+      - gerrit-info-yaml-verify
+    project: genius
+    project-name: genius
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
-    name: genius-sonar
-    jobs:
-      - gerrit-maven-sonar
-    project: 'genius'
-    project-name: 'genius'
-    branch: 'master'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    name: genius-view
+    views:
+      - project-view
+    project-name: genius