X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-resources.yaml;h=f6163f44dc7453e41709d7a525d38634d47655a0;hb=4b15d3d73b130d2913d37edeac571d87bdb161a2;hp=6ffc4234c54b214393dd9e9f6b914de255c5fb00;hpb=de7d1a2d74b26314f79f5b74550ebe01487bb5c0;p=ci-management.git

diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 6ffc4234c..f6163f44d 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -20,6 +20,7 @@
           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'
@@ -31,13 +32,15 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'kohn':
+          branch: 'kohn'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu2004-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     java-version: openjdk8
 
 - project:
@@ -46,7 +49,6 @@
       - 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'
@@ -70,8 +72,6 @@
     stream:
         - 'master':
               branch: 'master'
-        - 'istanbul':
-              branch: 'istanbul'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
     java-version: openjdk8
@@ -85,15 +85,3 @@
     project: aai/resources
     branch: master
     java-version: openjdk8
-
-- project:
-    name: 'aai-resources-whitesource'
-    project-name: 'aai-resources'
-    build-node: ubuntu1804-docker-8c-8g
-    jobs:
-      - gerrit-whitesource-scan
-    mvn-settings: 'aai-resources-settings'
-    wss-product-name: 'aai'
-    mvn-clean-install: true
-    project: 'aai/resources'
-    branch: master