X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fso%2Fso-so-etsi-nfvo.yaml;h=8a238587bba9a51b32c39c308ea7377b3be8f8af;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=5a54d934aa367a38151444ec4876b2b865cf27ab;hpb=65f477203888e4f64b2828c47befdf6c0bc5fd6c;p=ci-management.git

diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml
index 5a54d934a..8a238587b 100644
--- a/jjb/so/so-so-etsi-nfvo.yaml
+++ b/jjb/so/so-so-etsi-nfvo.yaml
@@ -5,43 +5,34 @@
     views:
       - project-view
 
-- project:
-    name: so-so-etsi-nfvo-info
-    project: so/so-etsi-nfvo
-    project-name: so-so-etsi-nfvo
-    build-node: centos7-builder-2c-1g
-    jobs:
-      - gerrit-info-yaml-verify
-
 - project:
     name: so-so-etsi-nfvo
-    project-name: 'so-so-etsi-nfvo'
+    project-name: "so-so-etsi-nfvo"
     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:
+          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/so-etsi-nfvo'
+          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/so-etsi-nfvo"
     stream:
-      - 'master':
-          branch: 'master'
-          java-version: openjdk11
-      - 'honolulu':
-          branch: 'honolulu'
+      - "master":
+          branch: "master"
           java-version: openjdk11
-    mvn-settings: 'so-so-etsi-nfvo-settings'
-    files: '**'
-    archive-artifacts: ''
+    mvn-settings: "so-so-etsi-nfvo-settings"
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-docker-v1-8c-8g
 
 - project:
@@ -50,30 +41,28 @@
     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: ubuntu1804-docker-v1-8c-8g
-    project: 'so/so-etsi-nfvo'
-    project-name: 'so-so-etsi-nfvo'
-    branch: 'master'
-    mvn-settings: 'so-so-etsi-nfvo-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "so/so-etsi-nfvo"
+    project-name: "so-so-etsi-nfvo"
+    branch: "master"
+    mvn-settings: "so-so-etsi-nfvo-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: so-so-etsi-nfvo-clm
     java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'so/so-etsi-nfvo'
-    project-name: 'so-so-etsi-nfvo'
+    nexus-iq-namespace: "onap-"
+    project: "so/so-etsi-nfvo"
+    project-name: "so-so-etsi-nfvo"
     build-node: ubuntu1804-docker-v1-8c-8g
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'so-so-etsi-nfvo-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "so-so-etsi-nfvo-settings"