Merge "Add jjb for slice-analysis-ms service in dcaegen2"

diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml
index d976f85..ca4d1a3 100644 (file)
--- a/jjb/so/so-csit.yaml
+++ b/jjb/so/so-csit.yaml
@@ -1,6 +1,7 @@
 ---
 - project:
     name: so-csit
+    java-version: openjdk11
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'

diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 1e1deea..c2aae6f 100644 (file)
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -2,6 +2,7 @@
 - project:
     name: so-libs
     project-name: 'so-libs'
+    java-version: openjdk11
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
@@ -27,10 +28,12 @@
     maven-deploy-properties: |
       deployAtEnd=true
     files: '**'
+    java-version: openjdk11
     archive-artifacts: ''
 
 - project:
     name: so-libs-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
@@ -50,6 +53,7 @@
 
 - project:
     name: so-libs-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
@@ -62,6 +66,8 @@
 - project:
     name: so-libs-info
     project-name: so-libs
+    java-version: openjdk11
+    java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 38cc304..11b4a1f 100644 (file)
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -2,14 +2,14 @@
 - 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
+    java-version: openjdk11
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
@@ -36,13 +36,14 @@
       - 'dynamicBPMN':
           branch: 'Dynamic_BPMN'
     mvn-settings: 'so-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1804-docker-v1-8c-8g
 
 - project:
     name: so-sonar
-    java.version: openjdk11
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
@@ -62,7 +63,7 @@
 
 - project:
     name: 'so-coverity'
-    java.version: openjdk11
+    java-version: openjdk11
     jobs:
       - 'onap-gerrit-maven-coverity'
     cron: '@daily'
@@ -91,7 +92,7 @@
 
 - project:
     name: so-clm
-    java.version: openjdk11
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
@@ -106,7 +107,7 @@
 - project:
     name: so-info
     project-name: so
-    java.version: openjdk11
+    java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g