Chore: Move to centos8-builder

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

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index f408d95..7f3c1aa 100644 (file)
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -2,6 +2,7 @@
 - project:
     name: so-project-view
     project-name: so
+    java-version: openjdk11
     views:
       - project-view
 
@@ -13,7 +14,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-v1-8c-8g
@@ -27,8 +28,16 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+          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'
     files: '**'
     archive-artifacts: ''
@@ -36,11 +45,11 @@
 
 - project:
     name: so-sonar
+    java-version: openjdk11
     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'
@@ -55,6 +64,7 @@
 
 - project:
     name: 'so-coverity'
+    java-version: openjdk11
     jobs:
       - 'onap-gerrit-maven-coverity'
     cron: '@daily'
@@ -83,6 +93,7 @@
 
 - project:
     name: so-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
@@ -97,9 +108,18 @@
 - project:
     name: so-info
     project-name: so
+    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