Remove {project}-integration-{stream} jobs

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

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index 4f63a973d37c1d40a7f9ee6ae9d5bb2cadf2bd86..2bd0758bf99c28c92cf4037d638660ded13732f3 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -1,33 +1,86 @@
-# ODL Releng build templates
+---
 - project:
-    name: genius
+    name: genius-oxygen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-            disable_autorelease: False
-            disable_distribution_check: False
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
+    stream: oxygen
     project: 'genius'
     project-name: 'genius'
+    branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream},openflowplugin-merge-{stream},neutron-merge-{stream}'
+    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]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 96fb4b6d9d1ee
+
+- project:
+    name: genius-nitrogen
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - 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
+
+- project:
+    name: genius-carbon
+    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
+
+- 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'