X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fric-app-qp-aimlfw%2Fric-app-qp-aimlfw.yaml;h=91b9656fc90b93daf4db578c4ee3402f7c9058f3;hb=8376694ee0154d56843647e2602d18ddef705e3a;hp=5d70afb77b5d0adf885541f87b911f006cb51d6b;hpb=b11a26f8d1a174ae39628160beb974eb13d887dd;p=ci-management.git

diff --git a/jjb/ric-app-qp-aimlfw/ric-app-qp-aimlfw.yaml b/jjb/ric-app-qp-aimlfw/ric-app-qp-aimlfw.yaml
index 5d70afb7..91b9656f 100644
--- a/jjb/ric-app-qp-aimlfw/ric-app-qp-aimlfw.yaml
+++ b/jjb/ric-app-qp-aimlfw/ric-app-qp-aimlfw.yaml
@@ -11,11 +11,11 @@
     project-name: ric-app-qp-aimlfw
     build-node: centos7-builder-1c-1g
     branch: master
-    jobs: 
+    jobs:
       - gerrit-info-yaml-verify
 
-- qp_aimlfw_docker_common: &qp_aimlfw_docker_common
-    # values apply to all training manager projects
+- _qp_aimlfw_docker_common:
+    &qp_aimlfw_docker_common # values apply to all training manager projects
     name: ric-app-qp-aimlfw-docker-common
     # git repo
     project: ric-app/qp-aimlfw
@@ -26,26 +26,16 @@
 
 - project:
     <<: *qp_aimlfw_docker_common
-    name: ric-app-qp-aimlfw-release
-    # maven release requires sigul which requires centos
-    # container release requires docker
-    build-node: centos7-docker-2c-8g
-    jobs:
-      - '{project-name}-gerrit-release-jobs'
-
-- project:
-    <<: *qp_aimlfw_docker_common
-    name: ric-app-qp-aimlfw-docker
-    project-name: '{name}'
+    name: ric-app-qp-aimlfw
+    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:
       - "{project-name}-gerrit-docker-jobs"
     stream:
@@ -56,22 +46,26 @@
     <<: *qp_aimlfw_docker_common
     name: ric-app-qp-aimlfw-sonarqube
     # the install script assumes an ubuntu image
-    build-node: ubuntu1804-builder-2c-2g
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: './.*'
+    build-node: ubuntu1804-docker-4c-4g
+    sonar-prescan-script: !include-raw-escape: prescan-ric-app-qp-aimlfw-ubuntu.sh
     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=.
-        sonar.language=go
-        sonar.go.coverage.reportPaths=**/cover.out
-        sonar.inclusions=**/*.go
-        sonar.exclusions=**/*_test.go
+      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=.
+      sonar.language=go
+      sonar.go.coverage.reportPaths=**/cover.out
+      sonar.inclusions=**/*.go
+      sonar.exclusions=**/*_test.go
+    jobs:
+      - gerrit-sonar-prescan-script
+
+- project:
+    <<: *qp_aimlfw_docker_common
+    name: ric-app-qp-aimlfw-release
+    build-node: centos7-docker-2c-8g
     jobs:
-      - gerrit-tox-sonarqube
-  
+      - "{project-name}-gerrit-release-jobs"