Merge "Fix Clamp merge job"

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 7224b75..60f1ad6 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -451,6 +451,11 @@
     <<: *merge_java_defaults
     name: '{project-name}-{stream}-merge-properties-java'
 
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
 - job-template:
     # Job template for Java merge jobs that takes a maven template
     #