X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgenius%2Fgenius.yaml;h=a11bd16a71d4b15245a6709c7a227a893f6a3f16;hb=ccaff4b13a69a8e501cbf672f2f45241cd7ec909;hp=b9b4197bdf7be156647aaf9d2875b0fe51db6859;hpb=992a94ba358a92a4ed9348f9e3b050a7d43739a2;p=releng%2Fbuilder.git

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index b9b4197bd..a11bd16a7 100644
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -2,17 +2,15 @@
 - project:
     name: genius-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'genius'
     project-name: 'genius'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -21,6 +19,7 @@
     mvn-settings: 'genius-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 90
     dependencies: >
         controller-merge-{stream},
         yangtools-merge-{stream},
@@ -30,20 +29,20 @@
     email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fb4b6d9d1ee
+
 - project:
     name: genius-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'genius'
     project-name: 'genius'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -61,21 +60,21 @@
     email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fb4b6d9d1ee
+
 - project:
     name: genius-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'genius'
     project-name: 'genius'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -93,10 +92,13 @@
     email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fb4b6d9d1ee
+
 - project:
     name: genius-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'genius'
     project-name: 'genius'
     branch: 'master'