X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-model-loader.yaml;h=4fd9f949553c1fb2295fc8bb73a69cb1b38076d2;hb=61a0f59c466bf12a84b8b2b5d0031589bcdadc0d;hp=86505f4c598dbec2cd3aa2f742d0262ae6872c4e;hpb=c19c0e91084c3a7550ae8ce6e160eb1fa312b062;p=ci-management.git

diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 86505f4c5..4fd9f9495 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -9,42 +9,55 @@
     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: ubuntu1604-docker-8c-8g
+          build-node: ubuntu2004-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/model-loader'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-model-loader-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu2004-builder-4c-4g
+    mvn-version: 'mvn36'
+    java-version: openjdk11
+    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: 'ecomp-snapshots'
 
 - project:
     name: aai-model-loader-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'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu2004-builder-4c-4g
     project: 'aai/model-loader'
     project-name: 'aai-model-loader'
     branch: 'master'
     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
@@ -54,22 +67,27 @@
     project: 'aai/model-loader'
     project-name: 'aai-model-loader'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+        - 'master':
+              branch: 'master'
+        - 'istanbul':
+              branch: 'istanbul'
     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: centos8-builder-2c-1g
     project: aai/model-loader
     branch: master
 
 - project:
     name: 'aai-model-loader-whitesource'
     project-name: 'aai-model-loader'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu2004-docker-8c-8g
     jobs:
       - gerrit-whitesource-scan
     mvn-settings: 'aai-model-loader-settings'
@@ -77,3 +95,5 @@
     mvn-clean-install: true
     project: 'aai/model-loader'
     branch: master
+    java-version: openjdk11
+    mvn-version: 'mvn36'