X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fvnfsdk%2Fvnfsdk-validation.yaml;h=54cee4a0a8fe8a314650f1ef0e04abf808110d9d;hb=5e7a1ae75944e02943490751184a2b2301079497;hp=1146d76ba12aa66b211ad0a660d191af56ef3676;hpb=7695283ef892635255e8180512ff5bd90d9e55bf;p=ci-management.git

diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index 1146d76ba..54cee4a0a 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -7,7 +7,7 @@
     - '{project-name}-{stream}-merge-java'
     - gerrit-maven-stage:
         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
@@ -16,9 +16,6 @@
         - 'master':
             branch: 'master'
             java-version: openjdk11
-        - 'frankfurt':
-            branch: 'frankfurt'
-            java-version: openjdk8
     mvn-settings: 'vnfsdk-validation-settings'
     files: '**'
     archive-artifacts: ''
@@ -31,7 +28,6 @@
     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'
@@ -47,7 +43,7 @@
     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'
@@ -61,7 +57,9 @@
     project: vnfsdk/validation
     project-name: 'vnfsdk-validation'
     build-node: ubuntu1804-builder-4c-4g
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
     mvn-settings: 'vnfsdk-validation-settings'
 
 - project:
@@ -70,11 +68,30 @@
       project-name: 'vnfsdk-requirements'
       mvn-settings: 'vnfsdk-validation-settings'
       mvn-global-settings: 'global-settings'
-      mvn-goals: 'clean install -DskipDocsGeneration=false'
       stream:
           - 'master':
                 branch: 'master'
       jobs:
           - '{project-name}-{stream}-build-and-upload':
-                project_id: org.onap.vnfsdk.refrepo
+                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'