Chore: Revert back to ubuntu1804-docker

[ci-management.git] / jjb / vvp / vvp-validation-scripts.yaml

diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml
index 71fc710..9f9b85e 100644 (file)
--- a/jjb/vvp/vvp-validation-scripts.yaml
+++ b/jjb/vvp/vvp-validation-scripts.yaml
@@ -12,11 +12,13 @@
           path: '.'
           pattern: '**'
     mvn-settings: 'vvp-validation-scripts-settings'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     docker-pom: 'pom.xml'
     mvn-profile: 'default'
 
@@ -24,8 +26,13 @@
     name: vvp-validation-scripts-sonar
     jobs:
       - gerrit-maven-sonar
+    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-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'vvp/validation-scripts'
     project-name: 'vvp-validation-scripts'
     branch: 'master'
@@ -37,10 +44,15 @@
     name: vvp-validation-scripts-tracability-matrix
     project: 'vvp/validation-scripts'
     project-name: 'vvp-validation-scripts'
+    build-node: ubuntu1804-docker-8c-8g
+    mvn-settings: 'vvp-validation-scripts-settings'
+    mvn-global-settings: 'global-settings'
     stream:
       - 'master':
           branch: 'master'
     jobs:
       - '{project-name}-{stream}-build-and-upload':
-          script:
-              !include-raw-escape: 'build-csv.sh'
+          pre_script: !include-raw-escape: pre-build-csv.sh
+          artifact_name: traceability.csv rst.csv
+          project_id: org.onap.vvp.validation-scripts
+          post_script: !include-raw-escape: ../vnfrqts/post-upload-artifact.sh