Remove {project}-integration-{stream} jobs

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

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index 9b5787ec17c43ce9270d62e6a57719f074899b3d..447d851608348231e9a0fed150fc77fdeeb2b4b7 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -1,33 +1,65 @@
-# ODL Releng build templates
+---
 - project:
-    name: atrium
+    name: atrium-oxygen
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{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: True
-            disable_distribution_check: False
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
 
+    stream: oxygen
     project: 'atrium'
+    project-name: 'atrium'
+    branch: 'master'
     mvn-settings: 'atrium-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: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
-    email-upstream: '[atrium] [odlparent] [yangtools] [controller] [mdsal]'
-    archive-artifacts: ''
+    dependencies: ''
+    email-upstream: '[atrium]'
 
+    # Used by the release job
+    staging-profile-id: 9324f12310e6a
+
+- project:
+    name: atrium-nitrogen
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: nitrogen
+    project: 'atrium'
+    project-name: 'atrium'
+    branch: 'stable/nitrogen'
+    mvn-settings: 'atrium-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[atrium]'
+
+    # Used by the release job
+    staging-profile-id: 9324f12310e6a
+
+- project:
+    name: atrium-carbon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: carbon
+    project: 'atrium'
+    project-name: 'atrium'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
+    mvn-settings: 'atrium-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[atrium]'
+
+    # Used by the release job
+    staging-profile-id: 9324f12310e6a
+
+- project:
+    name: atrium-sonar
+    jobs:
+      - gerrit-maven-sonar
+    project: 'atrium'
+    project-name: 'atrium'
+    branch: 'master'
+    mvn-settings: 'atrium-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'