X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsnmp%2Fsnmp.yaml;h=c959329d84046c20a612635bc1b71a368280f7e6;hb=0e0e34daa29f5cd386428cc72571b1e3dee6abfa;hp=9fafe8b39251babb2471fa5144072c09ff72c0f1;hpb=27cee20f365aa2862417a15f29b1ff000d3e4b1f;p=releng%2Fbuilder.git

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 9fafe8b39..c959329d8 100644
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -1,82 +1,35 @@
 ---
 - project:
-    name: snmp-oxygen
+    name: snmp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'snmp'
     project-name: 'snmp'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'snmp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[snmp] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68fb236b93a6
 
 - project:
-    name: snmp-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
-
-    stream: nitrogen
-    project: 'snmp'
-    project-name: 'snmp'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'snmp-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[snmp] [odlparent]'
-    archive-artifacts: ''
-
-    # Used by the release job
-    staging-profile-id: a68fb236b93a6
-
-- project:
-    name: snmp-carbon
+    name: snmp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'snmp'
     project-name: 'snmp'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'snmp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[snmp] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68fb236b93a6
@@ -84,10 +37,9 @@
 - project:
     name: snmp-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'snmp'
     project-name: 'snmp'
     branch: 'master'
     mvn-settings: 'snmp-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'