X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fatrium%2Fatrium.yaml;h=ca443e740106afd1c9b7267dc4e69f763684f0aa;hb=0e0e34daa29f5cd386428cc72571b1e3dee6abfa;hp=e6c1183545c35365e2872a834f7a7530e297e7a0;hpb=f348f1c730ed9939f7b5059ac5a29b2e82036456;p=releng%2Fbuilder.git

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index e6c118354..ca443e740 100644
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -1,82 +1,35 @@
 ---
 - project:
-    name: atrium-oxygen
+    name: atrium-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'atrium'
     project-name: 'atrium'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'atrium-settings'
-    mvn-goals: 'clean install'
     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}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
-
-    stream: nitrogen
-    project: 'atrium'
-    project-name: 'atrium'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'atrium-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[atrium]'
-    archive-artifacts: ''
-
-    # Used by the release job
-    staging-profile-id: 9324f12310e6a
-
-- project:
-    name: atrium-carbon
+    name: atrium-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'atrium'
     project-name: 'atrium'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'atrium-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[atrium]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9324f12310e6a
@@ -84,10 +37,9 @@
 - 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'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'