X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-babel.yaml;h=823b7d43c3129931612d26ae248039d41cbb5428;hb=de7d1a2d74b26314f79f5b74550ebe01487bb5c0;hp=1b9fd761ad2e09c142dfec8bfb05e0db9449a5e5;hpb=7fd0160b6b6f1c98e9c29fea01d28250910de40c;p=ci-management.git

diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 1b9fd761a..823b7d43c 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -9,29 +9,35 @@
     name: aai-babel
     project-name: 'aai-babel'
     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 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-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-docker-8c-8g
     project: 'aai/babel'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'istanbul':
+          branch: 'istanbul'
       - 'master':
           branch: 'master'
     mvn-settings: 'aai-babel-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu2004-builder-4c-4g
+    java-version: openjdk11
+    mvn-version: 'mvn36'
+    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: 'ecomp-snapshots'
 
 - project:
     name: aai-babel-sonar
@@ -41,15 +47,17 @@
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu2004-builder-4c-4g
     project: 'aai/babel'
     project-name: 'aai-babel'
     branch: 'master'
     mvn-settings: 'aai-babel-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
 
 - project:
     name: aai-babel-clm
@@ -59,10 +67,14 @@
     project: 'aai/babel'
     project-name: 'aai-babel'
     stream:
-      - 'master':
-          branch: 'master'
+        - 'master':
+              branch: 'master'
+        - 'istanbul':
+              branch: 'istanbul'
     mvn-settings: 'aai-babel-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
+    mvn-version: 'mvn36'
 
 
 - project:
@@ -70,5 +82,6 @@
     project-name: aai-babel
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
     project: aai/babel
     branch: master