X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-rest-client.yaml;h=f17b62d81f3d3fd376adcf46f9e4f600704c62b6;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=76be4bfbacb8b2c21fddb2c13ad06927748ce356;hpb=64ea42b337ae3113a6a4fc779fbe6d95fddd36db;p=ci-management.git

diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index 76be4bfba..f17b62d81 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -7,61 +7,53 @@
 
 - project:
     name: aai-rest-client-master
-    project-name: 'aai-rest-client'
+    project-name: "aai-rest-client"
     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
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'aai/rest-client'
+          sbom-generator: true
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "aai/rest-client"
     stream:
-      - 'guilin':
-          branch: 'guilin'
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-rest-client-settings'
-    files: '**'
-    archive-artifacts: ''
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+      - "master":
+          branch: "master"
+    mvn-settings: "aai-rest-client-settings"
+    files: "**"
+    archive-artifacts: ""
 
 - project:
     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'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'aai/rest-client'
-    project-name: 'aai-rest-client'
-    branch: 'master'
-    mvn-settings: 'aai-rest-client-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "aai/rest-client"
+    project-name: "aai-rest-client"
+    branch: "master"
+    mvn-settings: "aai-rest-client-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: aai-rest-client-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/rest-client'
-    project-name: 'aai-rest-client'
+    nexus-iq-namespace: "onap-"
+    project: "aai/rest-client"
+    project-name: "aai-rest-client"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-rest-client-settings'
-
-- project:
-    name: aai-rest-client-info
-    project-name: aai-rest-client
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: aai/rest-client
-    branch: master
+      - "master":
+          branch: "master"
+    mvn-settings: "aai-rest-client-settings"