X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ftopoprocessing%2Ftopoprocessing.yaml;h=47974a4955fc394574806d61c15c636106ac09d7;hb=b7cf4bc22e7a89d280ec1eff3ef3693c559074eb;hp=fcc51b7af3e6e46522b631163ebc405bc39e8a18;hpb=e8a56411730412990a7ad3ef97bcee5643d981a9;p=releng%2Fbuilder.git

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index fcc51b7af..47974a495 100644
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -1,19 +1,15 @@
 ---
 - project:
-    name: topoprocessing-nitrogen
+    name: topoprocessing-oxygen
     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: nitrogen
+    stream: oxygen
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -26,48 +22,20 @@
     email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
-- project:
-    name: topoprocessing-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}'
-
-    stream: carbon
-    project: 'topoprocessing'
-    project-name: 'topoprocessing'
-    branch: 'stable/carbon'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'topoprocessing-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
+    # Used by the release job
+    staging-profile-id: a691bbe2328cb
 
 - project:
-    name: topoprocessing-boron
+    name: topoprocessing-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: boron
+    stream: nitrogen
     project: 'topoprocessing'
     project-name: 'topoprocessing'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -80,24 +48,22 @@
     email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a691bbe2328cb
 
 - project:
-    name: topoprocessing-beryllium
+    name: topoprocessing-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: beryllium
+    stream: carbon
     project: 'topoprocessing'
     project-name: 'topoprocessing'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33:
@@ -109,10 +75,13 @@
     email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a691bbe2328cb
+
 - project:
     name: topoprocessing-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'topoprocessing'
     project-name: 'topoprocessing'
     branch: 'master'