Prep repos for global jjb

[ci-management.git] / jjb / global-templates-java.yaml

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 61da2d5..c7fe3cf 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -490,6 +490,7 @@
     project-type: freestyle
     node: '{build-node}'
     disabled: '{disabled}'
+    version-properties: 'version.properties'
     maven-deploy-properties:
     properties:
       - infra-properties:
@@ -529,7 +530,7 @@
           settings-file: '{mvn-settings}'
 
       - inject:
-          properties-file: version.properties
+          properties-file: '{version-properties}'
       - maven-set-release-version:
           maven-version: '{maven-version}'
           mvn-settings: '{mvn-settings}'
@@ -697,7 +698,7 @@
     name: '{project-name}-{stream}-docker-java-daily'
     id: '{project-name}-{stream}-docker-java-daily'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: '{build-node}'
     disabled: '{disabled}'
     properties:
       - infra-properties:
@@ -787,7 +788,7 @@
 
     name: '{project-name}-{stream}-docker-java-properties-daily'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: '{build-node}'
     disabled: '{disabled}'
     properties:
       - infra-properties:
@@ -997,7 +998,7 @@
 
     name: '{project-name}-{stream}-docker-java-version-shell-daily'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: '{build-node}'
     disabled: '{disabled}'
     properties:
       - infra-properties:
@@ -1154,7 +1155,7 @@
     name: '{project-name}-{stream}-docker-version-java-daily'
     id: '{project-name}-{stream}-docker-version-java-daily'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: '{build-node}'
     disabled: '{disabled}'
     properties:
       - infra-properties:
@@ -1251,7 +1252,7 @@
 
     name: '{project-name}-{stream}-aai-docker-java-daily'
     project-type: freestyle
-    node: 'ubuntu1604-docker-8c-8g'
+    node: '{build-node}'
     docker-image-name: ''
     disabled: '{disabled}'
     properties:
@@ -1336,7 +1337,7 @@
     <<: *merge_java_defaults
     name: '{project-name}-{stream}-sdc-merge-java'
 
-    node: 'ubuntu1604-docker-8c-8g'
+    node: '{build-node}'
     build-timeout: 120
 
     builders: