X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-model-loader.yaml;h=d86b6db2d1450ce0758c7e13419ef6bd605dd80b;hb=de3688ccf4fa327515dcecccb2864f5c8c732b65;hp=84e2a3e6b815b279aea934dbf8cd6e692d26fe5c;hpb=5b440317e6a0ff8f0f1895ff5572e030f43d774a;p=ci-management.git

diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 84e2a3e6b..d86b6db2d 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -9,12 +9,14 @@
     name: aai-model-loader-master
     project-name: 'aai-model-loader'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -B -Dmaven.test.skip=true'
           build-node: ubuntu1804-docker-8c-8g
@@ -24,14 +26,20 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/model-loader'
     stream:
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'jakarta':
+          branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-model-loader-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
+    mvn-version: 'mvn36'
+    java-version: openjdk11
+    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: 'ecomp-snapshots'
 
 - project:
     name: aai-model-loader-sonar
@@ -39,7 +47,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'
@@ -50,6 +57,8 @@
     mvn-settings: 'aai-model-loader-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: 'mvn36'
+    java-version: openjdk11
 
 - project:
     name: aai-model-loader-clm
@@ -59,27 +68,17 @@
     project: 'aai/model-loader'
     project-name: 'aai-model-loader'
     stream:
-      - 'master':
-          branch: 'master'
+        - 'master':
+              branch: 'master'
     mvn-settings: 'aai-model-loader-settings'
+    mvn-version: 'mvn36'
+    java-version: openjdk11
 
 - project:
     name: aai-model-loader-info
     project-name: aai-model-loader
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    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