X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fappc%2Fappc-master.yaml;h=513126b175fb1a7337265c40f3f46582a566f93d;hb=ba7c53996e90d99b8a30857b63c5cea50cea3b80;hp=80c568d08cf69f9409e401655a8f39fe43e034dd;hpb=5b0faffcb99bb520786c45d9f58d83a094dcf7b1;p=ci-management.git

diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index 80c568d08..513126b17 100644
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -4,39 +4,52 @@
     project-name: 'appc'
     jobs:
       - '{project-name}-{stream}-verify-java':
-          build-node: ubuntu1604-builder-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
           java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
       - '{project-name}-{stream}-merge-java':
-          build-node: ubuntu1604-builder-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
+          java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily':
-          build-node: ubuntu1604-builder-8c-8g
+          mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
+          java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
+          mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
+          java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
 
     project: 'appc'
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'appc-settings'
+    maven-version: "mvn35"
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: appc-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'appc'
     project-name: 'appc'
     branch: 'master'
     mvn-settings: 'appc-settings'
+    maven-version: "mvn35"
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx4096m'
 
@@ -46,17 +59,20 @@
       - gerrit-maven-clm:
           mvn-params: '-DskipTests'
           build-timeout: 60
-          build-node: ubuntu1604-builder-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
     nexus-iq-namespace: 'onap-'
     project: 'appc'
     project-name: 'appc'
     branch: 'master'
     mvn-settings: 'appc-settings'
+    maven-version: "mvn35"
 
 - project:
     name: appc-info
     project-name: appc
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: appc
     branch: master