diff options
Diffstat (limited to 'jjb/global-templates-java.yaml')
| -rw-r--r-- | jjb/global-templates-java.yaml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index bcf4bd3bb..60f1ad6f5 100644 --- 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 # @@ -815,7 +820,7 @@ name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily' project-type: freestyle - node: 'ubuntu1604-docker-8c-8g' + node: 'ubuntu1804-docker-8c-8g' disabled: '{disabled}' properties: - infra-properties: |