diff options
| author |   sebdet <sebastien.determe@intl.att.com> | 2020-09-16 14:12:44 +0200 |
|---|---|---|
| committer | sebdet <sebastien.determe@intl.att.com> | 2020-09-16 14:12:44 +0200 |
| commit | 7ac8160e06c8d8571280010e38a797cf8610a92f (patch) | |
| tree | 981bc5440b00e63b85b56284a1f4a6fad50844e8 /jjb | |
| parent | cc95c41cd687457b8da16090377d7ca64335d291 (diff) | |
Fix the merge job
Fix the merge job that does not use jdk 11
Issue-ID: SDC-2725
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: I3bb72a6ca40efa738b7bce16d842c3c6454d6edb
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/global-templates-java.yaml | 2 | ||||
| -rw-r--r-- | jjb/sdc/sdc.yaml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index da5dfdccc..55df274fc 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -1090,6 +1090,8 @@ builders: - lf-infra-pre-build + - lf-update-java-alternatives: + java-version: "{java-version}" - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 22fa4818d..c64d17e89 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -35,7 +35,6 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' - java-version: openjdk11 - gerrit-maven-stage: build-timeout: 90 sign-artifacts: true |