X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fcom-log%2Fcom-log.yaml;h=5d235a33a429f8449687a78130356c49d52a67ce;hb=HEAD;hp=658bca0159c38c0d95155897a2e7f6d798feac03;hpb=884590bccb1e6eebf18ec7ac321113c399f92f6b;p=ci-management.git diff --git a/jjb/com-log/com-log.yaml b/jjb/com-log/com-log.yaml index 658bca01..5d235a33 100644 --- a/jjb/com-log/com-log.yaml +++ b/jjb/com-log/com-log.yaml @@ -5,16 +5,7 @@ views: - project-view -- project: - name: com-log-info - project: com/log - project-name: com-log - build-node: centos7-builder-1c-1g - jobs: - - gerrit-info-yaml-verify - -- com_log_common: &com_log_common - # values apply to all com/log projects +- _com_log_common: &com_log_common # values apply to all com/log projects name: com-log-common # git repo project: com/log @@ -33,8 +24,8 @@ make-opts: -j 2 test # do not trigger on changes in docs, releases gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$' + - compare-type: REG_EXP + pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$' jobs: - gerrit-autotools-verify stream: @@ -42,7 +33,7 @@ branch: master # common settings for building DEB and RPM packages -- com_log_pkg_common: &com_log_pkg_common +- _com_log_pkg_common: &com_log_pkg_common name: com-log-pkg-common # directory with package files build-dir: pkg @@ -59,7 +50,7 @@ <<: *com_log_common <<: *com_log_pkg_common name: com-log-deb - project-name: '{name}' + project-name: "{name}" configure-opts: --with-deb-dir={build-dir} make-opts: -j4 deb-pkg @@ -68,7 +59,7 @@ <<: *com_log_common <<: *com_log_pkg_common name: com-log-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 @@ -85,16 +76,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 @@ -102,7 +93,8 @@ <<: *com_log_common # these templates ignore the pre-build script name: com-log-release + # release uses sigul which requires centos + build-node: centos7-builder-1c-1g jobs: - gerrit-packagecloud-release-verify - gerrit-packagecloud-release-merge -