diff options
| -rw-r--r-- | jjb/dcaegen2/apod-analytics.yaml | 7 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 129 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-plugins.yaml | 3 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml | 4 |
4 files changed, 10 insertions, 133 deletions
diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml index c11a28d4a..3b9881234 100644 --- a/jjb/dcaegen2/apod-analytics.yaml +++ b/jjb/dcaegen2/apod-analytics.yaml @@ -20,10 +20,9 @@ jobs: - gerrit-maven-clm - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-verify-java-skip-tests': - mvn-goals: 'clean install' - - '{project-name}-{stream}-merge-java': - mvn-goals: 'clean deploy' + - '{project-name}-{stream}-verify-java': + mvn-params: '-DskipTests=true' + - '{project-name}-{stream}-merge-java' - project: name: dcaegen2-analytics-tca-sonar diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index ad7fe533d..03653d853 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -3,70 +3,6 @@ # Job template for Java verify jobs # # The purpose of this job template is to run: - # 1. maven clean install -DskipTests=true - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - - name: '{project-name}-{stream}-verify-java-skip-tests' - - 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' - submodule-recursive: '{submodule-recursive}' - - 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 -DskipTests=true -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 - maven-opts: - - maven.test.skip=true - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - -- job-template: - # Job template for Java verify jobs - # - # The purpose of this job template is to run: # 1. maven clean install # # Required Variables: @@ -77,6 +13,7 @@ project-type: freestyle concurrent: true node: '{build-node}' + pattern: '**' properties: - infra-properties: @@ -108,7 +45,7 @@ server: '{server-name}' project: '{project}' branch: '{branch}' - files: '**' + files: '{obj:pattern}' builders: - provide-maven-settings: @@ -189,68 +126,6 @@ - checkstyle-result - job-template: - # Job template for Java verify jobs that takes a maven template - # - # The purpose of this job template is to run: - # 1. maven clean install -P {mvn-profile} - # - # 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' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - gerrit-trigger-patch-submitted: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - files: '{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} -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 - - 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: diff --git a/jjb/sdnc/sdnc-plugins.yaml b/jjb/sdnc/sdnc-plugins.yaml index 633a9cd11..551b79df5 100644 --- a/jjb/sdnc/sdnc-plugins.yaml +++ b/jjb/sdnc/sdnc-plugins.yaml @@ -4,7 +4,8 @@ project-name: 'sdnc-plugins' jobs: - gerrit-maven-clm - - '{project-name}-{stream}-verify-java-skip-tests' + - '{project-name}-{stream}-verify-java': + mvn-params: '-DskipTests=true' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml index b8ba2d611..22df5d22a 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml @@ -9,7 +9,9 @@ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' mvn-profile: rootOnly jobs: - - '{project-name}-{stream}-verify-profile-java' + - '{project-name}-{stream}-verify-java': + mvn-params: '-P rootOnly' + pattern: 'pom.xml' - '{project-name}-{stream}-merge-profile-java': build-node: ubuntu1604-docker-8c-8g - '{project-name}-{stream}-release-version-profile-java-daily' |