X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgroupbasedpolicy%2Fgroupbasedpolicy.yaml;h=70c32643c7881612f1b1064db2abf462f72954f2;hb=f93289b1fc422b77fcd00cfebe848c4eac982284;hp=4ac606a6b6a1dd17223170e1478e9c4b655787d6;hpb=8f5abaab7d3b584d06d7cc0c7ab4525faf53a630;p=releng%2Fbuilder.git

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 4ac606a6b..70c32643c 100644
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -2,25 +2,18 @@
 - project:
     name: groupbasedpolicy-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-      - gerrit-maven-verify-dependencies
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 90
     dependencies: >
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream},
@@ -28,28 +21,23 @@
         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-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: >
         openflowjava-merge-{stream},
@@ -58,29 +46,24 @@
         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-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: >
         openflowjava-merge-{stream},
@@ -89,15 +72,18 @@
         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'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean install findbugs:findbugs'
+    mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'