Merge "Configure tep-ip for genius auto tunnels"

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

diff --git a/jjb/packaging/ansible.yaml b/jjb/packaging/ansible.yaml
index 608c4879063a17a4b9a22e1fc20090492b23af4d..dcf221405e6bb85dec5aaf3abe7a261db730fc9b 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'
 
@@ -44,12 +44,12 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-test-ansible-rpm.sh
+      - shell: !include-raw: test-ansible-rpm.sh
 
     triggers:
       - timed: '@daily'
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
@@ -87,12 +87,12 @@
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw: include-raw-test-ansible-deb.sh
+      - shell: !include-raw: test-ansible-deb.sh
 
     triggers:
       - timed: '@daily'
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'