Chore: Revert back to ubuntu1804-builder

[ci-management.git] / jjb / so / so-libs.yaml

diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index acc45f1..9846475 100644 (file)
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -15,8 +15,10 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+          java-version: openjdk11
+      - 'honolulu':
+          branch: 'honolulu'
+          java-version: openjdk11
     mvn-settings: 'so-libs-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -28,17 +30,19 @@
 
 - project:
     name: so-libs-sonar
+    java-version: openjdk11
     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: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'so/libs'
     project-name: 'so-libs'
+    java-version: openjdk11
     branch: 'master'
     mvn-settings: 'so-libs-settings'
     mvn-goals: 'clean install'
@@ -46,19 +50,22 @@
 
 - project:
     name: so-libs-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: so/libs
     project-name: 'so-libs'
+    java-version: openjdk11
     branch: 'master'
     mvn-settings: 'so-libs-settings'
 
 - project:
     name: so-libs-info
     project-name: so-libs
+    java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: so/libs
     branch: master
-    branch: elalto