diff options
| -rw-r--r-- | jjb/ccsdk/platform-plugins.yaml | 3 | ||||
| -rw-r--r-- | jjb/dcaegen2/apod-analytics.yaml | 7 | ||||
| -rw-r--r-- | jjb/global-macros.yaml | 15 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 818 | ||||
| -rw-r--r-- | jjb/global-templates-python.yaml | 67 | ||||
| -rw-r--r-- | jjb/global-templates-script.yaml | 608 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-plugins.yaml | 3 | ||||
| -rwxr-xr-x | jjb/vfc/build-nfvo-db-docker-image.sh | 10 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-db.yaml | 33 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml | 8 |
10 files changed, 75 insertions, 1497 deletions
diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index f1eb801a5..45f638929 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -20,13 +20,14 @@ deployAtEnd=true files: '**' archive-artifacts: '' + build-node: centos7-redis-4c-4g - project: name: ccsdk-platform-plugins-sonar jobs: - gerrit-maven-sonar cron: 'H 11 * * *' - build-node: ubuntu1604-builder-4c-4g + build-node: centos7-redis-4c-4g project: 'ccsdk/platform/plugins' project-name: 'ccsdk-platform-plugins' branch: 'master' 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-macros.yaml b/jjb/global-macros.yaml index 1f751da62..2bf008e55 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -55,21 +55,6 @@ - docker.push.registry=nexus3.onap.org:10003 - builder: - name: maven-docker-push-daily-test - builders: - - maven-target: - maven-version: '{maven-version}' - pom: '{pom}' - goals: 'clean deploy -B -P {mvn-profile}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - properties: - - docker.pull.registry=nexus3.onap.org:10001 - - docker.push.registry=nexus3.onap.org:10003 - -- builder: name: docker-login builders: - shell: !include-raw: include-docker-login.sh diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index ef91f8182..29a5c290f 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -1,69 +1,5 @@ --- -- job-template: - # 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: &verify_java_defaults # Job template for Java verify jobs # # The purpose of this job template is to run: @@ -77,6 +13,8 @@ project-type: freestyle concurrent: true node: '{build-node}' + pattern: '**' + pom: properties: - infra-properties: @@ -108,7 +46,7 @@ server: '{server-name}' project: '{project}' branch: '{branch}' - files: '**' + files: '{obj:pattern}' builders: - provide-maven-settings: @@ -116,6 +54,7 @@ settings-file: '{mvn-settings}' - maven-target: maven-version: '{maven-version}' + pom: '{obj:pom}' goals: 'clean install -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn {mvn-params}' settings: '{mvn-settings}' @@ -140,117 +79,14 @@ # Required Variables: # branch: git branch (eg. stable/lithium or master) + <<: *verify_java_defaults name: '{project-name}-{stream}-verify-java-checkstyle' - 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}' - - maven-params: - mvn-params: '{mvn-params}' - 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 -B - -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn {mvn-params}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp publishers: - infra-shiplogs: maven-version: '{maven-version}' - 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: @@ -264,60 +100,9 @@ # pattern: ant file-path pattern relative to the workspace used to # trigger the job + <<: *verify_java_defaults name: '{project-name}-{stream}-{subproject}-verify-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: '{pattern}' - - builders: - - provide-maven-settings: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - maven-target: - maven-version: '{maven-version}' - pom: '{pom}' - goals: 'clean install -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 daily release jobs # @@ -780,93 +565,8 @@ - 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 set versions - # 2. maven clean deploy with Sonar scans - # - # This job supports subprojects. - # - # 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-version-java-shell-daily' - - project-type: freestyle - node: '{build-node}' - disabled: '{disabled}' - 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}' - pom: '{pom}' - 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 - - - shell: '{script}' - - - maven-target: - maven-version: '{maven-version}' - pom: '{pom}' - goals: 'clean deploy sonar:sonar -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: &merge_java_defaults # Job template for Java merge jobs # # The purpose of this job template is to run: @@ -879,6 +579,9 @@ project-type: freestyle node: '{build-node}' + pattern: '**' + pom: + mvn_properties: [] properties: - infra-properties: @@ -908,7 +611,7 @@ server: '{server-name}' project: '{project}' branch: '{branch}' - files: '**' + files: '{pattern}' builders: - provide-maven-settings: @@ -916,12 +619,14 @@ settings-file: '{mvn-settings}' - maven-target: maven-version: '{maven-version}' + pom: '{obj:pom}' goals: 'clean deploy -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 + properties: '{obj:mvn_properties}' publishers: - infra-shiplogs: @@ -939,59 +644,9 @@ # branch: git branch (eg. stable/lithium or master) # maven-properties: properties passed to maven + <<: *merge_java_defaults name: '{project-name}-{stream}-merge-properties-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' - submodule-recursive: '{submodule-recursive}' - - 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}' - goals: 'clean deploy -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 - properties: '{obj:mvn_properties}' - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - - job-template: # Job template for Java merge jobs that takes a maven template # @@ -1001,41 +656,9 @@ # Required Variables: # branch: git branch (eg. stable/lithium or master) + <<: *merge_java_defaults 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' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - gerrit-trigger-patch-merged: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - files: '{files}' - builders: - provide-maven-settings: global-settings-file: 'global-settings' @@ -1055,75 +678,6 @@ - docker.pull.registry=nexus3.onap.org:10001 - docker.push.registry=nexus3.onap.org:10003 - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - -- job-template: - # Job template for Java merge jobs that should also be triggered by upstream - # merges - # - # Required Variables: - # stream: release stream - # branch: git branch - # dependencies: fully qualified upstream job name to trigger on - # this may be '' - - name: '{project-name}-{stream}-downstream-merge-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' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - reverse: - jobs: '{dependencies}' - result: 'success' - - 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}' - goals: 'clean deploy -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 merge jobs with POM not at the root # @@ -1138,59 +692,9 @@ # pattern: ant file-path pattern relative to the workspace used to # trigger the job + <<: *merge_java_defaults name: '{project-name}-{stream}-{subproject}-merge-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' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - gerrit-trigger-patch-merged: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - files: '{pattern}' - - 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' - 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 Docker daily jobs # @@ -1887,7 +1391,6 @@ - maven-docker-push-daily: maven-version: '{maven-version}' - pom: '{pom}' mvn-settings: '{mvn-settings}' pom: '{docker-pom}' # use default as mvn-profile if profile is not needed @@ -2076,254 +1579,6 @@ maven-version: '{maven-version}' - job-template: - # Job template for Java daily release jobs - # - # The purpose of this job template is to run: - # 1. inject a version.properties file and set versions - # 2. change version in all POM files to the release version specified - # in version.properties. This is done using a script instread of - # the mvn version plugin that assumes some specific parent structure - # - # The POM files are required to use the Maven staging plugin so the deploy - # does not deploy directly to the release repo. - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - - name: '{project-name}-{stream}-release-version2-java-daily' - - project-type: freestyle - node: '{build-node}' - disabled: '{disabled}' - 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-install: - maven-version: '{maven-version}' - - - inject: - properties-file: version.properties - - - shell: !include-raw-escape: include-update-pom-versions.sh - - - maven-target: - maven-version: '{maven-version}' - goals: 'clean deploy site:site site:stage-deploy -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 - # - # The purpose of this job template is to run: - # 1. inject a version.properties file and set versions - # 2. change version in all POM files to the release version specified - # in version.properties. This is done using a script instread of - # the mvn version plugin that assumes some specific parent structure - # - # The POM files are required to use the Maven staging plugin so the deploy - # does not deploy directly to the release repo. - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - # pom: name/location of the pom.xml file relative to the workspace - # pattern: ant file-path pattern relative to the workspace used to - # trigger the job - - name: '{project-name}-{stream}-{subproject}-release-version2-java-daily' - - project-type: freestyle - node: '{build-node}' - disabled: '{disabled}' - 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}' - files: '{pattern}' - - builders: - - provide-maven-settings: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - maven-install: - maven-version: '{maven-version}' - - - inject: - properties-file: version.properties - - - shell: !include-raw-escape: include-update-pom-versions.sh - - - maven-target: - maven-version: '{maven-version}' - pom: '{pom}' - goals: 'clean deploy site:site site:stage-deploy -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 - # - # The purpose of this job template is to run: - # 1. inject a version.properties file and set versions - # 2. change version in all POM files to the release version specified - # in version.properties. This is done using a script instread of - # the mvn version plugin that assumes some specific parent structure - # This version does NOT change the version within the <parent> tag - # - # The POM files are required to use the Maven staging plugin so the deploy - # does not deploy directly to the release repo. - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - # pom: name/location of the pom.xml file relative to the workspace - # pattern: ant file-path pattern relative to the workspace used to - # trigger the job - - name: '{project-name}-{stream}-{subproject}-release-version3-java-daily' - - project-type: freestyle - node: '{build-node}' - disabled: '{disabled}' - 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}' - files: '{pattern}' - - builders: - - provide-maven-settings: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - maven-install: - maven-version: '{maven-version}' - - - inject: - properties-file: version.properties - - - shell: !include-raw-escape: include-update-pom-versions-not-parent.sh - - - maven-target: - maven-version: '{maven-version}' - pom: '{pom}' - goals: 'clean deploy site:site site:stage-deploy -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 merge jobs for SDC specific repos # # The purpose of this job template is to run: @@ -2332,42 +1587,12 @@ # Required Variables: # branch: git branch (eg. stable/lithium or master) + <<: *merge_java_defaults name: '{project-name}-{stream}-sdc-merge-java' - project-type: freestyle node: 'ubuntu1604-docker-8c-8g' build-timeout: 120 - 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: - - gerrit-trigger-patch-merged: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - files: '**' - builders: - provide-maven-settings: global-settings-file: 'global-settings' @@ -2375,16 +1600,13 @@ - docker-login - - maven-docker-push-daily-test: + - maven-docker-push-daily: maven-version: '{maven-version}' mvn-settings: '{mvn-settings}' pom: '{docker-pom}' # use default as mvn-profile if profile is not needed mvn-profile: '{mvn-profile}' - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' + mvn-params: '' - job-template: # Job template for building & pushing docker images for AAI specific repos diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml index b03bce36a..80ae84bb7 100644 --- a/jjb/global-templates-python.yaml +++ b/jjb/global-templates-python.yaml @@ -70,73 +70,6 @@ - infra-shiplogs: maven-version: '{maven-version}' -- job-template: - # Job template for docker daily jobs for 2 SCMs - # - # The purpose of this job template is to run: - # 1. inject a version properties file - # 2. login into the docker registry - # 4. run a specified shell script - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - - name: '{project-name}-{stream}-2scm-docker-shell-daily' - project-type: freestyle - node: 'ubuntu1604-docker-8c-8g' - - 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}' - - git-extra-project: - project: '{extra-project1}' - refspec: '{extra-refspec1}' - branch: '{extra-branch1}' - checkout-dir: '{checkout-dir1}' - - git-extra-project: - project: '{extra-project2}' - refspec: '{extra-refspec2}' - branch: '{extra-branch2}' - checkout-dir: '{checkout-dir2}' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - # 12 AM UTC - - timed: 'H 12 * * *' - - 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 - - docker-login - - shell: '{script}' - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - job-template: # Job template for docker daily jobs for 3 SCMs diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml index 991ffd69a..9264bc9e5 100644 --- a/jjb/global-templates-script.yaml +++ b/jjb/global-templates-script.yaml @@ -1,72 +1,6 @@ --- # vim: sw=2 ts=2 sts=2 et : - -- job-template: - # Job template for verifying a submission. triggered on - # gerrit-trigger-patch-submitted, does scm, mvn with passed in goals, - # then run script - # - # Required Variables: - # branch: git branch - # script: build script to execute - # mvn-settings: settings file for this specific job - # mvn-goals: space separated list of maven build goals (e.g. - # clean, install etc, --version for noop) - name: '{project-name}-{stream}-verify-scm-mvn-script' - - project-type: freestyle - concurrent: true - node: 'ubuntu1604-docker-8c-8g' - - 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: '{mvn-goals}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - docker-login - - shell: '{script}' - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - - job-template: # Job template for merging a submission. triggered on # gerrit-trigger-patch-merged, does scm, mvn with passed-in goals, then @@ -130,465 +64,6 @@ - infra-shiplogs: maven-version: '{maven-version}' -- job-template: - # Job template for daily-release a submission. triggered on timer, does - # scm mvn with passed-in goals, then run script - # - # Required Variables: - # branch: git branch - # script: build script to execute - # mvn-goals-versioning: space separated list of maven build goals - # (--version for no op, - # or versions:set versions:update-child-modules versions:commit) - # mvn-goals: space separated list of maven build goals (--version for - # noop, or clean deploy) - name: '{project-name}-{stream}-daily-release-scm-mvn-script' - - project-type: freestyle - concurrent: true - node: 'ubuntu1604-docker-8c-8g' - - 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: '{mvn-goals-versioning}' - 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: '{mvn-goals}' - properties: - - '{maven-deploy-properties}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - docker-login - - shell: '{script}' - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - -- job-template: - # Job template for daily-release a submission. triggered on timer, does - # scm mvn with passed-in goals, then run script. - # Version changed using include-update-pom-versions.sh script - # - # Required Variables: - # branch: git branch - # script: build script to execute - # mvn-goals: space separated list of maven build goals (--version for - # noop, or clean deploy) - name: '{project-name}-{stream}-daily-release-version2-scm-mvn-script' - - project-type: freestyle - concurrent: true - node: 'ubuntu1604-docker-8c-8g' - - 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 - - - shell: !include-raw-escape: include-update-pom-versions.sh - - - maven-target: - maven-version: '{maven-version}' - goals: '{mvn-goals}' - properties: - - '{maven-deploy-properties}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - docker-login - - shell: '{script}' - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - -- job-template: - # Job template for verifying a submission. triggered on - # gerrit-trigger-patch-submitted, - # does scm 2 repos, mvn with passed-in goals, then run script - # - # Required Variables: - # branch: git branch - # script: build script to execute - # extra-project: extra gerrit project to checkout - # extra-refspec: refspec for the extra project - # extra-branch: branch to checkout for the extra project - # checkout-dir: directory to checkout the extra project to - # DO NOT SET THIS TO anything that translates to - # $WORKSPACE as it will destroy the initial - # project checkout - # mvn-goals: space separated list of maven build goals (e.g. - # clean, install etc, --version for noop) - - name: '{project-name}-{stream}-verify-2scm-mvn-script' - - project-type: freestyle - concurrent: true - node: 'ubuntu1604-docker-8c-8g' - - 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}' - - git-extra-project: - project: '{extra-project}' - refspec: '{extra-refspec}' - branch: '{extra-branch}' - checkout-dir: '{checkout-dir}' - - 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: '{mvn-goals}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - docker-login - - shell: '{script}' - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - -- job-template: - # Job template for merged submission. triggered on - # gerrit-trigger-patch-merged,does scm of 2 repos, mvn with passed in - # goals, then run script - # - # Required Variables: - # branch: git branch - # script: build script to execute - # extra-project: extra gerrit project to checkout - # extra-refspec: refspec for the extra project - # extra-branch: branch to checkout for the extra project - # checkout-dir: directory to checkout the extra project to - # DO NOT SET THIS TO anything that translates to - # $WORKSPACE as it will destroy the initial - # project checkout - # mvn-goals: space separated list of maven build goals (--version - # for noop, clean deploy for mvn project) - - name: '{project-name}-{stream}-merge-2scm-mvn-script' - - project-type: freestyle - concurrent: true - node: 'ubuntu1604-docker-8c-8g' - - 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}' - - git-extra-project: - project: '{extra-project}' - refspec: '{extra-refspec}' - branch: '{extra-branch}' - checkout-dir: '{checkout-dir}' - - 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}' - goals: '{mvn-goals}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - docker-login - - shell: '{script}' - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - -- job-template: - # Job template for merged submission. triggered on - # gerrit-trigger-patch-merged, does scm x2, mvn with passed-in goals, - # then run script - # - # Required Variables: - # branch: git branch - # script: build script to execute - # extra-project: extra gerrit project to checkout - # extra-refspec: refspec for the extra project - # extra-branch: branch to checkout for the extra project - # checkout-dir: directory to checkout the extra project to - # DO NOT SET THIS TO anything that translates to - # $WORKSPACE as it will destroy the initial - # project checkout - # mvn-goals: space separated list of maven build goals (--version - # for noop, clean deploy for mvn project) - # mvn-goals-versioning: space separated list of maven build goals - # (--version for no op, clean deploy for mvn project) - - name: '{project-name}-{stream}-daily-release-2scm-mvn-script' - - project-type: freestyle - node: 'ubuntu1604-docker-8c-8g' - - 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}' - - git-extra-project: - project: '{extra-project}' - refspec: '{extra-refspec}' - branch: '{extra-branch}' - checkout-dir: '{checkout-dir}' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - 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: '{mvn-goals-versioning}' - 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: '{mvn-goals}' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - docker-login - - shell: '{script}' - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - -- job-template: - # Job template for basic scm and script trigger - # - # Required Variables: - # branch: git branch - # build-node: what build node to run on - # script: build script to execute - - name: '{project-name}-{stream}-verify-script' - - 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}' - # make sure maven gets installed / setup - - maven-target: - maven-version: '{maven-version}' - goals: '--version' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - shell: '{script}' - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - job-template: # Job template for 2 scm and script trigger @@ -665,89 +140,6 @@ maven-version: '{maven-version}' -- job-template: - # Job template for 3 scm and script trigger - # - # Required Variables: - # branch: git branch - # build-node: what build node to run on - # script: build script to execute - # extra-project1: extra gerrit project to checkout - # extra-refspec1: refspec for the extra project - # extra-branch1: branch to checkout for the extra project - # checkout-dir1: directory to checkout the extra project to - # DO NOT SET THIS TO anything that translates to - # $WORKSPACE as it will destroy the initial - # project checkout - # extra-project2: extra gerrit project to checkout - # extra-refspec2: refspec for the extra project - # extra-branch2: branch to checkout for the extra project - # checkout-dir2: directory to checkout the extra project to - # DO NOT SET THIS TO anything that translates to - # $WORKSPACE as it will destroy the initial - # project checkout - name: '{project-name}-{stream}-three-scm-verify-script' - - 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}' - - git-extra-project: - project: '{extra-project1}' - refspec: '{extra-refspec1}' - branch: '{extra-branch1}' - checkout-dir: '{checkout-dir1}' - - git-extra-project: - project: '{extra-project2}' - refspec: '{extra-refspec2}' - branch: '{extra-branch2}' - checkout-dir: '{checkout-dir2}' - - 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}' - # make sure maven gets installed / setup - - maven-target: - maven-version: '{maven-version}' - goals: '--version' - settings: '{mvn-settings}' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - shell: '{script}' - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' # vim: sw=2 ts=2 sts=2 et : 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/build-nfvo-db-docker-image.sh b/jjb/vfc/build-nfvo-db-docker-image.sh new file mode 100755 index 000000000..99eab5db6 --- /dev/null +++ b/jjb/vfc/build-nfvo-db-docker-image.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./docker/*.* + +./docker/build_image.sh diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml new file mode 100644 index 000000000..32d13333a --- /dev/null +++ b/jjb/vfc/vfc-nfvo-db.yaml @@ -0,0 +1,33 @@ +--- +- project: + name: vfc-nfvo-db + project: 'vfc/nfvo/db' + project-name: 'vfc-nfvo-db' + mvn-settings: 'vfc-nfvo-db-settings' + stream: + - 'master': + branch: 'master' + build-node: ubuntu1604-builder-4c-4g + jobs: + - gerrit-maven-clm + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-nfvo-db-docker-image.sh' + +- project: + name: vfc-nfvo-db-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-builder-4c-4g + project: 'vfc/nfvo/db' + project-name: 'vfc-nfvo-db' + branch: 'master' + mvn-settings: 'vfc-nfvo-db-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml index b8ba2d611..a5cbe022d 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml @@ -9,10 +9,12 @@ 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 + build-node: ubuntu1604-docker-8c-8g + pattern: 'pom.xml' - '{project-name}-{stream}-release-version-profile-java-daily' - files: 'pom.xml' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g |