X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Foptf%2Foptf-cmso.yaml;h=180872cad6df4ad366f3814a9c1f923aac2aadd1;hb=559a796ed57e893f12e4448773d8fcaabfc9e78c;hp=3bee2b14672a619b5c50d53361210edd04c31533;hpb=87a44d9b83e02abf72026cf11436df1bf7ff1b71;p=ci-management.git

diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
index 3bee2b146..180872cad 100644
--- a/jjb/optf/optf-cmso.yaml
+++ b/jjb/optf/optf-cmso.yaml
@@ -10,10 +10,10 @@
     project-name: 'optf-cmso'
     jobs:
       - gerrit-maven-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: false
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: false
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
@@ -26,14 +26,16 @@
             - docker.push.registry=nexus3.onap.org:10003
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'optf/cmso'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'optf-cmso-settings'
+    java-version: openjdk11
+
     subproject:
       - 'cmso':
           path: '.'
@@ -49,15 +51,16 @@
     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: 'H 11 * * *'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'optf/cmso'
     project-name: 'optf-cmso'
     branch: 'master'
     mvn-settings: 'optf-cmso-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: optf-cmso-clm
@@ -67,18 +70,20 @@
     nexus-iq-namespace: 'onap-'
     project: optf/cmso
     project-name: 'optf-cmso'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'honolulu':
+          branch: 'honolulu'
     mvn-settings: 'optf-cmso-settings'
+    java-version: openjdk11
 
 - project:
     name: optf-cmso-info
     project-name: optf-cmso
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: optf/cmso
     branch: master