Merge "Simplify jenkins-jobs execution"

[releng/builder.git] / jjb / packaging / ansible.yaml

diff --git a/jjb/packaging/ansible.yaml b/jjb/packaging/ansible.yaml
index a2ec835bd13a12f715e7376a649e459864f186ef..3e8185ae9e5bf0d2b7e8b171ac1cef677dcd448d 100644 (file)
--- a/jjb/packaging/ansible.yaml
+++ b/jjb/packaging/ansible.yaml
@@ -17,7 +17,7 @@
 - job-template:
     name: '{project-name}-test-rpm-{stream}'
 
-    node: centos7-java-builder-1c-4g
+    node: centos7-builder-2c-8g
 
     project-type: freestyle
 
@@ -45,6 +45,7 @@
 
     builders:
       - shell: !include-raw: test-ansible-rpm.sh
+      - shell: !include-raw: test-ansible-odl-user.sh
 
     triggers:
       - timed: '@daily'
@@ -60,7 +61,7 @@
 - job-template:
     name: '{project-name}-test-deb-{stream}'
 
-    node: ubuntu1604-mininet-ovs-25-2c-4g
+    node: ubuntu1604-mininet-ovs-25-1c-4g
 
     project-type: freestyle