Chore: Revert back to ubuntu1804-builder

[ci-management.git] / jjb / aai / aai-graphgraph.yaml

diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index 67b3b94..dc9a63f 100644 (file)
--- 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: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -26,20 +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
-    project: aai/graphgraph
-    branch: master
-
 - project:
     name: aai-graphgraph-sonar
     jobs:
@@ -48,13 +39,35 @@
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-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