X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-platform-inventory-api.yaml;h=698a5cd12f0e327642baa8c4b6bc1d1660f6ec25;hb=87411fedea483b324cd19369dd79fa0042b75ac8;hp=586ba645a0970151b7db3bf9e648e262531a4ef9;hpb=e728023b6ef148435fc45e9545612c458bf57953;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index 586ba645a..698a5cd12 100644
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -5,19 +5,14 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean package docker:build -DpushImage'
-          # No-op
-          script: '/bin/true'
-          build-node: 'ubuntu1604-docker-8c-8g'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
-      - gerrit-maven-docker-stage:
-          sign-artifacts: true
+      - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-goals: 'clean package docker:build -DpushImage'
@@ -26,8 +21,11 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'guilin':
+          branch: 'guilin'
+      - 'honolulu':
+          branch: 'honolulu'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-platform-inventory-api-settings'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
@@ -36,14 +34,20 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-platform-inventory-api-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'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/platform/inventory-api'
     project-name: 'dcaegen2-platform-inventory-api'
     branch: 'master'
@@ -53,11 +57,12 @@
 
 - project:
     name: dcaegen2-platform-inventory-api-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/platform/inventory-api
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-platform-inventory-api'
     branch: 'master'
     mvn-settings: 'dcaegen2-platform-inventory-api-settings'
@@ -67,5 +72,6 @@
     project-name: dcaegen2-platform-inventory-api
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dcaegen2/platform/inventory-api
     branch: master