X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fof-config%2Fof-config.yaml;h=5892334b09941f9f91e05fdfbbd367d95adfc6fd;hb=0a28f0362b904fe414c5dd269f969bf26a94fee1;hp=7eaa59e773b7832bcf63308dcdc8f21695f09780;hpb=535445406bb4e277245003977e87d6180276aa32;p=releng%2Fbuilder.git

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 7eaa59e773..5892334b09 100644
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -2,87 +2,64 @@
 - 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'
     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'