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=4ef353f35e9d7fb1d09d449fa47f38f8a1451799;hp=ca30280fac9e3d298572401647fee024ce4194d8;hpb=f38e297cc5dfaf51b6a1e0afc349470d23e1b265;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 ca30280f..51c8fe73 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:
@@ -59,11 +50,11 @@
     python-version: python3
     # skip docs on verify
     tox-envs: code
-    tox-dir: '.'
+    tox-dir: "."
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'trainingmgr/.*'
+        pattern: "trainingmgr/.*"
     stream:
       # run verify on all branches
       # the ANT pattern is **/{branch}, we are exploiting that.
@@ -76,23 +67,21 @@
     <<: *aiml_tm_docker_common
     name: aiml-fw-awmf-tm-sonarqube
     python-version: python3
-    tox-dir: '.'
+    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/.*'
+        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=trainingmgr/coverage.xml
-        sonar.inclusions=trainingmgr/**.py
-        sonar.exclusions=tests/**.py
+      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