Chore: Revert back to ubuntu1804-builder

[ci-management.git] / jjb / aai / aai-schema-service.yaml

diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index 24c640e..663dc3b 100644 (file)
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -15,6 +15,7 @@
           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
@@ -26,13 +27,14 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'aai-schema-service-settings'
-    mvn-version: 'mvn35'
+    mvn-version: 'mvn36'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-builder-4c-4g
+    java-version: openjdk11
 
 - project:
     name: aai-schema-service-sonar
@@ -45,13 +47,14 @@
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     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
@@ -60,17 +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: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: aai/schema-service
     branch: master