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 b2944050378b54f40b0fdd9edbcff34a454974a6..447d851608348231e9a0fed150fc77fdeeb2b4b7 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -1,43 +1,65 @@
+---
 - project:
-    name: atrium-boron
+    name: atrium-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}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdk}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - boron:
-            disable_autorelease: True
-            disable_distribution_check: False
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
 
+    stream: oxygen
     project: 'atrium'
     project-name: 'atrium'
     branch: 'master'
-    jdk: openjdk8
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
     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: ''
     email-upstream: '[atrium]'
-    archive-artifacts: ''
+
+    # 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:
-        - '{project-name}-sonar'
+      - gerrit-maven-sonar
     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'