[POLICY]Add Apex-PDP postgres tests

[ci-management.git] / jjb / so / so.yaml

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 11b4a1f..de5c111 100644 (file)
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -9,34 +9,38 @@
 - project:
     name: so
     project-name: 'so'
-    java-version: openjdk11
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
+          sbom-generator: true
           build-node: ubuntu1804-docker-v1-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -DskipTests'
           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
+          build-node: centos7-docker-2c-1g
     project: 'so'
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-      - 'elalto':
-          branch: 'elalto'
-      - 'dynamicBPMN':
-          branch: 'Dynamic_BPMN'
+          java-version: openjdk11
+      - 'jakarta':
+          branch: 'jakarta'
+          java-version: openjdk11
+      - 'kohn':
+          branch: 'kohn'
+          java-version: openjdk11
+      - 'recursive-orch':
+          branch: 'recursive-orch'
+          java-version: openjdk11
     mvn-settings: 'so-settings'
-    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-docker-v1-8c-8g
@@ -48,7 +52,6 @@
       - 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'
@@ -110,7 +113,15 @@
     java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: so
-    branch: master
-    branch: frankfurt
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+      - 'jakarta':
+          branch: 'jakarta'
+          java-version: openjdk11
+      - 'kohn':
+          branch: 'kohn'
+          java-version: openjdk11