Chore: Revert back to ubuntu1804-builder

[ci-management.git] / jjb / modeling / modeling-etsicatalog.yaml

diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml
index 0d8e74d..8dead6d 100644 (file)
--- a/jjb/modeling/modeling-etsicatalog.yaml
+++ b/jjb/modeling/modeling-etsicatalog.yaml
@@ -25,17 +25,24 @@
           mvn-goals: 'install'
           script:
             !include-raw-escape: 'build-modeling-etsicatalog-docker-image.sh'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+            build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: centos7-redis-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: modeling-etsicatalog-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: centos7-redis-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'modeling/etsicatalog'
     project-name: 'modeling-etsicatalog'
     branch: 'master'
@@ -50,7 +57,7 @@
     nexus-iq-namespace: 'onap-'
     project: modeling/etsicatalog
     project-name: 'modeling-etsicatalog'
-    build-node: centos7-redis-4c-4g
+    build-node: centos8-redis-4c-4g
     branch: 'master'
     mvn-settings: 'modeling-etsicatalog-settings'