X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fric-app-lp%2Fric-app-lp.yaml;h=82867fc609a21a5b60cb5834ba017c2b8227e08e;hb=HEAD;hp=d40da669ff7f5a30cc490134b8f604874181274b;hpb=3bcdb1f34221f271df9da070c693efabba5ac004;p=ci-management.git diff --git a/jjb/ric-app-lp/ric-app-lp.yaml b/jjb/ric-app-lp/ric-app-lp.yaml index d40da669..82867fc6 100644 --- a/jjb/ric-app-lp/ric-app-lp.yaml +++ b/jjb/ric-app-lp/ric-app-lp.yaml @@ -5,8 +5,7 @@ views: - project-view -- _lp_common: &lp_common - # required even though overridden everywhere +- _lp_common: &lp_common # required even though overridden everywhere name: lp-common # git repo project: ric-app/lp @@ -14,14 +13,6 @@ project-name: ric-app-lp # maven settings file has docker credentials mvn-settings: ric-app-lp-settings - -- project: - <<: *lp_common - name: ric-app-lp-info - build-node: centos7-builder-1c-1g - jobs: - - gerrit-info-yaml-verify - - project: <<: *lp_common name: ric-app-lp-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" -- _lp_python: &lp_python - # settings for python builds +- _lp_python: &lp_python # settings for python builds name: lp-python # the install script assumes an ubuntu image build-node: ubuntu1804-builder-2c-2g @@ -62,33 +52,3 @@ python-version: python3 # no need to verify docs tox-envs: code,flake8 - -- project: - <<: *lp_common - <<: *lp_python - name: ric-app-lp-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: - <<: *lp_common - <<: *lp_python - name: ric-app-lp-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=lp - sonar.python.coverage.reportPaths=coverage.xml - jobs: - - gerrit-tox-sonarqube