X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-traversal.yaml;h=1e8f3822890b08e075767cba33352c872b708151;hb=ffc3ac818c92944c9b956633550a461457d10d36;hp=33934c680dab9af73683eae0d796a1b703674eb5;hpb=648ce69128bac220b16736cfbca9f911a04ad2a5;p=ci-management.git

diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 33934c680..1e8f38228 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -9,37 +9,47 @@
     name: aai-traversal-master
     project-name: 'aai-traversal'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-verify-java':
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-{stream}-merge-java':
+          build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
+          mvn-params: '-DskipTests'
           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':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
     project: 'aai/traversal'
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'aai-traversal-settings'
     mvn-version: 'mvn35'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
+    java-version: openjdk8
 
 - project:
     name: aai-traversal-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'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'aai/traversal'
     project-name: 'aai-traversal'
     branch: 'master'
@@ -47,6 +57,7 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     mvn-version: 'mvn35'
+    java-version: openjdk8
 
 - project:
     name: aai-traversal-clm
@@ -56,15 +67,19 @@
     project: 'aai/traversal'
     project-name: 'aai-traversal'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+        - 'master':
+              branch: 'master'
+        - 'istanbul':
+              branch: 'istanbul'
     mvn-settings: 'aai-traversal-settings'
     mvn-version: 'mvn35'
+    java-version: openjdk8
 
 - project:
     name: aai-traversal-info
     project-name: aai-traversal
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
     project: aai/traversal
     branch: master