X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fpti-o2%2Fpti-o2.yaml;h=ed748447b36053baca3f1af82aec2ef7fce0db2f;hb=5650e05c6468b39d4da6e1251616b3eb1d7640db;hp=5f6e62f342ac48ad3678ed9991f0732cb11bb42a;hpb=0af700625e43e9e3a8f0ec5005b0805b9a639e5a;p=ci-management.git diff --git a/jjb/pti-o2/pti-o2.yaml b/jjb/pti-o2/pti-o2.yaml index 5f6e62f3..ed748447 100644 --- a/jjb/pti-o2/pti-o2.yaml +++ b/jjb/pti-o2/pti-o2.yaml @@ -13,8 +13,7 @@ jobs: - gerrit-info-yaml-verify -- pti_o2_common: &pti_o2_common - # values apply to all pti/o2 projects +- _pti_o2_common: &pti_o2_common # values apply to all pti/o2 projects name: pti-o2-common # git repo project: pti/o2 @@ -23,8 +22,7 @@ # maven settings file has credentials mvn-settings: pti-o2-settings -- pti_o2_python: &pti_o2_python - # settings for python builds +- _pti_o2_python: &pti_o2_python # settings for python builds name: pti-o2-python # the install script assumes an ubuntu image build-node: ubuntu1804-builder-2c-2g @@ -39,40 +37,25 @@ name: pti-o2-imsdms-verify # 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-tox-verify stream: - master: branch: master -- project: - <<: *pti_o2_common - <<: *pti_o2_python - name: pti-o2-imsdms-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=src - sonar.python.coverage.reportPaths=coverage.xml - jobs: - - gerrit-tox-sonarqube - -- pti_o2_docker: &pti_o2_docker_common +- _pti_o2_docker: &pti_o2_docker_common <<: *pti_o2_common # values apply to all pti/o2 docker projects # maven settings file has docker credentials - docker-name: 'o-ran-sc/pti-o2imsdms' - docker-build-args: '--network=host -f Dockerfile' + docker-name: "o-ran-sc/pti-o2imsdms" + docker-build-args: "--network=host -f Dockerfile" # source of docker tag container-tag-method: yaml-file # docker-root: src # if no container-tag-yaml-dir is defined, container-tag.yml is taken from the docker-root + container-tag-yaml-dir: stages build-node: ubuntu1804-docker-4c-4g stream: - master: @@ -80,13 +63,16 @@ - project: <<: *pti_o2_docker_common - name: pti-o2-imsdms-docker-verify - # jenkins job name prefix - project-name: '{name}' - container-tag-method: latest - docker-build-args: '--network=host -f Dockerfile' + name: pti-o2-imsdms + # do not trigger on changes in docs, releases + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$' jobs: - - gerrit-docker-verify + - "{project-name}-gerrit-docker-jobs" + stream: + - master: + branch: master - project: <<: *pti_o2_docker_common @@ -94,9 +80,17 @@ # maven release requires sigul which requires centos # container release requires docker build-node: centos7-docker-2c-8g - container-tag-yaml-dir: release + container-tag-yaml-dir: releases gerrit_trigger_file_paths: - compare-type: REG_EXP - pattern: 'release/.*' + pattern: 'releases\/.*\.yaml' + jobs: + - "{project-name}-gerrit-release-jobs" + +- project: + <<: *pti_o2_docker_common + name: pti-o2-nexus-iq + build-node: centos7-builder-1c-1g + nexus-iq-namespace: oran- jobs: - - '{project-name}-gerrit-release-jobs' + - gerrit-tox-nexus-iq-clm