Chore: Move to ubuntu2004-builder

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

diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index c2aae6f..e0f23ce 100644 (file)
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -2,7 +2,6 @@
 - project:
     name: so-libs
     project-name: 'so-libs'
-    java-version: openjdk11
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
@@ -17,10 +16,9 @@
       - 'master':
           branch: 'master'
           java-version: openjdk11
-      - 'elalto':
-          branch: 'elalto'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - '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,7 +26,6 @@
     maven-deploy-properties: |
       deployAtEnd=true
     files: '**'
-    java-version: openjdk11
     archive-artifacts: ''
 
 - project:
@@ -42,7 +39,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu2004-builder-4c-4g
     project: 'so/libs'
     project-name: 'so-libs'
     java-version: openjdk11
@@ -67,10 +64,8 @@
     name: so-libs-info
     project-name: so-libs
     java-version: openjdk11
-    java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos7-builder-2c-1g
     project: so/libs
     branch: master
-    branch: elalto