X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fric-app-ad%2Fric-app-ad.yaml;h=6d3aa1c803cb320a22f99734ec8fe22f3ca413ff;hb=refs%2Fheads%2Fmaster;hp=423acb5506ff80de581acf9c2e95c3b2cc08d359;hpb=4e0d56afc7d3d3d2139d0427b6fbb341c82a5b28;p=ci-management.git diff --git a/jjb/ric-app-ad/ric-app-ad.yaml b/jjb/ric-app-ad/ric-app-ad.yaml index 423acb55..c7fa3547 100644 --- a/jjb/ric-app-ad/ric-app-ad.yaml +++ b/jjb/ric-app-ad/ric-app-ad.yaml @@ -5,8 +5,7 @@ views: - project-view -- _ad_common: &ad_common - # required even though overridden everywhere +- _ad_common: &ad_common # required even though overridden everywhere name: ad-common # git repo project: ric-app/ad @@ -15,13 +14,6 @@ # maven settings file has docker credentials mvn-settings: ric-app-ad-settings -- project: - <<: *ad_common - name: ric-app-ad-info - build-node: centos7-builder-1c-1g - jobs: - - gerrit-info-yaml-verify - - project: <<: *ad_common name: ric-app-ad-docker @@ -30,14 +22,14 @@ # source of docker tag container-tag-method: yaml-file # use host network - docker-build-args: '--network=host' + docker-build-args: "--network=host" build-node: ubuntu1804-docker-4c-4g # 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: - - '{project-name}-gerrit-docker-jobs' + - "{project-name}-gerrit-docker-jobs" stream: - master: branch: master @@ -49,10 +41,9 @@ # container release requires docker build-node: centos7-docker-2c-8g jobs: - - '{project-name}-gerrit-release-jobs' + - "{project-name}-gerrit-release-jobs" -- _ad_python: &ad_python - # settings for python builds +- _ad_python: &ad_python # settings for python builds name: ad-python # the install script assumes an ubuntu image build-node: ubuntu1804-builder-2c-2g @@ -63,32 +54,18 @@ # no need to verify docs tox-envs: code,flake8 -- project: - <<: *ad_common - <<: *ad_python - name: ric-app-ad-py-verify - # do not trigger on changes in docs, releases - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$' - jobs: - - gerrit-tox-verify - stream: - - master: - branch: master - - project: <<: *ad_common <<: *ad_python name: ric-app-ad-sonarqube 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=ad - sonar.python.coverage.reportPaths=coverage.xml + 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=ad + sonar.python.coverage.reportPaths=coverage.xml jobs: - gerrit-tox-sonarqube