diff options
| author |   jimmy <jf2512@att.com> | 2020-02-18 14:35:22 -0500 |
|---|---|---|
| committer | jimmy <jf2512@att.com> | 2020-02-18 14:35:29 -0500 |
| commit | 632bb2897ac299337c7362d2fcdecbedf2362e3a (patch) | |
| tree | c3c55e8d88886463c2603ac35d013ff0eeb51be5 | |
| parent | e77d4d9b100618280af0c913981184122c81bba8 (diff) | |
Add mvn-param selectively to master stream
Issue-ID: AAI-2793
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: Iac35bd8fb675ddbfe706215381cae52db6a39abf
| -rw-r--r-- | jjb/aai/aai-aai-common.yaml | 6 | ||||
| -rw-r--r-- | jjb/aai/aai-model-loader.yaml | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 0515a51a5..5f10f9a5d 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -21,9 +21,9 @@ stream: - 'master': branch: 'master' + mvn-params: '-P spring-boot-2-1' - 'elalto': branch: 'elalto' - mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' files: '**' @@ -44,6 +44,7 @@ project: 'aai/aai-common' project-name: 'aai-aai-common' branch: 'master' + mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-aai-common-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -60,6 +61,7 @@ stream: - 'master': branch: 'master' + mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' @@ -88,6 +90,7 @@ - 'master': branch: 'master' distro: 'alpine' + mvn-params: '-P spring-boot-2-1' docker_name: 'onap/aai-common-{distro}' docker_build_args: '-f ./Dockerfile.{distro}' docker_root: '$WORKSPACE/Dockerfiles/aai-common/' @@ -102,6 +105,7 @@ build-node: ubuntu1604-docker-8c-8g jobs: - gerrit-whitesource-scan + mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-aai-common-settings' wss-product-name: 'aai' mvn-clean-install: true diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 342033644..2a9c7c1c5 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -28,7 +28,7 @@ branch: 'elalto' - 'master': branch: 'master' - mvn-params: '-P spring-boot-2-1' + mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-model-loader-settings' files: '**' archive-artifacts: '' @@ -48,6 +48,7 @@ project: 'aai/model-loader' project-name: 'aai-model-loader' branch: 'master' + mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-model-loader-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -62,6 +63,7 @@ stream: - 'master': branch: 'master' + mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-model-loader-settings' - project: @@ -71,6 +73,7 @@ - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g project: aai/model-loader + mvn-params: '-P spring-boot-2-1' branch: master - project: @@ -80,6 +83,7 @@ jobs: - gerrit-whitesource-scan mvn-settings: 'aai-model-loader-settings' + mvn-params: '-P spring-boot-2-1' wss-product-name: 'aai' mvn-clean-install: true project: 'aai/model-loader' |