Refactor!: Update JJB code to comply with 5.x

[ci-management.git] / jjb / ric-app-qp-aimlfw / ric-app-qp-aimlfw.yaml

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 5d70afb..807e2d4 100644 (file)
--- a/jjb/ric-app-qp-aimlfw/ric-app-qp-aimlfw.yaml
+++ b/jjb/ric-app-qp-aimlfw/ric-app-qp-aimlfw.yaml
@@ -11,10 +11,10 @@
     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
+- _qp_aimlfw_docker_common: &qp_aimlfw_docker_common
     # values apply to all training manager projects
     name: ric-app-qp-aimlfw-docker-common
     # git repo
@@ -26,16 +26,7 @@
 
 - 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
+    name: ric-app-qp-aimlfw
     project-name: '{name}'
     # image name
     docker-name: 'o-ran-sc/{name}'
@@ -45,7 +36,6 @@
     # dockerfile is in subdir of docker root
     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.build.sourceEncoding=UTF-8
         sonar.sources=.
         sonar.language=go
         sonar.go.coverage.reportPaths=**/cover.out
         sonar.inclusions=**/*.go
         sonar.exclusions=**/*_test.go
     jobs:
-      - gerrit-tox-sonarqube
-  
+      - gerrit-sonar-prescan-script
+
+- project:
+    <<: *qp_aimlfw_docker_common
+    name: ric-app-qp-aimlfw-release
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'