Remove nitrogen branches in projects

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

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 55ee922330d7e69e493f73c22219fa9d9c0c6b68..c959329d84046c20a612635bc1b71a368280f7e6 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -1,11 +1,10 @@
 ---
 - project:
-    name: snmp-oxygen
+    name: snmp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'snmp'
     project-name: 'snmp'
     branch: 'master'
@@ -18,34 +17,15 @@
     staging-profile-id: a68fb236b93a6
 
 - project:
-    name: snmp-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'snmp'
-    project-name: 'snmp'
-    branch: 'stable/nitrogen'
-    mvn-settings: 'snmp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[snmp] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: a68fb236b93a6
-
-- project:
-    name: snmp-carbon
+    name: snmp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'snmp'
     project-name: 'snmp'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
+    branch: 'stable/oxygen'
     mvn-settings: 'snmp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'