Make distribution-check job an ODL-releng templated job

[releng/builder.git] / jjb / ovsdb / ovsdb-openstack.yaml

diff --git a/jjb/ovsdb/ovsdb-openstack.yaml b/jjb/ovsdb/ovsdb-openstack.yaml
index 8bd0f2c852eea469623bdd276d23faa234672d26..4e2d1b93e3c57e23e3139c4cfa80f643911b2a94 100644 (file)
--- a/jjb/ovsdb/ovsdb-openstack.yaml
+++ b/jjb/ovsdb/ovsdb-openstack.yaml
@@ -21,14 +21,14 @@
             project: '{project}'
 
     wrappers:
-        - build-timeout
         - timeout:
             fail: true
-            elastic-percentage: 250
-            elastic-default-timeout: 60
-            type: elastic
+            timeout: 90
+            timeout-var: 'BUILD_TIMEOUT'
+            type: absolute
         - ssh-agent-credentials:
-            user: '{openstack-gerrit-credentials}'
+            users:
+                - '{openstack-gerrit-credentials}'
         - jclouds:
             single-use: true
 
@@ -57,20 +57,13 @@
                   - compare-type: 'ANT'
                     pattern: 'neutron/db/**'
               - project-compare-type: 'ANT'
-                project-pattern: 'openstack/devstack'
+                project-pattern: 'openstack/networking-odl'
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: 'master'
                 file-paths:
                   - compare-type: 'ANT'
-                    pattern: '**/*opendaylight*'
-                  - compare-type: 'ANT'
-                    pattern: 'lib/opendaylight'
-              - project-compare-type: 'PLAIN'
-                project-pattern: 'stackforge/networking-odl'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: 'master'
+                    pattern: '**'
             skip-vote:
                 successful: false
                 failed: false
@@ -82,13 +75,15 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-openstack-ci.sh
+            !include-raw-escape:
+                - include-raw-openstack-ci.sh
 
     publishers:
         - archive:
-            artifacts: 'opendaylight-full-logs.tgz,odl_tempest_test_list.txt'
+            artifacts: 'logs/**'
             fingerprint: false
         - email-ext:
+            subject: '[ovsdb] $DEFAULT_SUBJECT'
             attach-build-log: false
             failure: true
             unstable: true