Update automated jobs

[releng/builder.git] / jjb / ocpplugin / ocpplugin.yaml

diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml
index f0caa84565093109602e0f222e4adc22d3e480da..74a7c04a3a18930496c16937f9defa29e410caf0 100644 (file)
--- a/jjb/ocpplugin/ocpplugin.yaml
+++ b/jjb/ocpplugin/ocpplugin.yaml
@@ -25,7 +25,7 @@
             jdk: openjdk8
             jdks:
                 - openjdk8
-            disable_autorelease: True
+            disable_autorelease: False
             disable_distribution_check: False
 
     project: 'ocpplugin'
@@ -494,7 +494,7 @@
 
     triggers:
         - reverse:
-            jobs: 'odlparent-merge-{stream}'
+            jobs: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
             result: 'success'
 
     prebuilders:
@@ -517,7 +517,7 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[ocpplugin] [odlparent]'
+            email-prefix: '[ocpplugin] [odlparent] [yangtools] [controller]'
         - jacoco-report
 
 - job-template:
@@ -663,10 +663,14 @@
             release-branch: '{branch}'
         - autorelease-release-datestamp:
             datestamp: true
+        - string:
+            name: CLONE_URL
+            default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/releng/autorelease'
+            description: "Autorelease clone URL"
 
     scm:
         - git:
-            url: 'https://git.opendaylight.org/gerrit/releng/autorelease'
+            url: '$CLONE_URL'
             refspec: ''
             branches:
                 - 'origin/{branch}'
@@ -674,6 +678,7 @@
             shallow-clone: true
             submodule:
                 recursive: true
+                timeout: 15
 
     wrappers:
         - autorelease-build-timeout