X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Faai%2Faai-model-loader.yaml;h=89925a57357ed053c24c87aaddd1568eba43e0ff;hb=627a2bfc1daf1c3b458d46a71bb714f9010cf09a;hp=e52ab21064257b81152a916834702a267da0da32;hpb=ed955cca682f4b9ea7eb72a6dc46c70ef6726406;p=ci-management.git

diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index e52ab2106..89925a573 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -14,10 +14,11 @@
           cron: '@daily'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos8-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 -B -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
@@ -26,8 +27,10 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/model-loader'
     stream:
-      - 'istanbul':
-          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-model-loader-settings'
@@ -45,7 +48,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'
@@ -69,8 +71,6 @@
     stream:
         - 'master':
               branch: 'master'
-        - 'istanbul':
-              branch: 'istanbul'
     mvn-settings: 'aai-model-loader-settings'
     mvn-version: 'mvn36'
     java-version: openjdk11
@@ -83,17 +83,3 @@
     build-node: centos8-builder-2c-1g
     project: aai/model-loader
     branch: master
-
-- project:
-    name: 'aai-model-loader-whitesource'
-    project-name: 'aai-model-loader'
-    build-node: ubuntu1804-docker-8c-8g
-    jobs:
-      - gerrit-whitesource-scan
-    mvn-settings: 'aai-model-loader-settings'
-    wss-product-name: 'aai'
-    mvn-clean-install: true
-    project: 'aai/model-loader'
-    branch: master
-    java-version: openjdk11
-    mvn-version: 'mvn36'