[DMAAP] Refactor dmaap jobs

[ci-management.git] / jjb / vnfsdk / vnfsdk-validation.yaml

diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index 3d5a602..55a0117 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -13,8 +13,12 @@
         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: ''
@@ -24,6 +28,7 @@
     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}'
@@ -49,6 +54,7 @@
 
 - project:
     name: vnfsdk-validation-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
@@ -57,3 +63,18 @@
     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.validation
+                post_script: !include-raw-escape: ./upload-artifact.sh