X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fvnfsdk%2Fvnfsdk-validation.yaml;h=c34c2df805b37d38724dd5afbdc37c1c462d80e5;hb=033b99814add4901044df55101b78cedf701ddef;hp=3d5a602a1095c0c8535415d9ea9a02fcaf775f5c;hpb=c3bf5168c7c83634900f9c30fe995aab2349b846;p=ci-management.git

diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index 3d5a602a1..c34c2df80 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -6,15 +6,17 @@
     - '{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: 'vnfsdk/validation'
     stream:
-      - 'master':
-          branch: 'master'
+        - 'master':
+            branch: 'master'
+            java-version: openjdk11
     mvn-settings: 'vnfsdk-validation-settings'
     files: '**'
     archive-artifacts: ''
@@ -24,9 +26,9 @@
     name: vnfsdk-validation-sonar
     jobs:
       - 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'
@@ -42,18 +44,55 @@
     name: vnfsdk-validation-info
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: 'vnfsdk/validation'
     project-name: 'vnfsdk-validation'
     branch: 'master'
 
 - project:
     name: vnfsdk-validation-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: vnfsdk/validation
     project-name: 'vnfsdk-validation'
     build-node: ubuntu1804-builder-4c-4g
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vnfsdk-validation-settings'
+
+- project:
+      name: vnfsdk-validation-upload-docs
+      project: 'vnfsdk/validation'
+      project-name: 'vnfsdk-requirements'
+      mvn-settings: 'vnfsdk-validation-settings'
+      mvn-global-settings: 'global-settings'
+      stream:
+          - 'master':
+                branch: 'master'
+      jobs:
+          - '{project-name}-{stream}-build-and-upload':
+                pre_script: !include-raw-escape: ./generate-dosc.sh
+                project_id: org.onap.vnfsdk.validation
+                post_script: !include-raw-escape: ./upload-artifact.sh
+
+- project:
+    name: vnfsdk-validation-sonar-verify
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    jobs:
+      - gerrit-maven-sonar-verify
+    sonarcloud: true
+    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/validation'
+    project-name: 'vnfsdk-validation'
     branch: 'master'
     mvn-settings: 'vnfsdk-validation-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'