X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Faiml-fw-awmf-tm%2Faiml-fw-awmf-tm.yaml;h=51c8fe739efa17f4d3c764e105268601a40266b9;hb=refs%2Fheads%2Fmaster;hp=adf8900521b84601aad12f4d74ee02ac529255c8;hpb=3bcdb1f34221f271df9da070c693efabba5ac004;p=ci-management.git diff --git a/jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml b/jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml index adf89005..7d1f3079 100644 --- a/jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml +++ b/jjb/aiml-fw-awmf-tm/aiml-fw-awmf-tm.yaml @@ -5,17 +5,8 @@ views: - project-view -- project: - name: aiml-fw-awmf-tm-info - project: aiml-fw/awmf/tm - project-name: aiml-fw-awmf-tm - build-node: centos7-builder-1c-1g - branch: master - jobs: - - gerrit-info-yaml-verify - -- _aiml_tm_docker_common: &aiml_tm_docker_common - # values apply to all training manager projects +- _aiml_tm_docker_common: + &aiml_tm_docker_common # values apply to all training manager projects name: aiml-fw-awmf-tm-docker-common # git repo project: aiml-fw/awmf/tm @@ -31,19 +22,19 @@ # container release requires docker build-node: centos7-docker-2c-8g jobs: - - '{project-name}-gerrit-release-jobs' + - "{project-name}-gerrit-release-jobs" - project: <<: *aiml_tm_docker_common name: aiml-fw-awmf-tm-docker - project-name: '{name}' + project-name: "{name}" # image name - docker-name: 'o-ran-sc/{name}' + docker-name: "o-ran-sc/{name}" # Dockerfile is in a subdir - docker-root: '.' + docker-root: "." # source of docker tag # dockerfile is in subdir of docker root - docker-build-args: '--network=host' + docker-build-args: "--network=host" container-tag-method: yaml-file build-node: ubuntu1804-docker-4c-4g jobs: @@ -51,46 +42,3 @@ stream: - master: branch: master -- project: - <<: *aiml_tm_docker_common - name: aiml-fw-awmf-tm-tox-verify - # the install script assumes an ubuntu image - build-node: ubuntu1804-builder-2c-2g - python-version: python3 - # skip docs on verify - tox-envs: code - tox-dir: '.' - # do not trigger on changes in docs, releases - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'trainingmgr/.*' - stream: - # run verify on all branches - # the ANT pattern is **/{branch}, we are exploiting that. - - all: - branch: master - jobs: - - gerrit-tox-verify - -- project: - <<: *aiml_tm_docker_common - name: aiml-fw-awmf-tm-sonarqube - python-version: python3 - tox-dir: '.' - # the install script assumes an ubuntu image - build-node: ubuntu1804-builder-2c-2g - # do not trigger on changes in docs, releases - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'trainingmgr/.*' - 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=trainingmgr - sonar.python.coverage.reportPaths=coverage.xml - jobs: - - gerrit-tox-sonarqube