X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fso%2Fso.yaml;h=4eda33bf71c737ef38ae2f3deba703e90b4f633b;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=716bd65599dcf49340f411fffbbfeaa269c5d98c;hpb=f1a0754379362f8edbb63509e9c76df5a03ff0c9;p=ci-management.git

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 716bd6559..4eda33bf7 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -8,37 +8,42 @@
 
 - project:
     name: so
-    project-name: 'so'
+    project-name: "so"
     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
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-docker-v1-8c-8g
+          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
-    project: 'so'
+          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-2c-1g
+    project: "so"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
           java-version: openjdk11
-      - 'jakarta':
-          branch: 'jakarta'
+      - "london":
+          branch: "london"
           java-version: openjdk11
-      - 'recursive-orch':
-          branch: 'recursive-orch'
+      - "kohn":
+          branch: "kohn"
           java-version: openjdk11
-    mvn-settings: 'so-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu2004-docker-v1-8c-8g
+      - "recursive-orch":
+          branch: "recursive-orch"
+          java-version: openjdk11
+    mvn-settings: "so-settings"
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-docker-v1-8c-8g
 
 - project:
     name: so-sonar
@@ -46,36 +51,33 @@
     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}"
     max-git-repo-age-hours: 48
-    build-node: ubuntu2004-docker-v1-8c-8g
-    project: 'so'
-    project-name: 'so'
-    branch: 'master'
-    mvn-settings: 'so-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-node: ubuntu1804-docker-v1-8c-8g
+    project: "so"
+    project-name: "so"
+    branch: "master"
+    mvn-settings: "so-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-    name: 'so-coverity'
+    name: "so-coverity"
     java-version: openjdk11
     jobs:
-      - 'onap-gerrit-maven-coverity'
-    cron: '@daily'
-    build-node: 'ubuntu2004-docker-v1-8c-8g'
-    project: 'so'
-    project-name: 'so'
-    branch: 'master'
-    mvn-settings: 'so-settings'
-    mvn-params: '-DskipTests'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    coverity-project-name: 'onap-so'
-    coverity-token: 'SrGGJp9T1n1lhJn2sF72XQ'
-    coverity-user-email: 'A.Naluzhnyy@samsung.com'
+      - "onap-gerrit-maven-coverity"
+    build-node: "ubuntu1804-docker-v1-8c-8g"
+    project: "so"
+    project-name: "so"
+    branch: "master"
+    mvn-settings: "so-settings"
+    mvn-params: "-DskipTests"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    coverity-project-name: "onap-so"
+    coverity-token: "SrGGJp9T1n1lhJn2sF72XQ"
+    coverity-user-email: "A.Naluzhnyy@samsung.com"
     coverity-search-paths: >
       so-monitoring/so-monitoring-ui/src/main/frontend/src
     coverity-search-exclude-regexs: >
@@ -94,29 +96,11 @@
     java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: so
-    project-name: 'so'
-    build-node: ubuntu2004-docker-v1-8c-8g
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
-    mvn-settings: 'so-settings'
-
-- project:
-    name: so-info
-    project-name: so
-    java-version: openjdk11
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    nexus-iq-namespace: "onap-"
     project: so
+    project-name: "so"
+    build-node: ubuntu1804-docker-v1-8c-8g
     stream:
-      - 'master':
-          branch: 'master'
-          java-version: openjdk11
-      - 'jakarta':
-          branch: 'jakarta'
-          java-version: openjdk11
+      - "master":
+          branch: "master"
+    mvn-settings: "so-settings"