X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fric-app-qp%2Fric-app-qp.yaml;h=9226660763cec3a03a9cc57824073c048e9e016f;hb=refs%2Fheads%2Fmaster;hp=42025d3790543691ddb49bb66715059a963a7cd0;hpb=b0cf01badcd2717524aa17d1011a19b40036c503;p=ci-management.git diff --git a/jjb/ric-app-qp/ric-app-qp.yaml b/jjb/ric-app-qp/ric-app-qp.yaml index 42025d37..bc92e00a 100644 --- a/jjb/ric-app-qp/ric-app-qp.yaml +++ b/jjb/ric-app-qp/ric-app-qp.yaml @@ -5,8 +5,7 @@ views: - project-view -- _qp_common: &qp_common - # required even though overridden everywhere +- _qp_common: &qp_common # required even though overridden everywhere name: qp-common # git repo project: ric-app/qp @@ -14,14 +13,6 @@ project-name: ric-app-qp # maven settings file has docker credentials mvn-settings: ric-app-qp-settings - -- project: - <<: *qp_common - name: ric-app-qp-info - build-node: centos7-builder-1c-1g - jobs: - - gerrit-info-yaml-verify - - project: <<: *qp_common name: ric-app-qp-docker @@ -30,14 +21,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 +40,9 @@ # container release requires docker build-node: centos7-docker-2c-8g jobs: - - '{project-name}-gerrit-release-jobs' + - "{project-name}-gerrit-release-jobs" -- _qp_python: &qp_python - # settings for python builds +- _qp_python: &qp_python # settings for python builds name: qp-python # the install script assumes an ubuntu image build-node: ubuntu1804-builder-2c-2g @@ -63,32 +53,18 @@ # no need to verify docs tox-envs: code,flake8 -- project: - <<: *qp_common - <<: *qp_python - name: ric-app-qp-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: <<: *qp_common <<: *qp_python name: ric-app-qp-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=qp - 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=qp + sonar.python.coverage.reportPaths=coverage.xml jobs: - gerrit-tox-sonarqube