X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsnmp4sdn%2Fsnmp4sdn.yaml;h=90b38175a6d9135d305e19c73763e568fb8eb8cf;hb=27cee20f365aa2862417a15f29b1ff000d3e4b1f;hp=c70c3a90ff29bdd8293ff3d27a3f34d66cf39b88;hpb=b44aaa0cfbb05c8250c06d9dac16085f1e9ac732;p=releng%2Fbuilder.git

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index c70c3a90f..90b38175a 100644
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -1,19 +1,16 @@
 ---
 - project:
-    name: snmp4sdn-nitrogen
+    name: snmp4sdn-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: nitrogen
+    stream: oxygen
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -26,48 +23,21 @@
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
-- project:
-    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}'
-
-    stream: carbon
-    project: 'snmp4sdn'
-    project-name: 'snmp4sdn'
-    branch: 'stable/carbon'
-    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-boron
+    name: snmp4sdn-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: 'snmp4sdn'
     project-name: 'snmp4sdn'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -80,23 +50,23 @@
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69034a4b6ef5
+
 - project:
-    name: snmp4sdn-beryllium
+    name: snmp4sdn-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: 'snmp4sdn'
     project-name: 'snmp4sdn'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33:
@@ -108,6 +78,9 @@
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69034a4b6ef5
+
 - project:
     name: snmp4sdn-sonar
     jobs: