Merge "Set correct Maven version for ccsdk-oran Sonar job"

[ci-management.git] / jjb / ccsdk / features.yaml

diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 0a0120e..06e4a55 100644 (file)
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -27,9 +27,9 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
+    maven-version: "mvn36"
     mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -43,14 +43,14 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'ccsdk/features'
     project-name: 'ccsdk-features'
     branch: 'master'
     mvn-settings: 'ccsdk-features-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
-    maven-version: "mvn35"
+    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
+    maven-version: "mvn36"
 
 - project:
     name: ccsdk-features-clm
@@ -65,8 +65,9 @@
       - 'frankfurt':
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-features-settings'
-    maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
+    maven-version: "mvn36"
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: ccsdk-features-info
@@ -79,12 +80,13 @@
 
 - project:
     name: ccsdk-features-whitesource
-    build-node: ubuntu1604-builder-8c-8g
+    build-node: ubuntu1804-builder-4c-4g
     project-name: ccsdk-features
     jobs:
       - gerrit-whitesource-scan
     mvn-settings: 'ccsdk-features-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
+    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
     project: ccsdk/features
     branch: master