X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsnmp4sdn%2Fsnmp4sdn.yaml;h=1ad2b6a864bd6f71ff1cebb2a1798402a1fbae23;hb=d40b0f3d0070296f96d980fa7b6702a8dcce3468;hp=f09e0a3eb678c5227d8a5e1a7b597395f27c3737;hpb=7daa1faff620b4b796cf0e318079b2f0b617c422;p=releng%2Fbuilder.git

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index f09e0a3eb..1ad2b6a86 100644
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -1,94 +1,83 @@
 ---
 - project:
-    name: snmp4sdn-nitrogen
+    name: snmp4sdn-fluorine
     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}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: fluorine
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'master'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'snmp4sdn-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: a69034a4b6ef5
 
 - project:
-    name: snmp4sdn-carbon
+    name: snmp4sdn-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}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
+    mvn-settings: 'snmp4sdn-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
+
+    # Used by the release job
+    staging-profile-id: a69034a4b6ef5
+
+- project:
+    name: snmp4sdn-nitrogen
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
+
+    stream: nitrogen
+    project: 'snmp4sdn'
+    project-name: 'snmp4sdn'
+    branch: 'stable/nitrogen'
     mvn-settings: 'snmp4sdn-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: a69034a4b6ef5
 
 - project:
-    name: snmp4sdn-boron
+    name: snmp4sdn-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}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: carbon
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'snmp4sdn-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: a69034a4b6ef5
 
 - project:
     name: snmp4sdn-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'master'
     mvn-settings: 'snmp4sdn-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'