X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-graphgraph.yaml;h=173ffe56b4ab960a14f73cf3bd05ca9bdd635a3f;hb=61a0f59c466bf12a84b8b2b5d0031589bcdadc0d;hp=68f6940578d4fa6195096c42814c76ee51dd27fd;hpb=d5ebee15de6933ccfb42f46fbdda63c9f0cf912b;p=ci-management.git

diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index 68f694057..173ffe56b 100644
--- a/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -15,9 +15,10 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           mvn-params: '-P docker -Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu2004-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -26,21 +27,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'aai-graphgraph-settings'
     files: '**'
     archive-artifacts: ''
 
-- project:
-    name: aai-graphgraph-info
-    project-name: aai-graphgraph
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: aai/graphgraph
-    branch: master
-
 - project:
     name: aai-graphgraph-sonar
     jobs:
@@ -51,11 +41,33 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu2004-builder-4c-4g
     project: 'aai/graphgraph'
     project-name: 'aai-graphgraph'
     branch: 'master'
-    mvn-settings: 'aai-sparky-be-settings'
+    mvn-settings: 'aai-graphgraph-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: 'mvn35'
+
+- project:
+    name: aai-graphgraph-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: 'aai/graphgraph'
+    project-name: 'aai-graphgraph'
+    stream:
+        - 'master':
+              branch: 'master'
+        - 'istanbul':
+              branch: 'istanbul'
+    mvn-settings: 'aai-graphgraph-settings'
+
+- project:
+    name: aai-graphgraph-info
+    project-name: aai-graphgraph
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
+    project: aai/graphgraph
+    branch: master