summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/ccsdk/apps.yaml7
-rw-r--r--jjb/ccsdk/ccsdk-csit.yaml4
-rw-r--r--jjb/ccsdk/ccsdk-oran.yaml7
-rw-r--r--jjb/ccsdk/cds.yaml11
-rw-r--r--jjb/ccsdk/distribution.yaml5
-rw-r--r--jjb/ccsdk/features.yaml12
-rw-r--r--jjb/ccsdk/odl-legacy.yaml2
-rw-r--r--jjb/ccsdk/parent.yaml5
-rw-r--r--jjb/ccsdk/sli.yaml7
-rw-r--r--jjb/sdnc/sdnc-apps.yaml7
-rw-r--r--jjb/sdnc/sdnc-csit.yaml2
-rw-r--r--jjb/sdnc/sdnc-northbound.yaml7
-rw-r--r--jjb/sdnc/sdnc-oam.yaml5
13 files changed, 33 insertions, 48 deletions
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 6849c8e6c..66210a3ea 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -34,11 +34,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: 'ccsdk-apps-settings'
# due to a strange macro / variable translation problem this needs to be
@@ -69,7 +68,7 @@
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-apps-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-opts: '-Xmx1024m'
- project:
name: ccsdk-apps-clm
diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
index bfebf74e4..bc5d50728 100644
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -15,8 +15,6 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- 'kohn':
branch: 'kohn'
mvn-settings: 'ccsdk-distribution-settings'
@@ -38,8 +36,6 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- 'kohn':
branch: 'kohn'
mvn-settings: 'ccsdk-oran-settings'
diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 8076a03c2..3c01aed4e 100644
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -28,11 +28,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: 'ccsdk-oran-settings'
files: '**'
@@ -87,6 +86,6 @@
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-oran-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-opts: '-Xmx1024m'
mvn-opts: '-Ddocker.skip=true'
mvn-params: '-f a1-policy-management'
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 708a2e437..65bef8e99 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -27,11 +27,10 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ java-version: openjdk17
- 'kohn':
branch: 'kohn'
- java-version: openjdk11
+ java-version: openjdk11
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-cds-settings'
# due to a strange macro / variable translation problem this needs to be
@@ -97,11 +96,11 @@
project: 'ccsdk/cds'
project-name: 'ccsdk-cds'
branch: 'master'
- java-version: openjdk11
+ java-version: openjdk17
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-cds-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-opts: '-Xmx1024m'
- project:
name: ccsdk-cds-clm
@@ -113,7 +112,7 @@
stream:
- 'master':
branch: 'master'
- java-version: openjdk11
+ java-version: openjdk17
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-cds-settings'
build-node: centos8-builder-4c-4g
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 95ba9cecb..807d52637 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -29,11 +29,10 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ java-version: openjdk11
- 'kohn':
branch: 'kohn'
- java-version: openjdk17
+ java-version: openjdk17
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-distribution-settings'
files: '**'
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 43241edc9..0266fe9a3 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -21,11 +21,12 @@
stream:
- 'master':
branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
+ java-version: openjdk17
+ mvn-opts: '-Xmx3072m'
- 'kohn':
branch: 'kohn'
- java-version: openjdk17
+ java-version: openjdk11
+ mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-features-settings'
# due to a strange macro / variable translation problem this needs to be
@@ -35,7 +36,6 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
- mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
build-node: centos8-builder-4c-4g
mvn-snapshot-id: 'ecomp-snapshots'
nexus-snapshot-repo: 'snapshots'
@@ -57,7 +57,7 @@
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-features-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
+ mvn-opts: '-Xmx3072m'
- project:
name: ccsdk-features-clm
@@ -72,7 +72,7 @@
java-version: openjdk17
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-features-settings'
- mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
+ mvn-opts: '-Xmx3072m'
build-node: centos8-builder-4c-4g
- project:
diff --git a/jjb/ccsdk/odl-legacy.yaml b/jjb/ccsdk/odl-legacy.yaml
index 567f989c7..4e6cdceb5 100644
--- a/jjb/ccsdk/odl-legacy.yaml
+++ b/jjb/ccsdk/odl-legacy.yaml
@@ -58,7 +58,7 @@
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-odl-legacy-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-opts: '-Xmx1024m'
- project:
name: ccsdk-odl-legacy-clm
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index d89480137..72a3fa473 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -23,6 +23,7 @@
stream:
- 'master':
branch: 'master'
+ java-version: openjdk17
jobs:
- gerrit-maven-verify:
mvn-params: '-Drevision=3.0.0-SNAPSHOT'
@@ -32,11 +33,9 @@
mvn-params: '-Dmaven.test.skip=true -Drevision=3.0.0'
- '{project-name}-gerrit-release-jobs':
mvn-params: '-Drevision=3.0.0'
- - 'jakarta':
- branch: 'jakarta'
- 'kohn':
branch: 'kohn'
- java-version: openjdk17
+ java-version: openjdk11
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-parent-settings'
# due to a strange macro / variable translation problem this needs to be
diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml
index 90fa8ca70..7effd820b 100644
--- a/jjb/ccsdk/sli.yaml
+++ b/jjb/ccsdk/sli.yaml
@@ -21,11 +21,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: 'ccsdk-sli-settings'
# due to a strange macro / variable translation problem this needs to be
@@ -56,7 +55,7 @@
mvn-version: 'mvn38'
mvn-settings: 'ccsdk-sli-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ mvn-opts: '-Xmx1024m'
- project:
name: ccsdk-sli-clm
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 9e9eb539b..0293a9e10 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 af3991263..f9b715eba 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 9961802d6..c61b7aca3 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: '**'