X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fglobal-templates-java.yaml;h=c7fe3cf80729fdc48acea60bed0282370fb217a6;hb=8b33c98aed46a6f1e5a03bd1bbb26ad1055fd851;hp=83555d2cb5a85186dd5e142d46babb8039bde777;hpb=add2c4726724cc6b7fa01e149c8c6e6594d9eee2;p=ci-management.git diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 83555d2cb..c7fe3cf80 100644 --- 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}' @@ -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: @@ -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: