X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-rest-client.yaml;h=45bdd0aaaf8195703bb9cc2c7413abae4a87cf6c;hb=ffc3ac818c92944c9b956633550a461457d10d36;hp=3136efedb0fa88cd4ea26d71c7d6c79e038ee387;hpb=11f64a30e266785ec89005caaaab6ff348c227f3;p=ci-management.git

diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index 3136efedb..45bdd0aaa 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -11,11 +11,17 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+          sbom-generator: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'aai/rest-client'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-rest-client-settings'
@@ -26,8 +32,13 @@
     name: aai-rest-client-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-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'aai/rest-client'
     project-name: 'aai-rest-client'
     branch: 'master'
@@ -43,8 +54,10 @@
     project: 'aai/rest-client'
     project-name: 'aai-rest-client'
     stream:
-      - 'dublin':
-          branch: 'dublin'
+        - 'master':
+              branch: 'master'
+        - 'istanbul':
+              branch: 'istanbul'
     mvn-settings: 'aai-rest-client-settings'
 
 - project:
@@ -52,5 +65,6 @@
     project-name: aai-rest-client
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
     project: aai/rest-client
     branch: master