X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fmodeling%2Fmodeling-etsicatalog.yaml;h=5620683743658650ccd30fc1dae0cbe085613ff2;hb=74d1201836c8e877e5e3219526c1f263f95810d4;hp=8dead6dff0c318f0f0cf878839205348f0d92421;hpb=ffc3ac818c92944c9b956633550a461457d10d36;p=ci-management.git

diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml
index 8dead6dff..562068374 100644
--- a/jjb/modeling/modeling-etsicatalog.yaml
+++ b/jjb/modeling/modeling-etsicatalog.yaml
@@ -1,35 +1,35 @@
 ---
-
 - project:
     name: modeling-etsicatalog
-    project-name: 'modeling-etsicatalog'
-    project: 'modeling/etsicatalog'
+    project-name: "modeling-etsicatalog"
+    project: "modeling/etsicatalog"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'modeling-etsicatalog-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "modeling-etsicatalog-settings"
     subproject:
-      - 'etsicatalog':
-          path: '.'
-          pattern: '**'
+      - "etsicatalog":
+          path: "."
+          pattern: "**"
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{project-name}-{stream}-{subproject}-verify-python"
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-modeling-etsicatalog-docker-image.sh'
+          sbom-generator: true
+
+      - "{project-name}-{stream}-docker-java-version-shell-daily":
+          docker-pom: "pom.xml"
+          mvn-goals: "install"
+          script: !include-raw-escape: "build-modeling-etsicatalog-docker-image.sh"
           build-node: ubuntu1804-docker-8c-8g
-      - '{project-name}-gerrit-release-jobs':
-            build-node: centos7-docker-8c-8g
-    files: '**'
-    archive-artifacts: ''
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -37,35 +37,34 @@
     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}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'modeling/etsicatalog'
-    project-name: 'modeling-etsicatalog'
-    branch: 'master'
-    mvn-settings: 'modeling-etsicatalog-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "modeling/etsicatalog"
+    project-name: "modeling-etsicatalog"
+    branch: "master"
+    mvn-settings: "modeling-etsicatalog-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: modeling-etsicatalog-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: modeling/etsicatalog
-    project-name: 'modeling-etsicatalog'
+    project-name: "modeling-etsicatalog"
     build-node: centos8-redis-4c-4g
-    branch: 'master'
-    mvn-settings: 'modeling-etsicatalog-settings'
+    branch: "master"
+    mvn-settings: "modeling-etsicatalog-settings"
 
 - project:
     name: modeling-etsicatalog-info
     project-name: modeling-etsicatalog
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: modeling/etsicatalog
     branch: master