Merge "Chore: Automation adds modeling-yang-kit.yaml"

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

diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index c6d9ab5..c5e1421 100644 (file)
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -1,67 +1,55 @@
 ---
 - project:
     name: so-libs
-    project-name: 'so-libs'
+    project-name: "so-libs"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{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
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'so/libs'
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "so/libs"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
-      - 'frankfurt':
-          branch: 'frankfurt'
-    mvn-settings: 'so-libs-settings'
+      - "master":
+          branch: "master"
+          java-version: openjdk11
+    mvn-settings: "so-libs-settings"
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
     # in the job
     maven-deploy-properties: |
       deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
 
 - project:
     name: so-libs-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'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'so/libs'
-    project-name: 'so-libs'
-    branch: 'master'
-    mvn-settings: 'so-libs-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "so/libs"
+    project-name: "so-libs"
+    branch: "master"
+    mvn-settings: "so-libs-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: so-libs-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: so/libs
-    project-name: 'so-libs'
-    branch: 'master'
-    mvn-settings: 'so-libs-settings'
-
-- project:
-    name: so-libs-info
-    project-name: so-libs
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: so/libs
-    branch: master
-    branch: elalto
+    project-name: "so-libs"
+    branch: "master"
+    mvn-settings: "so-libs-settings"