X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-babel.yaml;h=e90f24cdb97a71ee5203dec78928edf4f47f77f1;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=10a433be4fca81294a29f26a47684573845408a4;hpb=7ec70d5407723e1f9f88d64c01c7386ee045163d;p=ci-management.git

diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 10a433be4..6c50df1e4 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -7,63 +7,70 @@
 
 - project:
     name: aai-babel
-    project-name: 'aai-babel'
+    project-name: "aai-babel"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-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
-          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'
+          sbom-generator: true
+          # yamllint disable-line rule:line-length
+          mvn-params: "-P docker -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+          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-2c-1g
+    project: "aai/babel"
     stream:
-      - 'elalto':
-          branch: 'elalto'
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-babel-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+      - "master":
+          branch: "master"
+    mvn-settings: "aai-babel-settings"
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    nexus-snapshot-repo: "snapshots"
+    mvn-snapshot-id: "ecomp-snapshots"
 
 - project:
     name: aai-babel-sonar
     jobs:
       - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-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'
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    build-node: ubuntu1804-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
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/babel'
-    project-name: 'aai-babel'
+    nexus-iq-namespace: "onap-"
+    project: "aai/babel"
+    project-name: "aai-babel"
     stream:
-      - 'elalto':
-          branch: 'elalto'
-    mvn-settings: 'aai-babel-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-
-- project:
-    name: aai-babel-info
-    project-name: aai-babel
-    jobs:
-      - gerrit-info-yaml-verify
-    project: aai/babel
-    branch: master
+      - "master":
+          branch: "master"
+    mvn-settings: "aai-babel-settings"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    java-version: openjdk11
+    mvn-version: "mvn36"