From 645951d221a46cbf3ec93c8a2b4e0b103e08d37e Mon Sep 17 00:00:00 2001 From: JulienBe Date: Thu, 28 Sep 2017 18:44:18 +0200 Subject: [PATCH] Add integration-tests to sonar for so add new template for this purpose Template allows to pass a maven profile Change-Id: I984d836bd053065d3d10b726aaca9851c2132fe7 Issue-ID: SO-168 Signed-off-by: JulienBe --- jjb/global-templates-java.yaml | 77 ++++++++++++++++++++++++++++++++++++++++++ jjb/so/so.yaml | 3 +- 2 files changed, 79 insertions(+), 1 deletion(-) diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 2c82db479..9cee53c8c 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -804,6 +804,83 @@ - infra-shiplogs: maven-version: '{maven-version}' +- job-template: + # Job template for Java daily release jobs + # + # The purpose of this job template is to run "maven version && maven clean + # deploy" for projects using this template. + # + # Required Variables: + # branch: git branch (eg. stable/lithium or master) + name: '{project-name}-{stream}-release-version-profile-java-daily' + + project-type: freestyle + node: '{build-node}' + maven-deploy-properties: + 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: + # 11 AM UTC + - timed: 'H 11 * * *' + - gerrit-trigger-release-manually: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + + builders: + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + + - inject: + properties-file: version.properties + - maven-target: + maven-version: '{maven-version}' + goals: 'versions:set versions:update-child-modules versions:commit -B' + properties: + - 'newVersion=${{release_version}}' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + + - maven-target: + maven-version: '{maven-version}' + goals: 'clean deploy sonar:sonar -P {mvn-profile} -Dsonar.host.url=${{SONAR}} -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + properties: + - '{maven-deploy-properties}' + 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 daily release jobs with POM not at the root # diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 120a604d0..325b0fe1a 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -12,7 +12,8 @@ mvn-profile: 'with-integration-tests' build-node: 'ubuntu1604-docker-8c-8g' archive-artifacts: 'packages/arquillian-unit-tests/target/**/*' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-profile-java-daily': + mvn-profile: 'with-integration-tests' - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker' -- 2.16.6