X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-aai-common.yaml;h=e391275155060ed29814d5468e1bf5f5b5a1a09c;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=6236f65fc51f5cae40fac80eaf3f2395c2d59bf7;hpb=c853fad94c79676496678c07991b8ede4c494ae7;p=ci-management.git

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 6236f65fc..e39127515 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -7,28 +7,32 @@
 
 - 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-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'aai/aai-common'
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "aai/aai-common"
     stream:
-      - 'master':
-          branch: 'master'
-          mvn-params: '-P spring-boot-2-1'
-      - 'istanbul':
-          branch: 'istanbul'
-          mvn-params: '-P spring-boot-2-1'
-    mvn-settings: 'aai-aai-common-settings'
-    mvn-version: 'mvn35'
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+          mvn-params: "-P spring-boot-2-1"
+      - "jakarta":
+          branch: "jakarta"
+          mvn-params: "-P spring-boot-2-1"
+      - "kohn":
+          branch: "kohn"
+          mvn-params: "-P spring-boot-2-1"
+    mvn-settings: "aai-aai-common-settings"
+    mvn-version: "mvn35"
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
     java-version: openjdk8
 
@@ -37,85 +41,65 @@
     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'
+    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: '-P spring-boot-2-1'
-    mvn-settings: 'aai-aai-common-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: 'mvn35'
+    project: "aai/aai-common"
+    project-name: "aai-aai-common"
+    branch: "master"
+    mvn-params: "-P spring-boot-2-1"
+    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-'
+    nexus-iq-namespace: "onap-"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'aai/aai-common'
-    project-name: 'aai-aai-common'
+    project: "aai/aai-common"
+    project-name: "aai-aai-common"
     stream:
-        - 'master':
-              branch: 'master'
-        - 'istanbul':
-              branch: 'istanbul'
-    mvn-params: '-P spring-boot-2-1'
-    mvn-settings: 'aai-aai-common-settings'
-    mvn-version: 'mvn35'
+      - "master":
+          branch: "master"
+    mvn-params: "-P spring-boot-2-1"
+    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
-    build-node: centos7-builder-2c-1g
-    project: aai/aai-common
-    branch: master
-
-- project:
-    name: 'aai-aai-common-docker'
-    jobs:
-      - '{project-name}-{stream}-verify-docker'
-      - '{project-name}-{stream}-merge-docker'
       - gerrit-maven-docker-stage:
-          mvn-params: '-P docker -Dmaven.test.skip=true'
+          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'
+          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: '-P spring-boot-2-1,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/**'
+      - "master":
+          branch: "master"
+          distro: "alpine"
+          mvn-params: "-P spring-boot-2-1,docker"
+      - "jakarta":
+          branch: "jakarta"
+          distro: "alpine"
+          mvn-params: "-P spring-boot-2-1,docker"
+      - "kohn":
+          branch: "kohn"
+          distro: "alpine"
+          mvn-params: "-P spring-boot-2-1,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
-
-- project:
-    name: 'aai-aai-common-whitesource'
-    project-name: 'aai-aai-common'
-    build-node: ubuntu1804-docker-8c-8g
-    jobs:
-      - gerrit-whitesource-scan
-    mvn-params: '-P spring-boot-2-1'
-    mvn-settings: 'aai-aai-common-settings'
-    wss-product-name: 'aai'
-    mvn-clean-install: true
-    project: 'aai/aai-common'
-    branch: master
-    java-version: openjdk8