X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsdc%2Fsdc-csit.yaml;h=a3a19eee4617e8356ed78b426c00283d918f5590;hb=refs%2Fchanges%2F98%2F135998%2F1;hp=3ebab83d718c285ca16bd61c060e4382aba211bd;hpb=7b73206231babc594aaad89069e2d8adfc60403e;p=ci-management.git

diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index 3ebab83d7..a3a19eee4 100644
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -1,55 +1,47 @@
 ---
 - 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'
-                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'
-      # project name in gerrit
-      project: 'sdc'
-      stream:
-          - 'master':
-                branch: 'master'
-          - 'guilin':
-                branch: 'guilin'
-      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'
+    name: sdc-csit
+    jobs:
+      - "{project-name}-{stream}-{subproject}-verify-java":
+          # this build is integration test only - CSIT (Verify 2/3)
+          subproject: ui
+          mvn-goals: clean install
+          # yamllint disable-line rule:line-length
+          mvn-params: "-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -Ddocker.skip.push=true -P docker,run-integration-tests-ui"
+          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/UI/*.html
+            integration-tests/target/ExtentReport/UI/screenshots/*.png
+      - "{project-name}-{stream}-{subproject}-verify-java":
+          # this build is integration test only - CSIT (Verify 3/3)
+          subproject: api
+          mvn-goals: clean install
+          # yamllint disable-line rule:line-length
+          mvn-params: "-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -Ddocker.skip.push=true -P docker,run-integration-tests-api"
+          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
+    project-name: "sdc-integration-tests"
+    # project name in gerrit
+    project: "sdc"
+    stream:
+      - "master":
+          branch: "master"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+      - "london":
+          branch: "london"
+    java-version: openjdk11
+    maven-version: "mvn36"
+    mvn-settings: "sdc-settings"
+    mvn-global-settings: global-settings