diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2020-08-07 16:50:30 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-08-07 16:50:30 +0000 |
| commit | 931c36a25edde54df1e4cacda1ce748293d2587a (patch) | |
| tree | 96258f14d2f23fe2b4caac05fce11a6623ad9a95 | |
| parent | 1f694863dadad82072152a8b02b0a24a9ccd7187 (diff) | |
| parent | 9763172b766b4e6752c84cc43bf7985460313797 (diff) | |
Merge "upgrade the JSDK java 11 for specific branches"
| -rw-r--r-- | jjb/so/so-libs.yaml | 2 | ||||
| -rw-r--r-- | jjb/so/so.yaml | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index c2aae6fad..87cf07fb3 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -2,7 +2,6 @@ - project: name: so-libs project-name: 'so-libs' - java-version: openjdk11 jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -67,7 +66,6 @@ name: so-libs-info project-name: so-libs java-version: openjdk11 - java-version: openjdk11 jobs: - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 11b4a1f1e..2c5a06aaf 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -9,7 +9,6 @@ - project: name: so project-name: 'so' - java-version: openjdk11 jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -29,12 +28,14 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' - 'elalto': branch: 'elalto' - 'dynamicBPMN': branch: 'Dynamic_BPMN' + java-version: openjdk11 mvn-settings: 'so-settings' java-version: openjdk11 files: '**' |