From 68653e52e171fcaec94e3c500a6a53bf5904e0f8 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Thu, 1 Feb 2018 13:40:39 -0800 Subject: Remove release-java-daily-no-sonar templates gerrit-maven-sonar is now in place to run all the Sonar scans. "release-java-daily-no-sonar" and "release-java-daily" templates are exactly the same after removing the sonar goals. Change-Id: Ie017c98e9d57ee31371f4a2ab47796febaf6f3dd Issue-ID: CIMAN-126 Signed-off-by: Jessica Wagantall --- jjb/global-templates-java.yaml | 140 ----------------------------------------- jjb/sdnc/sdnc-core.yaml | 4 +- 2 files changed, 2 insertions(+), 142 deletions(-) (limited to 'jjb') diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index fc13a15ba..f520d38e0 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -381,75 +381,6 @@ - infra-shiplogs: maven-version: '{maven-version}' -- job-template: - # Job template for Java daily release jobs - # - # The purpose of this job template is to run: - # 1. maven clean deploy skipping Sonar scans - # - # This template skips Sonar scans. - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - - name: '{project-name}-{stream}-release-java-daily-no-sonar' - - 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}' - - - maven-target: - maven-version: '{maven-version}' - goals: 'clean deploy -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - properties: - - '{maven-deploy-properties}' - java-opts: - - '-Xmx4096m -XX:MaxPermSize=512m' - 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 running checkstyle at the end # When checkstyle will be fully incorporated, it is meant to replace @@ -1002,77 +933,6 @@ - infra-shiplogs: maven-version: '{maven-version}' -- job-template: - # Job template for Java daily release jobs with POM not at the root - # - # The purpose of this job template is to run: - # 1. maven clean deploy - # - # This job supports subprojects and skips Sonar scans. - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - # pom: name/location of the pom.xml file relative to the workspace - - name: '{project-name}-{stream}-{subproject}-release-java-daily-no-sonar' - - 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}' - - - maven-target: - maven-version: '{maven-version}' - pom: '{pom}' - goals: 'clean deploy -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - properties: - - '{maven-deploy-properties}' - java-opts: - - '-Xmx4096m -XX:MaxPermSize=512m' - 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 # diff --git a/jjb/sdnc/sdnc-core.yaml b/jjb/sdnc/sdnc-core.yaml index 57a3c322e..9573901f0 100644 --- a/jjb/sdnc/sdnc-core.yaml +++ b/jjb/sdnc/sdnc-core.yaml @@ -11,7 +11,7 @@ java-version: '' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-java-daily-no-sonar' + - '{project-name}-{stream}-{subproject}-release-java-daily' - '{project-name}-{stream}-verify-java-skip-tests' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily-no-sonar' @@ -41,4 +41,4 @@ branch: 'master' mvn-settings: 'sdc-core-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' -- cgit 1.2.3-korg