summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulienBe <jb379x@att.com>2017-04-12 04:52:40 -0700
committerJulienBe <jb379x@att.com>2017-04-12 05:00:48 -0700
commitef823f13a794cb26a2230bc42d9d09fce616ec26 (patch)
tree8ac1df06c91ac454970dfd513283137100f078b5
parent5f16a633eeabfe738d1400d77d4773653ad6cd48 (diff)
New templates : merge and verify with profile
Adding new merge and verify job templates in order to use a maven profile Change-Id: I016a1064af4c37a4f8f34435f837e5c8b25662b9 Signed-off-by: JulienBe <jb379x@att.com>
-rw-r--r--jjb/global-templates-java.yaml121
-rw-r--r--jjb/mso/mso.yaml6
2 files changed, 124 insertions, 3 deletions
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 69f422f61..6eda85539 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -61,7 +61,6 @@
- infra-shiplogs:
maven-version: '{maven-version}'
-
- job-template:
# Job template for Java verify jobs
#
@@ -123,6 +122,66 @@
maven-version: '{maven-version}'
- job-template:
+ # Job template for Java verify jobs that takes a maven template
+ #
+ # The purpose of this job template is to run "maven clean install -P {x}"
+ # for projects using this template.
+ #
+ # Required Variables:
+ # branch: git branch (eg. stable/lithium or master)
+
+ name: '{project-name}-{stream}-verify-profile-java'
+
+ project-type: freestyle
+ concurrent: true
+ 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: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+
+ wrappers:
+ - infra-wrappers:
+ build-timeout: '{build-timeout}'
+
+ triggers:
+ - gerrit-trigger-patch-submitted:
+ 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 install -P {mvn-profile}'
+ settings: '{mvn-settings}'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
+
+ publishers:
+ - infra-shiplogs:
+ maven-version: '{maven-version}'
+
+- job-template:
# Job template for Java verify jobs with POM not at the root
#
# The purpose of this job template is to run "maven clean install" for
@@ -449,6 +508,66 @@
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}"
+ # for projects using this template.
+ #
+ # Required Variables:
+ # branch: git branch (eg. stable/lithium or master)
+ name: '{project-name}-{stream}-merge-profile-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'
+
+ 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}'
+ # yamllint disable rule:line-length
+ goals: 'clean deploy -P {mvn-profile}'
+ # yamllint enable
+ settings: '{mvn-settings}'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
+
+ publishers:
+ - infra-shiplogs:
+ maven-version: '{maven-version}'
+
+- job-template:
# Job template for Java merge jobs that should also be triggered by upstream
# merges
#
diff --git a/jjb/mso/mso.yaml b/jjb/mso/mso.yaml
index 548b79bde..f7cfcb384 100644
--- a/jjb/mso/mso.yaml
+++ b/jjb/mso/mso.yaml
@@ -4,8 +4,10 @@
name: mso
project-name: 'mso'
jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-verify-profile-java':
+ mvn-profile: 'with-integration-tests'
+ - '{project-name}-{stream}-merge-profile-java':
+ mvn-profile: 'with-integration-tests'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-docker-version-java-daily':
docker-pom: 'pom.xml'