Merge "CPS CSIT Jenkins jobs"

[ci-management.git] / jjb / sdc / sdc.yaml

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 79c7224..b86fad4 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -28,13 +28,24 @@
     project-name: 'sdc'
     jobs:
       - '{project-name}-{stream}-verify-java':
+          # this build is unit test only (Verify 1/2)
           mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
           build-node: 'ubuntu1804-docker-8c-8g'
       - '{project-name}-{stream}-sdc-merge-java':
-          build-node: 'ubuntu1804-docker-8c-8g'
+          build-node: 'ubuntu1804-docker-8c-16g'
           docker-pom: 'pom.xml'
-          mvn-profile: 'skip-integration-tests'
+          mvn-profile: 'docker'
           mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/'
+          # running everything (unit tests and integration tests in a single job for merge, as we don't need // run
+          # for merge, but still saving integration tests results and report.
+          archive-artifacts: >
+              **/*.log
+              **/hs_err_*.log
+              **/target/**/feature.xml
+              **/target/failsafe-reports/failsafe-summary.xml
+              integration-tests/target/ExtentReport/API/*.html
+              integration-tests/target/ExtentReport/UI/*.html
+              integration-tests/target/ExtentReport/UI/screenshots/*.png
       - gerrit-maven-stage:
           build-timeout: 90
           sign-artifacts: true
@@ -94,7 +105,7 @@
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1804-docker-8c-16g
     project: 'sdc'