Chore: Move to ubuntu2004-builder

[ci-management.git] / jjb / optf / optf-osdf.yaml

diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index 77e421e..18865fb 100644 (file)
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -7,8 +7,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'optf-osdf-settings'
     subproject:
       - 'osdf':
@@ -17,7 +17,7 @@
           pom: 'pom.xml'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python':
-          build-node: ubuntu1804-builder-4c-4g
+          build-node: ubuntu2004-builder-4c-4g
       - '{project-name}-{stream}-{subproject}-merge-java':
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
@@ -32,12 +32,11 @@
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           docker-pom: 'pom.xml'
-          mvn-goals: 'install'
           mvn-params: '-Dmaven.test.skip=true -P docker'
 
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu2004-builder-4c-4g'
 
 - project:
     name: optf-osdf-sonar
@@ -49,7 +48,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'optf/osdf'
     project-name: 'optf-osdf'
     branch: 'master'
@@ -63,13 +62,13 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: optf/osdf
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'optf-osdf'
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'optf-osdf-settings'
 
 - project: