Chore: Revert back to ubuntu1804-builder

[ci-management.git] / jjb / multicloud / multicloud-openstack.yaml

diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 38cdf71..f78ca6d 100644 (file)
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -65,7 +65,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: centos7-docker-8c-8g
           maven-goals: install
           mvn-params: '-P docker'
           maven-versions-plugin: true
@@ -75,7 +75,7 @@
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-memcached-4c-4g'
+    build-node: 'centos7-builder-4c-4g'
 
 #- project:
 #    name: multicloud-openstack-arm64
@@ -91,7 +91,7 @@
 #          mvn-goals: 'install'
 #          script:
 #            !include-raw-escape: 'build-multicloud-openstack-docker-image.sh'
-#          build-node: ubuntu1604-docker-arm64-4c-2g
+#          build-node: ubuntu1804-docker-arm64-4c-2g
 #    files: '**'
 #    archive-artifacts: ''
 #
@@ -106,7 +106,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack'
     project-name: 'multicloud-openstack-windriver'
     branch: 'master'
@@ -125,7 +125,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack'
     project-name: 'multicloud-openstack-pike'
     branch: 'master'
@@ -144,7 +144,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack'
     project-name: 'multicloud-openstack-starlingx'
     branch: 'master'
@@ -160,8 +160,12 @@
     nexus-iq-namespace: 'onap-'
     project: multicloud/openstack
     project-name: 'multicloud-openstack'
-    build-node: ubuntu1604-memcached-4c-4g
-    branch: 'master'
+    build-node: ubuntu2004-memcached-4c-4g
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'multicloud-openstack-settings'
 
 - project:
@@ -174,7 +178,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack'
     project-name: 'multicloud-openstack-fcaps'
     branch: 'master'
@@ -193,7 +197,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
 #    cron: '@daily'
-#    build-node: ubuntu1604-builder-4c-4g
+#    build-node: ubuntu1804-builder-4c-4g
 #    project: 'multicloud/openstack'
 #    project-name: 'multicloud-openstack-lenovo'
 #    branch: 'master'
@@ -212,7 +216,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'multicloud/openstack'
     project-name: 'multicloud-openstack-hpa'
     branch: 'master'
@@ -226,5 +230,6 @@
     project-name: multicloud-openstack
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: multicloud/openstack
     branch: master