Merge "NONRTRIC: Try use jdk17 in jenkins jobs for nonrtric & nonrtric-plt-dmaapadapter"

diff --git a/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm/config-params.yaml
new file mode 100644 (file)
index 0000000..5d8c468
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm/config-params.yaml
@@ -0,0 +1,3 @@
+---
+name: "nonrtric-plt-ranpm"
+comment: "nonrtric-plt-ranpm"
\ No newline at end of file

diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-rust-settings/content b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm/content
similarity index 100%
rename from jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-rust-settings/content
rename to jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm/content

diff --git a/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm/serverCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..8f92057
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm/serverCredentialMappings.sandbox.yaml
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-serverCredentialMappings.sandbox.yaml
\ No newline at end of file

diff --git a/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm/serverCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..c0d2598
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm/serverCredentialMappings.yaml
@@ -0,0 +1,18 @@
+---
+serverCredentialMappings:
+  - serverId: "releases"
+    credentialsId: "nonrtric-plt-ranpm"
+  - serverId: "snapshots"
+    credentialsId: "nonrtric-plt-ranpm"
+  - serverId: "staging"
+    credentialsId: "nonrtric-plt-ranpm"
+  - serverId: "site"
+    credentialsId: "nonrtric-plt-ranpm"
+  - serverId: "nexus3.o-ran-sc.org:10001"
+    credentialsId: "nonrtric-plt-ranpm"
+  - serverId: "nexus3.o-ran-sc.org:10002"
+    credentialsId: "nonrtric-plt-ranpm"
+  - serverId: "nexus3.o-ran-sc.org:10003"
+    credentialsId: "nonrtric-plt-ranpm"
+  - serverId: "nexus3.o-ran-sc.org:10004"
+    credentialsId: "nonrtric-plt-ranpm"
\ No newline at end of file

diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-rust-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-rust-settings/config-params.yaml
deleted file mode 100644 (file)
index e8a6a0f..0000000
--- a/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-rust-settings/config-params.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-name: "ric-plt-xapp-frame-rust-settings"
-comment: "ric-plt-xapp-frame-rust-settings"

diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-rust-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-rust-settings/serverCredentialMappings.sandbox.yaml
deleted file mode 120000 (symlink)
index d7baae2..0000000
--- a/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-rust-settings/serverCredentialMappings.sandbox.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../managed-config-templates/serverCredentialMappings.sandbox.yaml
\ No newline at end of file

diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-rust-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-rust-settings/serverCredentialMappings.yaml
deleted file mode 100644 (file)
index f85b451..0000000
--- a/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-rust-settings/serverCredentialMappings.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-serverCredentialMappings:
-  - credentialsId: "ric-plt-xapp-frame-rust"
-    serverId: "releases"
-  - credentialsId: "ric-plt-xapp-frame-rust"
-    serverId: "staging"
-  - credentialsId: "ric-plt-xapp-frame-rust"
-    serverId: "site"
-  - credentialsId: "ric-plt-xapp-frame-rust"
-    serverId: "snapshots"
-  - credentialsId: "docker"
-    serverId: "nexus3.o-ran-sc.org:10001"
-  - credentialsId: "ric-plt-xapp-frame-rust"
-    serverId: "nexus3.o-ran-sc.org:10002"
-  - credentialsId: "ric-plt-xapp-frame-rust"
-    serverId: "nexus3.o-ran-sc.org:10003"
-  - credentialsId: "ric-plt-xapp-frame-rust"
-    serverId: "nexus3.o-ran-sc.org:10004"

diff --git a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
index 70a6cfd..7eb12fb 100644 (file)
--- a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
+++ b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
@@ -22,7 +22,7 @@
     # maven settings file has docker credentials
     mvn-settings: nonrtric-plt-a1policymanagementservice-settings
     mvn-version: mvn36
-    java-version: openjdk11
+    java-version: openjdk17
 
 - project:
     <<: *a1policymanagementservice_jdk_common
@@ -35,8 +35,10 @@
       - master:
           branch: master
       - f-release:
+          java-version: openjdk11
           branch: f-release
       - g-release:
+          java-version: openjdk11
           branch: g-release
 
 # nonrtric:a1policymanagementservice/
@@ -54,8 +56,10 @@
       - master:
           branch: master
       - f-release:
+          java-version: openjdk11
           branch: f-release
       - g-release:
+          java-version: openjdk11
           branch: g-release
 
 - project:

diff --git a/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml b/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
new file mode 100644 (file)
index 0000000..3fc481d
--- /dev/null
+++ b/jjb/nonrtric-plt-ranpm/nonrtric-plt-ranpm.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+    name: nonrtric-plt-ranpm-project-view
+    project-name: nonrtric-plt-ranpm
+    views:
+      - project-view
+
+- project:
+    name: nonrtric-plt-ranpm-info
+    project: nonrtric/plt/ranpm
+    project-name: nonrtric-plt-ranpm
+    build-node: centos7-builder-1c-1g
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
\ No newline at end of file

diff --git a/jjb/ric-plt-xapp-frame-rust/ric-plt-xapp-frame-rust.yaml b/jjb/ric-plt-xapp-frame-rust/ric-plt-xapp-frame-rust.yaml
index 108261b..4e76e77 100644 (file)
--- a/jjb/ric-plt-xapp-frame-rust/ric-plt-xapp-frame-rust.yaml
+++ b/jjb/ric-plt-xapp-frame-rust/ric-plt-xapp-frame-rust.yaml
@@ -22,7 +22,7 @@
     # jenkins job name prefix
     project-name: ric-plt-xapp-frame-rust
     # maven settings file has docker credentials
-    mvn-settings: ric-plt-xapp-frame-rust-settings
+    mvn-settings: ric-plt-xapp-frame-settings
 
 # runs unit tests on verify only
 - project: