Create a opendaylight-infra-wrapper macro

This macro is used to set the required default wrappers for all
opendaylight jenkins jobs.

Change-Id: I5bd48b81fec25387aa37b133f9197f5db3712c79
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/docs/jenkins.rst b/docs/jenkins.rst
index 04b45efc27d4ac17878f929318a73575e9729144..ca06e3f01f5e7b9ce8ef5e590e66e0032f6c4b00 100644 (file)
--- a/docs/jenkins.rst
+++ b/docs/jenkins.rst
@@ -544,6 +544,9 @@ The *Gerrit Trigger* listed in the jobs are keywords that can be used to
 trigger the job to run manually by simply leaving a comment in Gerrit for the
 patch you wish to trigger against.
 
+All jobs have a default build-timeout value of 360 minutes (6 hrs) but can be
+overrided via the opendaylight-infra-wrappers' build-timeout property.
+
 .. raw:: html
 
     <table class="table table-bordered">

diff --git a/jjb-templates/clm.yaml b/jjb-templates/clm.yaml
index 05dd0d44bdd34015fbee1fe9f2ac8d8f30d7103e..20017d91de5f417832d37d7818008e184e29a6a2 100644 (file)
--- a/jjb-templates/clm.yaml
+++ b/jjb-templates/clm.yaml
@@ -23,12 +23,8 @@
             branch: '{branch}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-        - openstack:
-            single-use: true
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: 'H H * * 6'

diff --git a/jjb-templates/distribution-check.yaml b/jjb-templates/distribution-check.yaml
index 7451c658f648e8677155d7094f9a87d8a046fe0b..3e321a4cf1e2562482ae153e91ea483db2b694a0 100644 (file)
--- a/jjb-templates/distribution-check.yaml
+++ b/jjb-templates/distribution-check.yaml
@@ -38,12 +38,8 @@
             branch: '{branch}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-        - openstack:
-            single-use: true
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:

diff --git a/jjb-templates/distribution.yaml b/jjb-templates/distribution.yaml
index 04e9854f6778d9614aba4e8b2d0b58cdcdd874c5..3e4f7844671e7e6afcc6ccfa8883e47b259a4586 100644 (file)
--- a/jjb-templates/distribution.yaml
+++ b/jjb-templates/distribution.yaml
@@ -26,12 +26,8 @@
             branch: '{branch}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-        - openstack:
-            single-use: true
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - reverse:

diff --git a/jjb-templates/integration.yaml b/jjb-templates/integration.yaml
index 18f47b65b1c72968823f3724ae94d367ef0ea726..5701c79ba120386cd37a96276eee707df28b8bf2 100644 (file)
--- a/jjb-templates/integration.yaml
+++ b/jjb-templates/integration.yaml
@@ -33,12 +33,8 @@
             branch: '{branch}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-        - openstack:
-            single-use: true
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - reverse:

diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml
index 98c05f62a97efb2466607121ffb397cdc38281c4..0c865dd6c9ec8315bd70a7fab58bd3a3ec87da26 100644 (file)
--- a/jjb-templates/merge.yaml
+++ b/jjb-templates/merge.yaml
@@ -35,12 +35,8 @@
             choosing-strategy: 'default'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-        - openstack:
-            single-use: true
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: 'H H * * 0'

diff --git a/jjb-templates/periodic.yaml b/jjb-templates/periodic.yaml
index d901bc02da0202ffde709b655bae0f1a27321ca5..d8a6a0919e59bff2f56fa3693d2ce0501df69d58 100644 (file)
--- a/jjb-templates/periodic.yaml
+++ b/jjb-templates/periodic.yaml
@@ -32,12 +32,8 @@
             branch: '{branch}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-        - openstack:
-            single-use: true
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: '@daily'

diff --git a/jjb-templates/sonar.yaml b/jjb-templates/sonar.yaml
index fd8764c29c0a6bbe43e9546f8fcba82f152eef70..e91292582615e2986527090048bdf17e44ee8126 100644 (file)
--- a/jjb-templates/sonar.yaml
+++ b/jjb-templates/sonar.yaml
@@ -23,12 +23,8 @@
             branch: 'SONAR_BRANCH'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-        - openstack:
-            single-use: true
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: 'H H * * 6'

diff --git a/jjb-templates/validate-autorelease.yaml b/jjb-templates/validate-autorelease.yaml
index 546ee86c8ef9b9a8875a52355c0305ae4122e2de..e2250a45cbb81933627ced61b1eb071df03d6e97 100644 (file)
--- a/jjb-templates/validate-autorelease.yaml
+++ b/jjb-templates/validate-autorelease.yaml
@@ -42,12 +42,8 @@
                 timeout: 60
 
     wrappers:
-        - autorelease-build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-        - openstack:
-            single-use: true
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:

diff --git a/jjb-templates/verify.yaml b/jjb-templates/verify.yaml
index cfc4e2d6764f9bfbde945f9d5ac4572a59125e5a..6c4e7c93e5081d1cef21e2ba5ba99e9076b2f1ca 100644 (file)
--- a/jjb-templates/verify.yaml
+++ b/jjb-templates/verify.yaml
@@ -41,10 +41,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-patch-submitted:

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 5f2da254e701aa2f4ffcd68efd9660fc91de9e3a..361300db382a04dc841e06b007f52f710108ffb5 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -32,10 +32,8 @@
                 timeout: 60
 
     wrappers:
-        - autorelease-build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '1440'
 
     triggers:
         - timed: 'H 0 * * *'
@@ -116,13 +114,8 @@
                 recursive: true
 
     wrappers:
-        - timeout:
-            type: absolute
-            timeout: 30
-            fail: true
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '30'
 
     triggers:
         - timed: '0 0 * * 0'
@@ -187,9 +180,8 @@
         choosing-strategy: 'default'
 
     wrappers:
-    - ssh-agent-credentials:
-        users:
-        - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
     - autorelease-trigger-patch-site-merged:
@@ -241,9 +233,8 @@
         choosing-strategy: 'gerrit'
 
     wrappers:
-    - ssh-agent-credentials:
-        users:
-        - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
     - autorelease-trigger-patch-site-submitted:

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 51075e4d2d699d1687c63438e86fbb769202e273..d0891acf1558d20b0fd199a3d9059f1991e987a3 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -29,9 +29,8 @@
             refspec: 'refs/heads/{branch}'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '30'
 
     triggers:
         - gerrit:
@@ -81,9 +80,8 @@
             branch: '{branch}'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index 316431bcbb50c5536e3915297fddb37f7e7070d9..88877d06778a1a0e58f9f36613ac834cc4477874 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -53,10 +53,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-relevant-patch-submitted:
@@ -127,10 +125,8 @@
             choosing-strategy: 'default'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: 'H H * * 0'
@@ -231,10 +227,8 @@
             jdkversion: '{jre}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: 'H H * * *'
@@ -279,10 +273,8 @@
             jdkversion: '{jre}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: 'H H * * *'

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index d86d55ef0c705a3f028b6b6c814aac5b71daac7f..e676be82db359a7e59331d7ba85437ac9da81564 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -68,15 +68,13 @@
             branch: 'master'
 
     wrappers:
-        - build-timeout
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
         - integration-openstack-controller-mininet:
             controller-image: '{controller-image}'
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
 
     triggers:
         - integration-trigger-patch-submitted:
@@ -153,15 +151,13 @@
             branch: 'master'
 
     wrappers:
-        - build-timeout
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
         - integration-openstack-controller-mininet:
             controller-image: '{controller-image}'
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
 
     triggers:
         - integration-csit-{install}:
@@ -262,14 +258,13 @@
             branch: 'master'
 
     wrappers:
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
         - integration-openstack-controller-mininet:
             controller-image: '{controller-image}'
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
 
     triggers:
         - timed: '{schedule}'
@@ -368,15 +363,13 @@
             branch: 'master'
 
     wrappers:
-        - build-timeout
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
         - integration-openstack-controller-mininet:
             controller-image: '{controller-image}'
             controller-vms: 3
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
 
     triggers:
         - integration-trigger-patch-submitted:
@@ -455,15 +448,13 @@
             branch: 'master'
 
     wrappers:
-        - build-timeout
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
         - integration-openstack-controller-mininet:
             controller-image: '{controller-image}'
             controller-vms: 3
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
 
     triggers:
         - integration-csit-{install}:
@@ -565,14 +556,13 @@
             branch: 'master'
 
     wrappers:
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
         - integration-openstack-controller-mininet:
             controller-image: '{controller-image}'
             controller-vms: 3
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
 
     triggers:
         - timed: '{schedule}'
@@ -668,15 +658,13 @@
             branch: 'master'
 
     wrappers:
-          - build-timeout
-          - openstack:
-              instances:
-                - cloud-name: 'ODLRPC'
-                  template-name: 'centos7-devstack'
-                  count: '1'
-          - ssh-agent-credentials:
-              users:
-                  - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
+        - openstack:
+            instances:
+              - cloud-name: 'ODLRPC'
+                template-name: 'centos7-devstack'
+                count: '1'
 
     # Trigger jobs (daily)
     triggers:
@@ -769,15 +757,13 @@
             branch: 'master'
 
     wrappers:
-        - build-timeout
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
         - integration-openstack-controller-devstack:
             controller-image: '{controller-image}'
             controller-vms: 1
             openstack-image: '{openstack-image}'
             openstack-vms: '{openstack-vms}'
-        - ssh-agent-credentials:
-            users:
-              - '{ssh-credentials}'
 
     triggers:
         - integration-csit-all
@@ -878,15 +864,13 @@
             branch: 'master'
 
     wrappers:
-        - build-timeout
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
         - integration-openstack-controller-devstack:
             controller-image: '{controller-image}'
             controller-vms: 3
             openstack-image: '{openstack-image}'
             openstack-vms: '{openstack-vms}'
-        - ssh-agent-credentials:
-            users:
-              - '{ssh-credentials}'
 
     triggers:
         - integration-csit-all
@@ -958,10 +942,8 @@
             branch: '{branch}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index f7e41ee30e08d1af3c939a2bd6f1ac3e2b97c7ac..36a7904a2b9aa64d5ff9c6a69c48209137f1161a 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -220,15 +220,13 @@
             branch: 'master'
 
     wrappers:
-        - build-timeout
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
         - integration-openstack-controller-mininet:
             controller-image: '{controller-image}'
             controller-vms: 1
             mininet-image: '{mininet-image}'
             mininet-vms: '{mininet-vms}'
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
 
     triggers:
         - integration-trigger-patch-submitted:
@@ -336,10 +334,8 @@
             branch: '{branch}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
@@ -428,10 +424,8 @@
             branch: '{branch}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     prebuilders:
         - wipe-org-opendaylight-repo

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index 5c376abad3a66617fe39bdbd2218fdc108a40942..2e9da3b9514b1efb354f9ef77daa8775d7abc21a 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -71,14 +71,8 @@
             choosing-strategy: gerrit
 
     wrappers:
-        - timeout:
-            fail: true
-            timeout: 360
-            timeout-var: 'BUILD_TIMEOUT'
-            type: absolute
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: '@midnight'

diff --git a/jjb/netvirt/netvirt-openstack.yaml b/jjb/netvirt/netvirt-openstack.yaml
index 512be70e1e472978cd40acaad3a69dc61dde6203..22507a6c5145c379b6dade91dadf8dff8bb826fd 100644 (file)
--- a/jjb/netvirt/netvirt-openstack.yaml
+++ b/jjb/netvirt/netvirt-openstack.yaml
@@ -21,16 +21,8 @@
             project: '{project}'
 
     wrappers:
-        - timeout:
-            fail: true
-            timeout: 90
-            timeout-var: 'BUILD_TIMEOUT'
-            type: absolute
-        - ssh-agent-credentials:
-            users:
-                - '{openstack-gerrit-credentials}'
-        - openstack:
-            single-use: true
+        - opendaylight-infra-wrappers:
+            build-timeout: '90'
 
     triggers:
         - gerrit:

diff --git a/jjb/netvirt/netvirt-sonar.yaml b/jjb/netvirt/netvirt-sonar.yaml
index ed622d8184f53a28177662bf580bd1f6ff619f1d..569a383c68a7bfab67791381cd164c1feedc3f34 100644 (file)
--- a/jjb/netvirt/netvirt-sonar.yaml
+++ b/jjb/netvirt/netvirt-sonar.yaml
@@ -30,10 +30,8 @@
             branch: 'master'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: 'H H * * 6'

diff --git a/jjb/neutron/neutron-daily-openstack-beryllium.yaml b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
index ba49ec28058d0c02fd19e54079be3de1ba7e05f2..32af2b894b8f09f75aa3eafacea19045e916e907 100644 (file)
--- a/jjb/neutron/neutron-daily-openstack-beryllium.yaml
+++ b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
@@ -22,16 +22,8 @@
             project: '{project}'
 
     wrappers:
-        - timeout:
-            fail: true
-            timeout: 90
-            timeout-var: 'BUILD_TIMEOUT'
-            type: absolute
-        - ssh-agent-credentials:
-            users:
-                - '{openstack-gerrit-credentials}'
-        - openstack:
-            single-use: true
+        - opendaylight-infra-wrappers:
+            build-timeout: '90'
 
     triggers:
         - timed: '@daily'

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index f87e9202e9b56bbcff2be4f56c23bee88aa0b382..0b719ab56ab1d78dc9be0be092841e0f5fd9b6cd 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -80,10 +80,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -126,10 +124,8 @@
             choosing-strategy: 'default'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-patch-merged:

diff --git a/jjb/opflex/opflex-dependencies-rpm.yaml b/jjb/opflex/opflex-dependencies-rpm.yaml
index fa278236357152a29a5ee4cdd6795f06e5c09d3a..298f1de6b81c35882bd75913f819afdf8b082721 100644 (file)
--- a/jjb/opflex/opflex-dependencies-rpm.yaml
+++ b/jjb/opflex/opflex-dependencies-rpm.yaml
@@ -52,10 +52,8 @@
         - git-opflex-3rdparty
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     parameters:
         - mock-target-parameter
@@ -88,10 +86,8 @@
         - git-opflex-ovs
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     parameters:
         - mock-target-parameter

diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-dependencies.yaml
index 666de56582953fd50226d5e1baa499ad82cdccda..64941591911be5d3960375e1ea073b712933da37 100644 (file)
--- a/jjb/opflex/opflex-dependencies.yaml
+++ b/jjb/opflex/opflex-dependencies.yaml
@@ -63,10 +63,8 @@
         - git-opflex-libuv
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     builders:
         - shell:
@@ -96,10 +94,8 @@
         - git-opflex-rapidjson
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     builders:
         - shell:
@@ -139,10 +135,8 @@
         - git-opflex-ovs
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     builders:
         - shell:

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 2923253bd0a479415ba950d84962300bd4b18666..2bd76a8cc7c8d0964e651638a3ef234a02e45f43 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -76,14 +76,8 @@
             choosing-strategy: gerrit
 
     wrappers:
-        - timeout:
-            fail: true
-            timeout: 360
-            timeout-var: 'BUILD_TIMEOUT'
-            type: absolute
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: '@midnight'

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index c5046599338b5f68f76415239833dc2a44ec549c..1dcae43037bb0720a4381fd60beb9653f5b929a1 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -30,10 +30,8 @@
             branch: 'master'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: 'H H * * 6'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 21bf66c3a6df05b233e6a752aa6b16edee45cad5..ef8325877a81ef910d8e8861e28b8b5356ed98d2 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -7,6 +7,8 @@
     build-num-to-keep: 40
     build-artifact-days-to-keep: -1
     build-artifact-num-to-keep: 5
+    # Timeout in minutes
+    build-timeout: 360
 
     ssh-credentials: 'b241a488-1acc-4264-a010-2db3acb07fb0'
     openstack-gerrit-credentials: 'd099b81e-05d2-4541-a9a4-a186f576d528'

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 52cbc226c2d957a8d39357a766a65624ae1ad883..bbe82b98de345f2204ba9d6ee786ec683bfd260a 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -37,9 +37,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
@@ -106,11 +105,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-        - openstack:
-            single-use: true
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
@@ -180,9 +176,8 @@
             choosing-strategy: 'default'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
@@ -242,9 +237,8 @@
             branch: 'master'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: 'H H * * 0'
@@ -272,11 +266,8 @@
         artifactNumToKeep: -1
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-        - openstack:
-            single-use: true
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - timed: 'H H * * 1'
@@ -328,11 +319,8 @@
             choosing-strategy: 'default'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-        - openstack:
-            single-use: true
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
@@ -398,11 +386,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-        - openstack:
-            single-use: true
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index d9f268261c1bf11304d8357980dcb2b685867198..f3efa4f9fcf8501ca389650cefb09375ca64c8e8 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -366,3 +366,19 @@
     name: releng-stage-release
     builders:
         - shell: !include-raw: include-raw-stage-release.sh
+
+- wrapper:
+    # This wrapper is required for all jobs as it configures the wrappers
+    # needed by OpenDaylight infra.
+    name: opendaylight-infra-wrappers
+    wrappers:
+        - timeout:
+            type: absolute
+            timeout: '{build-timeout}'
+            timeout-var: 'BUILD_TIMEOUT'
+            fail: true
+        - ssh-agent-credentials:
+            users:
+                - 'b241a488-1acc-4264-a010-2db3acb07fb0'
+        - openstack:
+            single-use: True

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index 81a8d98bf02dad0cbb0e103c8f0d459fee7e4638..263f0a3c92a24e74dba675437104d41f7b7bf115 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -29,12 +29,8 @@
             wipe-workspace: true
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-        - openstack:
-            single-use: true
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     prebuilders:
         - wipe-org-opendaylight-repo
@@ -76,6 +72,10 @@
             project: '{project}'
         - p2zip-parameter
 
+    wrappers:
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
     prebuilders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
@@ -149,12 +149,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-        - openstack:
-            single-use: true
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
@@ -210,12 +206,8 @@
             refspec: 'refs/heads/{branch}'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-        - openstack:
-            single-use: true
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-patch-merged:
@@ -277,12 +269,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-        - openstack:
-            single-use: true
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index 4f5f45937f575bdddc14ac9f2fdcb97439b95ff3..346177826669b3451a7980dcfc353f6ad8e47b67 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -49,10 +49,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit:
@@ -90,4 +88,3 @@
     publishers:
         - email-notification:
             email-prefix: '[sfc]'
-

diff --git a/jjb/yangtools/yangtools-verify.yaml b/jjb/yangtools/yangtools-verify.yaml
index c8a954199867a812d6cdc9b6d34a70a4ec8cf907..5c21e2cf9accc95c54096fff683da73b63943fa6 100644 (file)
--- a/jjb/yangtools/yangtools-verify.yaml
+++ b/jjb/yangtools/yangtools-verify.yaml
@@ -90,9 +90,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
 
     triggers:
         - gerrit-trigger-patch-submitted: