X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fof-config%2Fof-config.yaml;h=c7a309ad8e9e4db2986732970f528c30b095e3ff;hb=b0ee3dcc9ba7c94a5969548f7e818894e65b05d9;hp=7eaa59e773b7832bcf63308dcdc8f21695f09780;hpb=1a0c6f5da25a278ae613290d432fa66c4939f85a;p=releng%2Fbuilder.git

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 7eaa59e77..c7a309ad8 100644
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -1,88 +1,83 @@
 ---
+- project:
+    name: of-config-fluorine
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: fluorine
+    project: 'of-config'
+    project-name: 'of-config'
+    branch: 'master'
+    mvn-settings: 'of-config-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: netconf-merge-{stream}'
+    email-upstream: '[of-config] [netconf]'
+
+    # Used by the release job
+    staging-profile-id: a6880455efe67
+
 - project:
     name: of-config-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}'
-      - gerrit-maven-verify-dependencies
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: a6880455efe67
 
 - project:
     name: of-config-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: 'of-config'
     project-name: 'of-config'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: a6880455efe67
 
 - project:
     name: of-config-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: 'of-config'
     project-name: 'of-config'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: a6880455efe67
 
 - project:
     name: of-config-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'of-config'
     project-name: 'of-config'
     branch: 'master'
     mvn-settings: 'of-config-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'