diff options
| author |   Eric Ball <eball@linuxfoundation.org> | 2021-06-18 22:18:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-06-18 22:18:43 +0000 |
| commit | e4a77184b9a3682745a3a3394b16cab3eeed104d (patch) | |
| tree | 9b8bffcb37452d16ecc663a7edf12d6d32eeb0ca /jjb | |
| parent | 07d7ca431507f48ef15ae5e2b2aeb584d3a1abaa (diff) | |
| parent | 961547f6542204e75df3e91a14fc5ec70274140e (diff) | |
Merge "[SDC] Update maven to 3.6"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/sdc/sdc-csit.yaml | 2 | ||||
| -rw-r--r-- | jjb/sdc/sdc.yaml | 23 |
2 files changed, 3 insertions, 22 deletions
diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index 714aa7712..c053518bf 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -24,6 +24,6 @@ - 'honolulu': branch: 'honolulu' java-version: openjdk11 - mvn-version: 'mvn36' + maven-version: 'mvn36' mvn-settings: 'sdc-settings' mvn-global-settings: global-settings diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index a40e24019..bd12fb310 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -69,33 +69,12 @@ - 'honolulu': branch: 'honolulu' java-version: openjdk11 -# - 'frankfurt': -# branch: 'frankfurt' -# java-version: openjdk8 mvn-settings: 'sdc-settings' files: '**' archive-artifacts: '' build-node: ubuntu1804-docker-8c-8g maven-version: 'mvn36' -#- project: -# name: sdc-arm64 -# project-name: 'sdc-arm64' -# jobs: -# - '{project-name}-{stream}-docker-version-java-daily': -# build-node: 'ubuntu1804-docker-arm64-4c-2g' -# docker-pom: 'pom.xml' -# mvn-profile: 'docker' -# mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' -# project: 'sdc' -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: 'sdc-settings' -# files: '**' -# archive-artifacts: '' -# maven-version: 'mvn35' -# - project: name: sdc-sonar jobs: @@ -116,6 +95,7 @@ mvn-params: '-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' + maven-version: 'mvn36' - project: name: sdc-clm @@ -129,6 +109,7 @@ project-name: 'sdc' build-node: ubuntu1804-docker-8c-8g branch: 'master' + maven-version: 'mvn36' mvn-settings: 'sdc-settings' java-version: openjdk11 |