Merge "Migrate faas to global-jjb Maven jobs"

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

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 5503ffdd945eba8ddb4e75548ccb7960605626cb..2b411425909a6de6e87cc1a9e74561f16f214723 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -1,19 +1,18 @@
 ---
 - project:
-    name: snmp-carbon
+    name: snmp-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}'
+      - gerrit-maven-verify-dependencies
 
-    stream: carbon
+    stream: oxygen
     project: 'snmp'
     project-name: 'snmp'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -27,20 +26,18 @@
     archive-artifacts: ''
 
 - project:
-    name: snmp-boron
+    name: snmp-nitrogen
     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: boron
+    stream: nitrogen
     project: 'snmp'
     project-name: 'snmp'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -54,22 +51,20 @@
     archive-artifacts: ''
 
 - project:
-    name: snmp-beryllium
+    name: snmp-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: beryllium
+    stream: carbon
     project: 'snmp'
     project-name: 'snmp'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33: