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 ff961d9a0c6e91555f34884d4548aadabe6123e5..3e8185ae9e5bf0d2b7e8b171ac1cef677dcd448d 100644 (file)
--- a/jjb/packaging/ansible.yaml
+++ b/jjb/packaging/ansible.yaml
@@ -4,9 +4,9 @@
     project-name: ansible
 
     jobs:
-      - '{project-name}-verify-tox-{stream}'
       - '{project-name}-test-rpm-{stream}'
       - '{project-name}-test-deb-{stream}'
+      - gerrit-tox-verify
 
     project: 'integration/packaging/ansible-opendaylight'
 
@@ -17,7 +17,7 @@
 - job-template:
     name: '{project-name}-test-rpm-{stream}'
 
-    node: centos7-java-builder-2c-4g
+    node: centos7-builder-2c-8g
 
     project-type: freestyle
 
@@ -45,11 +45,12 @@
 
     builders:
       - shell: !include-raw: test-ansible-rpm.sh
+      - shell: !include-raw: test-ansible-odl-user.sh
 
     triggers:
       - timed: '@daily'
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
@@ -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
 
@@ -92,7 +93,7 @@
     triggers:
       - timed: '@daily'
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'