Chore: Move to ubuntu2004-builder

[ci-management.git] / jjb / multicloud / multicloud-framework-java.yaml

diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 3233118..5ba682a 100644 (file)
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -6,6 +6,10 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk11
+      - 'guilin':
+          branch: 'guilin'
+          java-version: openjdk11
     mvn-settings: 'multicloud-framework-settings'
     subproject:
       - 'multivimbroker':
@@ -34,7 +38,7 @@
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu2004-builder-4c-4g
 
 #- project:
 #    name: multicloud-framework-arm64-java
@@ -68,7 +72,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: 'multicloud/framework'
     project-name: 'multicloud-framework-multivimbroker'
     branch: 'master'
@@ -83,8 +87,12 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: multicloud/framework
-    project-name: 'multicloud-framework-multivimbroker'
-    branch: 'master'
+    project-name: 'multicloud-framework-multivimbroker'   
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-params: '-f multivimbroker/pom.xml'
     mvn-settings: 'multicloud-framework-settings'
 
@@ -98,10 +106,11 @@
     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: 'multicloud/framework'
     project-name: 'multicloud-framework-artifactbroker'
     branch: 'master'
+    java-version: openjdk11
     mvn-params: '-f artifactbroker/pom.xml'
     mvn-settings: 'multicloud-framework-settings'
     mvn-goals: 'clean install'
@@ -114,6 +123,11 @@
     nexus-iq-namespace: 'onap-'
     project: multicloud/framework
     project-name: 'multicloud-framework-artifactbroker'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
+    java-version: openjdk11
     mvn-params: '-f artifactbroker/pom.xml'
     mvn-settings: 'multicloud-framework-settings'