Chore: Revert back to ubuntu1804-docker

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

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index c787335..510e108 100644 (file)
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -2,14 +2,13 @@
 - project:
     name: so-project-view
     project-name: so
-    java.version: openjdk11
+    java-version: openjdk11
     views:
       - project-view
 
 - project:
     name: so
     project-name: 'so'
-    java.version: openjdk11
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
@@ -29,10 +28,13 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
-      - 'elalto':
-          branch: 'elalto'
+          java-version: openjdk11
+      - 'jakarta':
+          branch: 'jakarta'
+          java-version: openjdk11
+      - 'recursive-orch':
+          branch: 'recursive-orch'
+          java-version: openjdk11
     mvn-settings: 'so-settings'
     files: '**'
     archive-artifacts: ''
@@ -40,7 +42,7 @@
 
 - project:
     name: so-sonar
-    java.version: openjdk11
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
@@ -60,7 +62,7 @@
 
 - project:
     name: 'so-coverity'
-    java.version: openjdk11
+    java-version: openjdk11
     jobs:
       - 'onap-gerrit-maven-coverity'
     cron: '@daily'
@@ -89,7 +91,7 @@
 
 - project:
     name: so-clm
-    java.version: openjdk11
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
@@ -99,15 +101,22 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'so-settings'
 
 - project:
     name: so-info
     project-name: so
-    java.version: openjdk11
+    java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
     project: so
-    branch: master
-    branch: frankfurt
+    stream:
+      - 'master':
+          branch: 'master'
+          java-version: openjdk11
+      - 'jakarta':
+          branch: 'jakarta'
+          java-version: openjdk11