X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fric-plt-sdl%2Fric-plt-sdl.yaml;h=1e480eade8637e2f7494858480672af623bd247b;hb=3b9d35310417850d6bea6cf34c339afff5b12224;hp=f2425457ab38003329344ac94fa5a85e129156cb;hpb=d70fceabd72b01af7cef214c87e880e7e5054243;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 f2425457..1e480ead 100644 --- a/jjb/ric-plt-sdl/ric-plt-sdl.yaml +++ b/jjb/ric-plt-sdl/ric-plt-sdl.yaml @@ -13,8 +13,7 @@ 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 +36,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 +54,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 +63,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,16 +81,16 @@ 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