X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsdc%2Fsdc-csit.yaml;h=714aa77123ab51655055c20781026b7a7802f84b;hb=a6785bf4f9e357cbcd1e5f264122e6725db8d08b;hp=3ebab83d718c285ca16bd61c060e4382aba211bd;hpb=fc6829cb1eaed49071a9a9bed27c580a9227100a;p=ci-management.git

diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index 3ebab83d7..714aa7712 100644
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -2,54 +2,28 @@
 - project:
       name: sdc-csit
       jobs:
-          - '{project-name}-review-verification-maven-{stream}':
-                build-node: ubuntu1804-docker-8c-16g
-                container-public-registry: 'nexus3.onap.org:10001'
-                container-snapshot-registry: 'nexus3.onap.org:10003'
+          - '{project-name}-{stream}-verify-java':
+                # this build is integration test only - CSIT (Verify 2/2)
                 mvn-goals: clean install
-                mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/ -Ddocker.skip.push=true -P docker, all-for-integration-tests-only'
-                maven-versions-plugin: true
-          - '{project-name}-merge-verification-maven-{stream}':
-                build-node: ubuntu1804-docker-8c-16g
-                container-public-registry: 'nexus3.onap.org:10001'
-                container-snapshot-registry: 'nexus3.onap.org:10003'
-                mvn-goals: clean install
-                mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/ -Ddocker.skip.push=true -P docker, all-for-integration-tests-only'
-                maven-versions-plugin: true
-
-      project-name: 'sdc'
-      recipients: 'christophe.closset@intl.att.com'
+                mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -Ddocker.skip.push=true -P docker,all-for-integration-tests-only,integration-tests-with-helm-validator'
+                build-node: 'ubuntu1804-docker-8c-16g'
+                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
+      project-name: 'sdc-integration-tests'
       # project name in gerrit
       project: 'sdc'
       stream:
           - 'master':
                 branch: 'master'
-          - 'guilin':
-                branch: 'guilin'
+          - 'honolulu':
+                branch: 'honolulu'
       java-version: openjdk11
       mvn-version: 'mvn36'
       mvn-settings: 'sdc-settings'
       mvn-global-settings: global-settings
-      robot-options: ''
-      branch: 'master'
-
-#- project:
-#    name: sdc-csit-arm64
-#    jobs:
-#      - '{project-name}-arm64-{stream}-verify-csit-{functionality}-testng'
-#      - '{project-name}-arm64-{stream}-csit-{functionality}-testng'
-#    project-name: 'sdc'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    functionality:
-#      - 'sanity':
-#          trigger_jobs: '{project-name}-{stream}-sdc-merge-java'
-#      - 'nightly':
-#          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
-#      - 'uiSanity':
-#          trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
-#    robot-options: ''
-#    branch: 'master'
-#    html-dir: 'archives'
-#    html-files: 'SDC_CI_Extent_Report.html'