X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgroupbasedpolicy%2Fgroupbasedpolicy.yaml;h=e3b6e55cb9bd4dbce1ee1d7e140c42bd89d27dc9;hb=02f1186009927502f66759a97a419faa86ccbe11;hp=f8f518b417a1ee456d629c5b531240c2cf44d526;hpb=7e4e61a16d62f5f8e34fdea2ce9ace0f9fe7b417;p=releng%2Fbuilder.git

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index f8f518b41..e3b6e55cb 100644
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -1,43 +1,19 @@
 ---
 - project:
-    name: groupbasedpolicy-magnesium
+    name: groupbasedpolicy-aluminium
     jobs:
+      - gerrit-release-merge
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'
     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},
-        neutron-merge-{stream},
-        sfc-merge-{stream},
-        ovsdb-merge-{stream}
-    email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
-    disable-job: true
-
-    # Used by the release job
-    staging-profile-id: 96fbb93f95a76
-
-- project:
-    name: groupbasedpolicy-sodium
-    jobs:
-      - odl-maven-jobs
-
-    stream: sodium
-    project: 'groupbasedpolicy'
-    project-name: 'groupbasedpolicy'
-    branch: 'stable/sodium'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'groupbasedpolicy-settings'
-    mvn-goals: '-U clean deploy findbugs:findbugs'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     build-timeout: 90
     dependencies: >
         openflowjava-merge-{stream},
@@ -52,18 +28,19 @@
     staging-profile-id: 96fbb93f95a76
 
 - project:
-    name: groupbasedpolicy-neon
+    name: groupbasedpolicy-magnesium
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: neon
+    stream: magnesium
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'stable/neon'
+    branch: 'stable/magnesium'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     build-timeout: 90
     dependencies: >
         openflowjava-merge-{stream},
@@ -78,18 +55,19 @@
     staging-profile-id: 96fbb93f95a76
 
 - project:
-    name: groupbasedpolicy-fluorine
+    name: groupbasedpolicy-sodium
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: sodium
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'stable/fluorine'
+    branch: 'stable/sodium'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     build-timeout: 90
     dependencies: >
         openflowjava-merge-{stream},
@@ -113,8 +91,12 @@
     build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     disable-job: true
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: groupbasedpolicy-view