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 34a6544..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
@@ -36,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:
@@ -47,7 +46,7 @@
     <<: *qp_aimlfw_docker_common
     name: ric-app-qp-aimlfw-sonarqube
     # the install script assumes an ubuntu image
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu1804-docker-4c-4g
     sonar-prescan-script: !include-raw-escape: prescan-ric-app-qp-aimlfw-ubuntu.sh
     sonar-project-file: ""
     sonar-properties: |
@@ -55,7 +54,7 @@
         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
@@ -70,4 +69,3 @@
     build-node: centos7-docker-2c-8g
     jobs:
       - '{project-name}-gerrit-release-jobs'
-