X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fof-config%2Fof-config.yaml;h=ab6c67a89b40ab759e512f3bc5cbd19e5bc0ad88;hb=7ea27cc20a9f252f4196db2ce52da4ef7c3b73cb;hp=004bc17ec2a60b86b2d2b2ed2d9c85454b00df24;hpb=dc3446222821ea43d71f9c355a1182c99d2a3c54;p=releng%2Fbuilder.git

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 004bc17ec..ab6c67a89 100644
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -1,20 +1,15 @@
 ---
 - project:
-    name: of-config-nitrogen
+    name: of-config-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-jobs'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'of-config'
     project-name: 'of-config'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -27,22 +22,20 @@
     email-upstream: '[of-config] [netconf]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6880455efe67
+
 - project:
-    name: of-config-carbon
+    name: of-config-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-jobs'
 
-    stream: carbon
+    stream: nitrogen
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -55,22 +48,21 @@
     email-upstream: '[of-config] [netconf]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a6880455efe67
+
 - project:
-    name: of-config-boron
+    name: of-config-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-jobs'
 
-    stream: boron
+    stream: carbon
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -83,10 +75,13 @@
     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'