X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fpackaging%2Fansible.yaml;h=42ad10afa791e38cd535dd8b5ab87d35e1a446f4;hb=41884a319c2451abc38408b96a1faeacc84c771b;hp=ff961d9a0c6e91555f34884d4548aadabe6123e5;hpb=ad55d5440b3f444c7a2d202d65765eb1aa1e5323;p=releng%2Fbuilder.git

diff --git a/jjb/packaging/ansible.yaml b/jjb/packaging/ansible.yaml
index ff961d9a0..42ad10afa 100644
--- 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-2g
 
     project-type: freestyle
 
@@ -44,15 +44,20 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: test-ansible-rpm.sh
+      - shell: !include-raw: setup-ansible-rpm.sh
+      - shell: !include-raw: test-ansible-rpm-default-config.sh
+      - shell: !include-raw: test-ansible-rpm-custom-config.sh
+      - shell: !include-raw: test-ansible-rpm-upgrade.sh
 
     triggers:
       - timed: '@daily'
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
+          forbidden-files: ''
+
 
     publishers:
       - lf-infra-publish
@@ -60,7 +65,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
 
@@ -87,15 +92,19 @@
           build-timeout: '{build-timeout}'
 
     builders:
+      - shell: !include-raw: setup-ansible-deb.sh
       - shell: !include-raw: test-ansible-deb.sh
+      - shell: !include-raw: test-ansible-odl-user.sh
+      - shell: !include-raw: test-odl-logs.sh
 
     triggers:
       - timed: '@daily'
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
+          forbidden-files: ''
 
     publishers:
       - lf-infra-publish