X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgroupbasedpolicy%2Fgroupbasedpolicy.yaml;h=607b26b738692e0676e517b5a28c11fd54c85153;hb=ddbf3cde9195f2b3635318fed187269504853ab1;hp=678ed3629509f7c11e4484f663283358d83bd88b;hpb=b683716f99ebd05741431466d52447164236f562;p=releng%2Fbuilder.git

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 678ed3629..607b26b73 100644
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: groupbasedpolicy-fluorine
+    name: groupbasedpolicy-neon
     jobs:
       - odl-maven-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'
@@ -25,15 +25,14 @@
     staging-profile-id: 96fbb93f95a76
 
 - project:
-    name: groupbasedpolicy-oxygen
+    name: groupbasedpolicy-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
@@ -51,45 +50,20 @@
     staging-profile-id: 96fbb93f95a76
 
 - project:
-    name: groupbasedpolicy-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: nitrogen
-    project: 'groupbasedpolicy'
-    project-name: 'groupbasedpolicy'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean deploy findbugs:findbugs'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: >
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream},
-        neutron-merge-{stream},
-        sfc-merge-{stream},
-        ovsdb-merge-{stream}
-    email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
-
-    # Used by the release job
-    staging-profile-id: 96fbb93f95a76
-
-- project:
-    name: groupbasedpolicy-carbon
+    name: groupbasedpolicy-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'stable/carbon'
+    branch: 'stable/oxygen'
     build-node: centos7-builder-2c-8g
-    karaf-version: karaf3
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 90
     dependencies: >
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream},
@@ -112,3 +86,9 @@
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- view:
+    name: groupbasedpolicy
+    description: 'List of groupbasedpolicy jobs'
+    regex: '^groupbasedpolicy-.*'
+    <<: *releng_view_common