Merge "Pass mvn properties to clamp merge job"
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index 9070da0..1004a2c 100644
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -5,7 +5,10 @@
project-name: 'clamp'
jobs:
- '{project-name}-{stream}-verify-java-checkstyle'
- - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-merge-properties-java':
+ maven-properties: |
+ docker.pull.registry=nexus3.onap.org:10001
+ docker.push.registry=nexus3.onap.org:10003
- '{project-name}-{stream}-release-java-daily-checkstyle':
maven-deploy-properties: |
skipDockerBuild
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 580d65b..c5803dc 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -771,6 +771,68 @@
maven-version: '{maven-version}'
- job-template:
+ # Job template for Java merge jobs based on
+ # '{project-name}-{stream}-merge-java'
+ # The purpose of this job template is to run "maven clean deploy" for
+ # projects using this template.
+ #
+ # Required Variables:
+ # branch: git branch (eg. stable/lithium or master)
+ # maven-properties: properties passed to maven
+ name: '{project-name}-{stream}-merge-properties-java'
+
+ project-type: freestyle
+ node: '{build-node}'
+
+ properties:
+ - infra-properties:
+ build-days-to-keep: '{build-days-to-keep}'
+
+ parameters:
+ - infra-parameters:
+ project: '{project}'
+ branch: '{branch}'
+ refspec: 'refs/heads/{branch}'
+ artifacts: '{archive-artifacts}'
+ - maven-exec:
+ maven-version: '{maven-version}'
+
+ scm:
+ - gerrit-trigger-scm:
+ refspec: ''
+ choosing-strategy: 'default'
+ submodule-recursive: '{submodule-recursive}'
+
+ wrappers:
+ - infra-wrappers:
+ build-timeout: '{build-timeout}'
+
+ triggers:
+ - gerrit-trigger-patch-merged:
+ server: '{server-name}'
+ project: '{project}'
+ branch: '{branch}'
+ files: '**'
+
+ builders:
+ - provide-maven-settings:
+ global-settings-file: 'global-settings'
+ settings-file: '{mvn-settings}'
+ - maven-target:
+ maven-version: '{maven-version}'
+ goals: 'clean deploy -B
+ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+ settings: '{mvn-settings}'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
+ properties: '{maven-properties}'
+
+ publishers:
+ - infra-shiplogs:
+ maven-version: '{maven-version}'
+
+- job-template:
# Job template for Java merge jobs that takes a maven template
#
# The purpose of this job template is to run "maven clean deploy -P {x}"