ORAN - Enable setting mvn version in jjb files

Upgrade mvn version 3.6.2->3.6.3

Change-Id: I8277e17411049e3326409f9b1aafb57b74d0b28c
Signed-off-by: JohnKeeney <john.keeney@est.tech>

diff --git a/jjb/oransc/global-templates-oran-java.yaml b/jjb/oransc/global-templates-oran-java.yaml
index 0a21b6bb885b30799327b8cac4e6bd401712190b..2712e7c7109797faf3b365368e949bc0790eb1b6 100644 (file)
--- a/jjb/oransc/global-templates-oran-java.yaml
+++ b/jjb/oransc/global-templates-oran-java.yaml
@@ -4,6 +4,7 @@
     disabled: false
     concurrent: true
     subdirectory: 
+    mvn_version: 3.6.3
     trigger_branch_pattern: '**'
     trigger_files_path_pattern: '**'
 
@@ -22,7 +23,7 @@
           description: Java home
       - string:
           name: MVN_VERSION
-          default: 3.6.2
+          default: '{mvn_version}'
           description: Maven version
       - string:
           name: MVN_URL
@@ -88,7 +89,7 @@
           description: Java home
       - string:
           name: MVN_VERSION
-          default: 3.6.2
+          default: '{mvn_version}'
           description: Maven version
       - string:
           name: MVN_URL

diff --git a/jjb/oransc/nonrtric-plt-a1policymanagementservice/nonrtric-plt-dmaapadapter-verify-jobs.yaml b/jjb/oransc/nonrtric-plt-a1policymanagementservice/nonrtric-plt-dmaapadapter-verify-jobs.yaml
index 24edf647c2f050b30746f70800564d53520baeb2..302fa1074074468579248b0e9ec65c431c48a9b0 100644 (file)
--- a/jjb/oransc/nonrtric-plt-a1policymanagementservice/nonrtric-plt-dmaapadapter-verify-jobs.yaml
+++ b/jjb/oransc/nonrtric-plt-a1policymanagementservice/nonrtric-plt-dmaapadapter-verify-jobs.yaml
@@ -25,6 +25,7 @@
     project: nonrtric/plt/a1policymanagementservice
     project-name: nonrtric-plt-a1policymanagementservice
     jdk-version: java-17
+    mvn_version: 3.6.3
 
     jobs:
       - 'oransc-{project-name}-verify-java'
\ No newline at end of file

diff --git a/jjb/oransc/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter-verify-jobs.yaml b/jjb/oransc/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter-verify-jobs.yaml
index 7c76e94fe459d4ba9e610095221841c8fd096d33..b039a4b99d84e277ad0384ca9f6985210bb2f1c0 100644 (file)
--- a/jjb/oransc/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter-verify-jobs.yaml
+++ b/jjb/oransc/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter-verify-jobs.yaml
@@ -25,6 +25,7 @@
     project: nonrtric/plt/dmaapadapter
     project-name: nonrtric-plt-dmaapadapter
     jdk-version: java-17
+    mvn_version: 3.6.3
 
     jobs:
       - 'oransc-{project-name}-verify-java'
\ No newline at end of file

diff --git a/jjb/oransc/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice-verify-jobs.yaml b/jjb/oransc/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice-verify-jobs.yaml
index 2c51a7db8fc2d56b30e1eddc9aa554375def1490..8584e195433d1255ec7b2aff18bb94fdab98cb01 100644 (file)
--- a/jjb/oransc/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice-verify-jobs.yaml
+++ b/jjb/oransc/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice-verify-jobs.yaml
@@ -25,6 +25,7 @@
     project: nonrtric/plt/informationcoordinatorservice
     project-name: nonrtric-plt-informationcoordinatorservice
     jdk-version: java-17
+    mvn_version: 3.6.3
 
     jobs:
       - 'oransc-{project-name}-verify-java'
\ No newline at end of file

diff --git a/jjb/oransc/nonrtric-plt-ranpm/nonrtric-plt-ranpm-verify-jobs.yaml b/jjb/oransc/nonrtric-plt-ranpm/nonrtric-plt-ranpm-verify-jobs.yaml
index e1ade6608ff4d88540b2f8a909cca24c699dffa1..ec7dc55f719b3dfcc489da8774f27defc840cef9 100644 (file)
--- a/jjb/oransc/nonrtric-plt-ranpm/nonrtric-plt-ranpm-verify-jobs.yaml
+++ b/jjb/oransc/nonrtric-plt-ranpm/nonrtric-plt-ranpm-verify-jobs.yaml
@@ -25,6 +25,7 @@
     project: nonrtric/plt/ranpm
     project-name: nonrtric-plt-ranpm
     jdk-version: java-17
+    mvn_version: 3.6.3
 
 # Job for nonrtric-plt-ranpm-datafilecollector
 - project:

diff --git a/jjb/oransc/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue-verify-jobs.yaml b/jjb/oransc/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue-verify-jobs.yaml
index 3ff250371b544c64bb77b660c2f1d4963db06f53..c180f7b6c5bba1183d942f40bd27f68e34395e21 100644 (file)
--- a/jjb/oransc/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue-verify-jobs.yaml
+++ b/jjb/oransc/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue-verify-jobs.yaml
@@ -25,6 +25,7 @@
     project: nonrtric/plt/rappcatalogue
     project-name: nonrtric-plt-rappcatalogue
     jdk-version: java-17
+    mvn_version: 3.6.3
 
     jobs:
       - 'oransc-{project-name}-verify-java'
\ No newline at end of file

diff --git a/jjb/oransc/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager-verify-jobs.yaml b/jjb/oransc/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager-verify-jobs.yaml
index 29b2dda3943201cf3ea312814f86090e0435ce95..caba178c479e678ef4280430ef83a46ca7c0f441 100644 (file)
--- a/jjb/oransc/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager-verify-jobs.yaml
+++ b/jjb/oransc/nonrtric-plt-rappmanager/nonrtric-plt-rappmanager-verify-jobs.yaml
@@ -25,6 +25,7 @@
     project: nonrtric/plt/rappmanager
     project-name: nonrtric-plt-rappmanager
     jdk-version: java-17
+    mvn_version: 3.6.3
 
     jobs:
       - 'oransc-{project-name}-verify-java'
\ No newline at end of file

diff --git a/jjb/oransc/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller-verify-jobs.yaml b/jjb/oransc/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller-verify-jobs.yaml
index 75a3a1a3847d3eb4e41e091f2fddfaf1f636a0dd..be2b3ac6961fc52d38767d9b14f691f2f362db26 100644 (file)
--- a/jjb/oransc/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller-verify-jobs.yaml
+++ b/jjb/oransc/nonrtric-plt-sdnca1controller/nonrtric-plt-sdnca1controller-verify-jobs.yaml
@@ -25,6 +25,7 @@
     project: nonrtric/plt/sdnca1controller
     project-name: nonrtric-plt-sdnca1controller
     jdk-version: java-11
+    mvn_version: 3.6.3
 
     jobs:
       - 'oransc-{project-name}-verify-java'
\ No newline at end of file

diff --git a/jjb/oransc/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel-verify-jobs.yml b/jjb/oransc/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel-verify-jobs.yml
index 159c1620612a96cc1602c6bdcbcf08a9e433f7de..8c8b66ae26d4ebaa478e1ac9fd8bc84b513a628f 100644 (file)
--- a/jjb/oransc/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel-verify-jobs.yml
+++ b/jjb/oransc/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel-verify-jobs.yml
@@ -22,6 +22,7 @@
     project: portal/nonrtric-controlpanel
     project-name: portal-nonrtric-controlpanel
     jdk-version: java-17
+    mvn_version: 3.6.3
 
     jobs:
       - 'oransc-{project-name}-verify-java'

diff --git a/jjb/oransc/smo-teiv/smo-teiv-verify-jobs.yaml b/jjb/oransc/smo-teiv/smo-teiv-verify-jobs.yaml
index 38f2f2568c9f46aca5f0d666eb352a40848d1928..c89e1652ce785d2c2b5fe21d32ce7a8c52670c00 100644 (file)
--- a/jjb/oransc/smo-teiv/smo-teiv-verify-jobs.yaml
+++ b/jjb/oransc/smo-teiv/smo-teiv-verify-jobs.yaml
@@ -25,6 +25,7 @@
     project: smo/teiv
     project-name: smo-teiv
     jdk-version: java-17
+    mvn_version: 3.6.3
 
     jobs:
       - 'oransc-{project-name}-verify-java'
\ No newline at end of file

diff --git a/jjb/oransc/ties/ties-verify-job.yaml b/jjb/oransc/ties/ties-verify-job.yaml
deleted file mode 100644 (file)
index 3df20b5..0000000
--- a/jjb/oransc/ties/ties-verify-job.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2024 Nordix Foundation.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-# this job gets triggered when a change is proposed to
-# topology-exposure-inventory project on Nordix Gerrit.
-
-- project:
-    name: topology-exposure-inventory-verify
-    project: topology-exposure-inventory
-    project-name: topology-exposure-inventory
-    jdk-version: java-17
-
-    jobs:
-      - 'ties-{project-name}-verify-java'
\ No newline at end of file