diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2020-09-08 21:04:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-09-08 21:04:17 +0000 |
| commit | 994685dd64594ac2da5a8c5d3800613bee292af0 (patch) | |
| tree | 824fe0a29d383cdc17911516a82460c8a89016d2 | |
| parent | 983296b98207c3ca7d5979bf2c45d241e3e038f3 (diff) | |
| parent | a7d92e05e63c700e65122af2bbd538e8ef7a7caa (diff) | |
Merge "Remove IT for Sonar"
| -rw-r--r-- | jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg | 2 | ||||
| -rw-r--r-- | jjb/sdc/sdc.yaml | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg index 5f1844a82..fe7549c24 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200720-202227.181 LABELS=ubuntu1804-docker-8c-16g HARDWARE_ID=v2-highcpu-16 -VOLUME_SIZE=20 +VOLUME_SIZE=40 diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index c3646082e..c64d17e89 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -57,6 +57,7 @@ - 'frankfurt': branch: 'frankfurt' mvn-settings: 'sdc-settings' + java-version: openjdk11 files: '**' archive-artifacts: '' build-node: ubuntu1804-docker-8c-8g @@ -96,7 +97,8 @@ project-name: 'sdc' branch: 'master' mvn-settings: 'sdc-settings' - mvn-params: '-P docker -Dsonar.branch={branch} -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' + java-version: openjdk11 + mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' @@ -106,13 +108,14 @@ - gerrit-maven-clm: build-timeout: 120 submodule-timeout: 30 - mvn-params: '-P fast-build -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' + mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' nexus-iq-namespace: 'onap-' project: sdc project-name: 'sdc' build-node: ubuntu1804-docker-8c-8g branch: 'master' mvn-settings: 'sdc-settings' + java-version: openjdk11 - project: name: sdc-info @@ -137,3 +140,4 @@ mvn-clean-install: true project: 'sdc' branch: master + java-version: openjdk11 |