X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-schema-service.yaml;h=738ecc5a21e3258404edad26d82f518893fb36c7;hb=627a2bfc1daf1c3b458d46a71bb714f9010cf09a;hp=8fdaf118708a25cf00f3b17aca7d3c18ffe45d51;hpb=2f42ab9471e3cc478dd6eccd9b9dbce4ca9b15fe;p=ci-management.git

diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index 8fdaf1187..738ecc5a2 100644
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -13,10 +13,11 @@
       - '{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
           sbom-generator: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
@@ -27,13 +28,15 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'kohn':
+          branch: 'kohn'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'aai-schema-service-settings'
     mvn-version: 'mvn36'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     java-version: openjdk11
 
 - project:
@@ -42,11 +45,10 @@
       - 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: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     java-version: openjdk11
     project: 'aai/schema-service'
     project-name: 'aai-schema-service'
@@ -67,8 +69,6 @@
     stream:
         - 'master':
               branch: 'master'
-        - 'istanbul':
-              branch: 'istanbul'
     mvn-settings: 'aai-schema-service-settings'
     mvn-version: 'mvn36'