From: Lott, Christopher (cl778h) Date: Mon, 27 Jan 2020 15:00:51 +0000 (-0500) Subject: Point maven to dashboard code with -f option X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=1a021cf9946baf91dc0aa10913840688c39337a0 Point maven to dashboard code with -f option Reorganized portal/ric-dashboard repository to simplify job triggers for code, docs and releases which avoids spurious job failures. Signed-off-by: Lott, Christopher (cl778h) Change-Id: Ib8008760a165497eacf04e8f139f17fda3b8d852 --- diff --git a/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml b/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml index 70270485..908e5782 100644 --- a/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml +++ b/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml @@ -25,10 +25,14 @@ # defaults.yaml value is NOT used due to value set in lf-maven-jobs.yaml java-version: openjdk11 +# build docker images from code - project: <<: *portal_ric_dashboard_common name: portal-ric-dashboard-project - mvn-params: -Dbuild.number=${{BUILD_NUMBER}} + mvn-params: -f dashboard -Dbuild.number=${{BUILD_NUMBER}} + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'dashboard/.*' jobs: - gerrit-maven-docker-verify - gerrit-maven-docker-merge @@ -39,21 +43,22 @@ - master: branch: master +# analyze code periodically - project: <<: *portal_ric_dashboard_common name: portal-ric-dashboard-clm - mvn-goals: test - branch: master + # template goal install builds docker image unnecessarily + mvn-params: -f dashboard -Ddocker.skip=true nexus-iq-namespace: 'oran-' jobs: - gerrit-maven-clm +# report test coverage periodically - project: <<: *portal_ric_dashboard_common name: portal-ric-dashboard-sonar - branch: master - # template goal install builds image which is not needed - mvn-params: -Ddocker.skip=true + # template goal install builds docker image unnecessarily + mvn-params: -f dashboard -Ddocker.skip=true sonarcloud: true sonarcloud-api-token: '{sonarcloud_api_token}' sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' @@ -61,10 +66,10 @@ jobs: - gerrit-maven-sonar +# promote container images to release registry - project: <<: *portal_ric_dashboard_common name: portal-ric-dashboard-release - branch: master # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g