diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2023-02-27 17:42:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2023-02-27 17:42:15 +0000 |
| commit | ef66a20c4bef1cb5f4bfe97921a9d96e66472558 (patch) | |
| tree | c42c1780f31e3926764145c69965ff36b65112e4 /jjb/sdnc | |
| parent | 2e12e702fae3e61f583b0fd10b9151eb84e4b789 (diff) | |
| parent | dc680de42dd485b07b38aeb0a26ee2d3dd3d5828 (diff) | |
Merge "Fix Java compile config for ccsdk and sdnc"
Diffstat (limited to 'jjb/sdnc')
| -rw-r--r-- | jjb/sdnc/sdnc-apps.yaml | 7 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-csit.yaml | 2 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-northbound.yaml | 7 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-oam.yaml | 5 |
4 files changed, 8 insertions, 13 deletions
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 408f7b35e..706184ba7 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -37,11 +37,10 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + java-version: openjdk17 - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk11 mvn-version : "mvn38" mvn-settings: 'sdnc-apps-settings' @@ -74,7 +73,7 @@ mvn-version : "mvn38" mvn-settings: 'sdnc-apps-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' maven-version: "mvn38" # diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml index c427e82f8..582fee02b 100644 --- a/jjb/sdnc/sdnc-csit.yaml +++ b/jjb/sdnc/sdnc-csit.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' - 'kohn': branch: 'kohn' mvn-settings: 'sdnc-oam-settings' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index d1711b502..1330b3b79 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -18,11 +18,10 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + java-version: openjdk17 - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk11 mvn-version: "mvn38" mvn-settings: 'sdnc-northbound-settings' @@ -55,7 +54,7 @@ mvn-goals: 'clean install' java-version: openjdk17 mvn-version: "mvn38" - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: sdnc-northbound-clm diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index b59f3f66d..4c2e6f05c 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -27,11 +27,10 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + java-version: openjdk17 - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk11 mvn-version: "mvn38" mvn-settings: 'sdnc-oam-settings' files: '**' |