X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-aai-common.yaml;h=5f10f9a5d7da5e7aa37d173ace5e0298e4bb2257;hb=8c5f51157cef4cda94b3614b642d188b1c134983;hp=3d75dde0decde109070287e3670c3eb7cc2256ed;hpb=a464f89ad78097b2bd74639f92c9c2421f9e860b;p=ci-management.git

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 3d75dde0d..d57586f1c 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -7,58 +7,96 @@
 
 - project:
     name: aai-aai-common-master
-    project-name: 'aai-aai-common'
+    project-name: "aai-aai-common"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-    project: 'aai/aai-common'
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "aai/aai-common"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'aai-aai-common-settings'
-    mvn-version: 'mvn35'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+      - "master":
+          branch: "master"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "aai-aai-common-settings"
+    mvn-version: "mvn35"
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
+    java-version: openjdk8
 
 - project:
     name: aai-aai-common-sonar
     jobs:
       - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'aai/aai-common'
-    project-name: 'aai-aai-common'
-    branch: 'master'
-    mvn-settings: 'aai-aai-common-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: 'mvn35'
+    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/aai-common"
+    project-name: "aai-aai-common"
+    branch: "master"
+    mvn-params: ""
+    mvn-settings: "aai-aai-common-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    mvn-version: "mvn35"
+    java-version: openjdk8
 
 - project:
     name: aai-aai-common-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'aai/aai-common'
-    project-name: 'aai-aai-common'
+    nexus-iq-namespace: "onap-"
+    build-node: ubuntu1804-builder-4c-4g
+    project: "aai/aai-common"
+    project-name: "aai-aai-common"
     stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'aai-aai-common-settings'
-    mvn-version: 'mvn35'
+      - "master":
+          branch: "master"
+    mvn-params: ""
+    mvn-settings: "aai-aai-common-settings"
+    mvn-version: "mvn35"
+    java-version: openjdk8
 
 - project:
-    name: aai-aai-common-info
-    project-name: aai-aai-common
+    name: "aai-aai-common-docker"
     jobs:
-      - gerrit-info-yaml-verify
-    project: aai/aai-common
-    branch: master
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+    project-name: "aai-aai-common"
+    project: "aai/aai-common"
+    stream:
+      - "master":
+          branch: "master"
+          distro: "alpine"
+          mvn-params: "docker"
+      - "jakarta":
+          branch: "jakarta"
+          distro: "alpine"
+          mvn-params: "docker"
+      - "kohn":
+          branch: "kohn"
+          distro: "alpine"
+          mvn-params: "docker"
+    docker-name: "onap/aai-common-{distro}"
+    docker-build-args: "-f ./Dockerfile.{distro}"
+    docker-root: "$WORKSPACE/Dockerfiles/aai-common/"
+    mvn-settings: "aai-aai-common-settings"
+    mvn-version: "mvn35"
+    files: "Dockerfiles/aai-common/**"
+    build-node: ubuntu1804-docker-8c-8g
+    java-version: openjdk8