Update sonar jobs to global-jjb

[releng/builder.git] / jjb / netconf / netconf.yaml

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 9ea3d0301a58d96a97cb98669b94a0f840df55a3..a2cce08ed8e01b2f538602aacdf44aae07404965 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -1,19 +1,16 @@
 ---
 - project:
-    name: netconf-carbon
+    name: netconf-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
+    stream: oxygen
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -26,21 +23,21 @@
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67b22fc3663f
+
 - project:
-    name: netconf-boron
+    name: netconf-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: nitrogen
     project: 'netconf'
     project-name: 'netconf'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -53,23 +50,23 @@
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67b22fc3663f
+
 - project:
-    name: netconf-beryllium
+    name: netconf-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: carbon
     project: 'netconf'
     project-name: 'netconf'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33:
@@ -81,10 +78,13 @@
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67b22fc3663f
+
 - project:
     name: netconf-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'