Chore: Revert back to ubuntu1804-builder

[ci-management.git] / jjb / vnfsdk / vnfsdk-dovetail-integration-python.yaml

diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index 499bfae..49c7c01 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -21,7 +21,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vnfsdk-dovetail-integration-settings'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-{subproject}-merge-java'
@@ -31,7 +31,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
 #- project:
 #    name: vnfsdk-dovetail-integration-arm64
 #    project-name: 'vnfsdk-dovetail-integration-arm64'
@@ -44,7 +44,7 @@
 #      - 'master':
 #          branch: 'master'
 #    mvn-settings: 'vnfsdk-dovetail-integration-settings'
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    jobs:
 #      - '{project-name}-{stream}-docker-java-daily':
 #          docker-pom: 'pom.xml'
@@ -56,7 +56,7 @@
     jobs:
       - gerrit-tox-sonar
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'vnfsdk/dovetail-integration'
     project-name: 'vnfsdk-dovetail-integration'
     branch: 'master'
@@ -68,6 +68,7 @@
     name: vnfsdk-dovetail-integration-info
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: 'vnfsdk/dovetail-integration'
     project-name: 'vnfsdk-dovetail-integration'
     branch: 'master'
@@ -79,6 +80,10 @@
     nexus-iq-namespace: 'onap-'
     project: vnfsdk/dovetail-integration
     project-name: 'vnfsdk-dovetail-integration'
-    build-node: ubuntu1604-builder-4c-4g
-    branch: 'master'
+    build-node: ubuntu1804-builder-4c-4g
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'vnfsdk-dovetail-integration-settings'