X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fcli%2Fcli.yaml;h=bbcdcf6083f9395e59607bc90f7543a60297446b;hb=a29dd524cc61ad4692b5ba0fee58c2276ffa0917;hp=4d1f3de26d67fe0d6aced6931429ffb592cbe768;hpb=dbd548c70266228aceb24df05f8b8340cd1ce411;p=ci-management.git

diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index 4d1f3de26..bbcdcf608 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -7,89 +7,85 @@
 
 - project:
     name: cli
-    project-name: 'cli'
+    java-version: openjdk11
+    project-name: "cli"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-Dskip.docker.build=false -Dskip.docker.push=false -Dskip.docker.tag=false -Ddocker.push.registry=nexus3.onap.org:10003'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-      - '{project-name}-{stream}-aai-docker-java-daily':
-          pom: 'deployment/docker/pom.xml'
-          mvn-goals: 'docker:build'
-          docker-image-name: 'onap/cli'
+          # yamllint disable-line rule:line-length
+          mvn-params: "-Dskip.docker.build=false -Dskip.docker.push=false -Dskip.docker.tag=false -Ddocker.push.registry=nexus3.onap.org:10003"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+      - "{project-name}-{stream}-aai-docker-java-daily":
+          pom: "deployment/docker/pom.xml"
+          mvn-goals: "docker:build"
+          docker-image-name: "onap/cli"
           build-node: ubuntu1804-docker-8c-8g
-    project: 'cli'
+    project: "cli"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'cli-settings'
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+          java-version: openjdk11
+    mvn-settings: "cli-settings"
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
-#- project:
-#    name: cli-arm64
-#    project-name: 'cli-arm64'
-#    jobs:
-#      - '{project-name}-{stream}-aai-docker-java-daily':
-#          pom: 'deployment/docker/pom.xml'
-#          mvn-goals: 'docker:build'
-#          docker-image-name: 'onap/cli'
-#
-#    project: 'cli'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'cli-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#
 - project:
     name: cli-sonar
+    java-version: openjdk11
     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'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'cli'
-    project-name: 'cli'
-    branch: 'master'
-    mvn-settings: 'cli-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "cli"
+    project-name: "cli"
+    branch: "master"
+    mvn-settings: "cli-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: cli-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'cli'
-    project-name: 'cli'
-    branch: 'master'
-    mvn-settings: 'cli-settings'
+    nexus-iq-namespace: "onap-"
+    project: "cli"
+    project-name: "cli"
+    branch: "master"
+    mvn-settings: "cli-settings"
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
-    name: cli-info
-    project-name: cli
+    name: cli-sonar-verify
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: cli
-    branch: master
+      - gerrit-maven-sonar-verify
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    build-node: ubuntu1804-docker-8c-8g
+    project: "cli"
+    project-name: "cli"
+    branch: "master"
+    mvn-settings: "cli-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"