X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fvnfsdk%2Fvnfsdk-refrepo.yaml;h=9c3c36f4f9213b748a77bd57208061ac8fd53fbb;hb=a29dd524cc61ad4692b5ba0fee58c2276ffa0917;hp=6127944f80c5ca28529f1f31ca8051f1ed3055c2;hpb=51b4a42b699dca226f01bbc426a34f333c585c0a;p=ci-management.git

diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 6127944f8..9c3c36f4f 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -1,33 +1,32 @@
 ---
 - project:
     name: vnfsdk-refrepo
-    project-name: 'vnfsdk-refrepo'
+    project-name: "vnfsdk-refrepo"
     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: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
+          sbom-generator: true
           maven-versions-plugin: true
-          mvn-goals: 'clean package -Pdocker'
-          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: 'vnfsdk/refrepo'
+          mvn-goals: "clean package -Pdocker"
+          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: "vnfsdk/refrepo"
     stream:
-        - 'master':
-                branch: 'master'
-                java-version: openjdk11
-        - 'frankfurt':
-                branch: 'frankfurt'
-                java-version: openjdk8
-    mvn-settings: 'vnfsdk-refrepo-settings'
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+          java-version: openjdk11
+    mvn-settings: "vnfsdk-refrepo-settings"
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -36,43 +35,31 @@
       - gerrit-maven-sonar
     java-version: openjdk11
     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: 'vnfsdk/refrepo'
-    project-name: 'vnfsdk-refrepo'
-    branch: 'master'
-    mvn-settings: 'vnfsdk-refrepo-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: vnfsdk-refrepo-info
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: 'vnfsdk/refrepo'
-    project-name: 'vnfsdk-refrepo'
-    branch: 'master'
+    project: "vnfsdk/refrepo"
+    project-name: "vnfsdk-refrepo"
+    branch: "master"
+    mvn-settings: "vnfsdk-refrepo-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: vnfsdk-refrepo-clm
     java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: vnfsdk/refrepo
-    project-name: 'vnfsdk-refrepo'
+    project-name: "vnfsdk-refrepo"
     build-node: ubuntu1804-builder-4c-4g
     stream:
-      - 'master':
-          branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-    mvn-settings: 'vnfsdk-refrepo-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vnfsdk-refrepo-settings"
 
 - project:
     name: vnfsdk-refrepo-sonar-verify
@@ -82,14 +69,13 @@
     jobs:
       - gerrit-maven-sonar-verify
     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}'
-    build-node: centos7-docker-8c-8g
-    project: 'vnfsdk-refrepo'
-    project-name: 'vnfsdk-refrepo'
-    branch: 'master'
-    mvn-settings: 'vnfsdk-refrepo-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    build-node: centos8-docker-8c-8g
+    project: "vnfsdk/refrepo"
+    project-name: "vnfsdk-refrepo"
+    branch: "master"
+    mvn-settings: "vnfsdk-refrepo-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"