Merge "New templates : merge and verify with profile"

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'