X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fccsdk%2Fapps.yaml;h=0883258356cbbc5252ee3fb3f122a28b9664bfa7;hb=0da95363a323a6395b18eecfae7664debfb12901;hp=c69c670e06f3a91d0f0f191411818c0218e90e32;hpb=a3cb00d16c89fd991b34fd623cf1576ebb931530;p=ci-management.git

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index c69c670e0..088325835 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -17,11 +17,11 @@
           sign-artifacts: true
           cron: ''
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn35"
+          cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
@@ -29,8 +29,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -39,8 +41,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -52,16 +53,17 @@
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'ccsdk/apps'
     project-name: 'ccsdk-apps'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn35"
 
 - project:
     name: ccsdk-apps-clm
@@ -73,9 +75,12 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
-    maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: ccsdk-apps-arm64-docker
@@ -92,13 +97,14 @@
 #    archive-artifacts: ''
 #    docker-pom: 'pom.xml'
 #    mvn-profile: docker
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: ccsdk-apps-info
     project-name: ccsdk-apps
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: ccsdk/apps
     branch: master
 
@@ -107,6 +113,8 @@
     project-name: ccsdk-apps
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
     mvn-settings: 'ccsdk-apps-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true