X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fgroupbasedpolicy%2Fgroupbasedpolicy.yaml;h=f7cdd20571eac7db12b7815cdb36ac21289b07bb;hb=a6bb232e154d0ac8f8f493ea51c19ad4db223d92;hp=1da01b19881d851339c0cb4a27ed58e4e77dea65;hpb=45dda826d667777fa16b4e937bce5e736cdcfa3c;p=releng%2Fbuilder.git

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 1da01b198..f7cdd2057 100644
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -1,12 +1,10 @@
 ---
 - project:
-    name: groupbasedpolicy-oxygen
+    name: groupbasedpolicy-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'
@@ -27,20 +25,20 @@
     staging-profile-id: 96fbb93f95a76
 
 - project:
-    name: groupbasedpolicy-nitrogen
+    name: groupbasedpolicy-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'stable/nitrogen'
+    branch: 'stable/oxygen'
     build-node: centos7-builder-2c-8g
     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},
@@ -53,18 +51,16 @@
     staging-profile-id: 96fbb93f95a76
 
 - project:
-    name: groupbasedpolicy-carbon
+    name: groupbasedpolicy-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'stable/carbon'
+    branch: 'stable/nitrogen'
     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'