X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fvnfsdk%2Fvnfsdk-validation.yaml;h=b95c3a7663b2ec77d96267c3bb3e1e0e315fe067;hb=bcbeb86eb4579e2b94e6763a09e66ca1c6832b9d;hp=2a4a039996891e3dc8a74b9187d97eacba85bea2;hpb=5f4277f766a66dffa01cb6cfca2039b8101e1f19;p=ci-management.git

diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index 2a4a03999..b95c3a766 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -3,25 +3,39 @@
     name: vnfsdk-validation
     project-name: 'vnfsdk-validation'
     jobs:
-    - gerrit-maven-clm
     - '{project-name}-{stream}-verify-java'
     - '{project-name}-{stream}-merge-java'
-    - '{project-name}-{stream}-release-version-java-daily'
+    - gerrit-maven-stage:
+        sign-artifacts: true
+        build-node: centos7-builder-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
+        - 'frankfurt':
+            branch: 'frankfurt'
+            java-version: openjdk8
     mvn-settings: 'vnfsdk-validation-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     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'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vnfsdk/validation'
     project-name: 'vnfsdk-validation'
     branch: 'master'
@@ -33,6 +47,34 @@
     name: vnfsdk-validation-info
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-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
+    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.refrepo
+                post_script: !include-raw-escape: ./upload-artifact.sh