X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgroupbasedpolicy%2Fgroupbasedpolicy.yaml;h=e707693a201805088b10fd731e804bd05a0a74bc;hb=ebb321f1aaa399dc574f0174541d6baed8af97cf;hp=321b06776083c1270b31bba00b09c5887414cae8;hpb=cf2d5b7df1cbcc94c0ff0ca305ff3c347c0498d6;p=releng%2Fbuilder.git

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 321b06776..e707693a2 100644
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -1,92 +1,105 @@
+---
 - project:
-    name: groupbasedpolicy-carbon
+    name: groupbasedpolicy-oxygen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{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}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-merge-{stream}'
 
-    stream: carbon
+    stream: oxygen
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'
-    jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean install findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream},neutron-merge-{stream},sfc-merge-{stream},ovsdb-merge-{stream}'
+    dependencies: >
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream},
+        neutron-merge-{stream},
+        sfc-merge-{stream},
+        ovsdb-merge-{stream}
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fbb93f95a76
+
 - project:
-    name: groupbasedpolicy-boron
+    name: groupbasedpolicy-nitrogen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{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}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-merge-{stream}'
 
-    stream: boron
+    stream: nitrogen
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean install findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream},neutron-merge-{stream},sfc-merge-{stream},ovsdb-merge-{stream}'
+    dependencies: >
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream},
+        neutron-merge-{stream},
+        sfc-merge-{stream},
+        ovsdb-merge-{stream}
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fbb93f95a76
+
 - project:
-    name: groupbasedpolicy-beryllium
+    name: groupbasedpolicy-carbon
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{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}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-merge-{stream}'
 
-    stream: beryllium
+    stream: carbon
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
-        - openjdk7
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean install findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream},neutron-merge-{stream},sfc-merge-{stream},ovsdb-merge-{stream}'
+    dependencies: >
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream},
+        neutron-merge-{stream},
+        sfc-merge-{stream},
+        ovsdb-merge-{stream}
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96fbb93f95a76
+
 - project:
     name: groupbasedpolicy-sonar
     jobs:
-        - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'