X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fric-plt-sdl%2Fric-plt-sdl.yaml;h=8cfbc44aeb0a28bf7f233b304978c9984907e163;hb=120e8457896a9fb6572e7b699987fddff7e515ee;hp=13481a29b4f24bf808143790b2567b2ef8c86855;hpb=4545ebe2d23053fcd7e650cb55400176ee5716e1;p=ci-management.git diff --git a/jjb/ric-plt-sdl/ric-plt-sdl.yaml b/jjb/ric-plt-sdl/ric-plt-sdl.yaml index 13481a29..8cfbc44a 100644 --- a/jjb/ric-plt-sdl/ric-plt-sdl.yaml +++ b/jjb/ric-plt-sdl/ric-plt-sdl.yaml @@ -5,16 +5,7 @@ views: - project-view -- project: - name: ric-plt-sdl-info - project: ric-plt/sdl - project-name: ric-plt-sdl - build-node: centos7-builder-1c-1g - jobs: - - gerrit-info-yaml-verify - -- sdl_common: &sdl_common - # values apply to all ric-plt/sdl projects +- _sdl_common: &sdl_common # values apply to all ric-plt/sdl projects name: sdl-common # git repo project: ric-plt/sdl @@ -37,7 +28,7 @@ branch: master # common settings for building DEB and RPM packages -- sdl_pkg_common: &sdl_pkg_common +- _sdl_pkg_common: &sdl_pkg_common name: ric-plt-pkg-cmn pre-build: !include-raw-escape: setup-sdl-build-deb.sh # directory with package files @@ -55,7 +46,7 @@ <<: *sdl_common <<: *sdl_pkg_common name: ric-plt-sdl-deb - project-name: '{name}' + project-name: "{name}" configure-opts: --with-deb-dir={build-dir} make-opts: -j4 deb-pkg @@ -64,7 +55,7 @@ <<: *sdl_common <<: *sdl_pkg_common name: ric-plt-sdl-rpm - project-name: '{name}' + project-name: "{name}" configure-opts: --with-rpm-dir={build-dir} # parallel jobs (option -j) fail on rpm build # https://bugzilla.redhat.com/show_bug.cgi?id=1398405 @@ -82,22 +73,24 @@ make-opts: -j4 test_gcov sonar-project-file: "" sonar-properties: | - sonar.login={sonarcloud_api_token} - sonar.projectKey={sonarcloud_project_organization}_{project-name} - sonar.projectName={project-name} - sonar.organization={sonarcloud_project_organization} - sonar.build.sourceEncoding=UTF-8 - sonar.sources=src - sonar.cfamily.build-wrapper-output=$WORKSPACE/bw-output - sonar.cfamily.cache.enabled=false - sonar.cfamily.gcov.reportsPath=gcov_report - sonar.cfamily.threads=4 + sonar.login={sonarcloud_api_token} + sonar.projectKey={sonarcloud_project_organization}_{project-name} + sonar.projectName={project-name} + sonar.organization={sonarcloud_project_organization} + sonar.build.sourceEncoding=UTF-8 + sonar.sources=src + sonar.cfamily.build-wrapper-output=$WORKSPACE/bw-output + sonar.cfamily.cache.enabled=false + sonar.cfamily.gcov.reportsPath=gcov_report + sonar.cfamily.threads=4 jobs: - gerrit-autotools-sonarqube - project: <<: *sdl_common name: ric-plt-sdl-release + # release uses sigul which requires centos + build-node: centos7-builder-1c-1g jobs: - gerrit-packagecloud-release-verify - gerrit-packagecloud-release-merge