X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-graphadmin.yaml;h=5315e2d0af15b6ce538167068b40ca90775297b8;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=55df1c5576cba1bc08b2a9f70f0d2a8841ed23aa;hpb=75875395d84a76736f1835e3cff87dac306d3299;p=ci-management.git

diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index 55df1c557..5315e2d0a 100644
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -7,70 +7,66 @@
 
 - project:
     name: aai-graphadmin-master
-    project-name: 'aai-graphadmin'
+    project-name: "aai-graphadmin"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
       - 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 -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}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'aai/graphadmin'
+          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/graphadmin"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-    mvn-settings: 'aai-graphadmin-settings'
-    mvn-version: 'mvn35'
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
+      - "jakarta":
+          branch: "jakarta"
+    mvn-settings: "aai-graphadmin-settings"
+    mvn-version: "mvn35"
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
+    java-version: openjdk8
 
 - project:
     name: aai-graphadmin-sonar
     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/graphadmin'
-    project-name: 'aai-graphadmin'
-    branch: 'master'
-    mvn-settings: 'aai-graphadmin-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: 'mvn35'
+    project: "aai/graphadmin"
+    project-name: "aai-graphadmin"
+    branch: "master"
+    mvn-settings: "aai-graphadmin-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    mvn-version: "mvn35"
+    java-version: openjdk8
 
 - project:
     name: aai-graphadmin-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'aai/graphadmin'
-    project-name: 'aai-graphadmin'
+    nexus-iq-namespace: "onap-"
+    project: "aai/graphadmin"
+    project-name: "aai-graphadmin"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'aai-graphadmin-settings'
-    mvn-version: 'mvn35'
-
-- project:
-    name: aai-graphadmin-info
-    project-name: aai-graphadmin
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: aai/graphadmin
-    branch: master
+      - "master":
+          branch: "master"
+    mvn-settings: "aai-graphadmin-settings"
+    mvn-version: "mvn35"
+    java-version: openjdk8