X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faai%2Faai-schema-service.yaml;h=663dc3b02fe705003517528ee9a4311a08d5a36d;hb=57121bc34dac5e6a99cc5949e44db7c7b1c61aed;hp=0203729729f208a194ab4b748cf22f3b41220813;hpb=a18242e4d24d3ea95b7fa484085f6028028594b1;p=ci-management.git

diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index 020372972..663dc3b02 100644
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -11,35 +11,50 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'aai-schema-service/pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+      - gerrit-maven-stage:
+          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: 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/schema-service'
     stream:
       - 'master':
           branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'aai-schema-service-settings'
-    mvn-version: 'mvn35'
+    mvn-version: 'mvn36'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
+    java-version: openjdk11
 
 - project:
     name: aai-schema-service-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-builder-4c-4g
+    java-version: openjdk11
     project: 'aai/schema-service'
     project-name: 'aai-schema-service'
     branch: 'master'
     mvn-settings: 'aai-schema-service-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: 'mvn35'
+    mvn-version: 'mvn36'
 
 - project:
     name: aai-schema-service-clm
@@ -48,16 +63,20 @@
     nexus-iq-namespace: 'onap-'
     project: 'aai/schema-service'
     project-name: 'aai-schema-service'
+    java-version: openjdk11
     stream:
-      - 'master':
-          branch: 'master'
+        - 'master':
+              branch: 'master'
+        - 'istanbul':
+              branch: 'istanbul'
     mvn-settings: 'aai-schema-service-settings'
-    mvn-version: 'mvn35'
+    mvn-version: 'mvn36'
 
 - project:
     name: aai-schema-service-info
     project-name: aai-schema-service
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
     project: aai/schema-service
     branch: master