X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgenius%2Fgenius.yaml;h=930343d825d2ea2ca67878e7c0099fb4dab4c42b;hb=0154bd0ae9323412db0aa757aa32c88969622619;hp=0a5084ddd2b37098b4cecc8c1f277afa45d33083;hpb=8e35c48f867df3bbadfb1ee17d86243a473951be;p=releng%2Fbuilder.git

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index 0a5084ddd..930343d82 100644
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -1,107 +1,33 @@
 ---
 - project:
-    name: genius-aluminium
+    name: genius-master
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":
+          build-node: centos8-builder-2c-2g
           project-pattern: genius
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
           rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
-    block_on_csit: false
-
-    stream: aluminium
-    project: 'genius'
-    project-name: 'genius'
-    branch: 'master'
-    build-node: centos7-builder-2c-8g
-    java-version: 'openjdk11'
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m'
-    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-magnesium
-    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-jdk11
-      - odl-maven-verify-jobs
-
-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
-    block_on_csit: false
-
-    stream: magnesium
-    project: 'genius'
-    project-name: 'genius'
-    branch: 'stable/magnesium'
-    build-node: centos7-builder-2c-8g
-    java-version: 'openjdk11'
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m'
-    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-sodium
-    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
-      - odl-maven-verify-jobs
-
-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
-    block_on_csit: false
-
-    stream: sodium
-    project: 'genius'
-    project-name: 'genius'
-    branch: 'stable/sodium'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m'
+    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
@@ -109,18 +35,14 @@
 - project:
     name: genius-sonar
     jobs:
-      - gerrit-maven-sonar
-    project: 'genius'
-    project-name: 'genius'
-    branch: 'master'
-    build-node: centos7-builder-2c-8g
-    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}'
+      - odl-sonar-jobs-jdk17
+
+    project: "genius"
+    project-name: "genius"
+    branch: "master"
+    build-node: centos7-builder-4c-4g
+    mvn-settings: "genius-settings"
+    mvn-opts: "-Xmx1024m"
 
 - project:
     name: genius-info