From 5f6cf175ad1e28f65fd06042ecdb444ccb01b3cf Mon Sep 17 00:00:00 2001 From: vasraz Date: Mon, 26 Jun 2023 13:40:03 +0100 Subject: [PATCH] [SDC] Execute UI and API integration tests separately to speed up verify feedback Signed-off-by: Vasyl Razinkov Change-Id: I4df70662168650363e885fb61f42909792442cb9 Issue-ID: SDC-4553 --- jjb/sdc/sdc-csit.yaml | 21 +++++++++++++++++---- jjb/sdc/sdc.yaml | 6 +++--- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index 4f4a0fa83..fcc43dc3a 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -2,20 +2,33 @@ - project: name: sdc-csit jobs: - - "{project-name}-{stream}-verify-java": - # this build is integration test only - CSIT (Verify 2/2) + - "{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,all-for-integration-tests-only,integration-tests-with-helm-validator" + 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-ui-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}-{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,all-for-integration-tests-only,integration-tests-api-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 project-name: "sdc-integration-tests" # project name in gerrit project: "sdc" diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 20a30f46e..a1aae3d23 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -29,11 +29,11 @@ jobs: - "{project-name}-{stream}-{area}-verify-shell": # This is to ensure all script are Python 3 compatible - area: verify - build-timeout: 45 + area: python + build-timeout: 9 script: !include-raw-escape: "python3-verify.sh" - "{project-name}-{stream}-verify-java": - # this build is unit test only (Verify 1/2) + # this build is unit test only (Verify 1/3) mvn-params: "-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/" build-node: "ubuntu1804-docker-8c-8g" - "{project-name}-{stream}-sdc-merge-java": -- 2.16.6