X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-model-loader.yaml;h=e52ab21064257b81152a916834702a267da0da32;hb=ed955cca682f4b9ea7eb72a6dc46c70ef6726406;hp=52361e5b065c1ed6f8637533b26c62843af8ed63;hpb=10587b3eb3fd1abee3e74f50009196a6dcf85b23;p=ci-management.git

diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 52361e5b0..e52ab2106 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
+          build-node: centos8-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,8 +26,8 @@
           build-node: centos7-docker-8c-8g
     project: 'aai/model-loader'
     stream:
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-model-loader-settings'
@@ -34,6 +36,8 @@
     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
@@ -63,8 +67,10 @@
     project: 'aai/model-loader'
     project-name: 'aai-model-loader'
     stream:
-      - 'master':
-          branch: 'master'
+        - 'master':
+              branch: 'master'
+        - 'istanbul':
+              branch: 'istanbul'
     mvn-settings: 'aai-model-loader-settings'
     mvn-version: 'mvn36'
     java-version: openjdk11
@@ -74,7 +80,7 @@
     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