From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Thu, 9 Mar 2023 17:10:10 +0000 (+0000)
Subject: Merge "O-RAN SC: NONRTRIC: Add jenkins jobs for datafilecollector pmproducer influxlo... 
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=77e94416b036507186686033dabcbe010eb67884;hp=5c8660637f7d0e180d4708c9b8d4b5693b0627fa;p=ci-management.git

Merge "O-RAN SC: NONRTRIC: Add jenkins jobs for datafilecollector pmproducer influxlogger"
---

diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-cpp-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-cpp-settings/config-params.yaml
new file mode 100644
index 00000000..f55e73b5
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-cpp-settings/config-params.yaml
@@ -0,0 +1,3 @@
+---
+name: "ric-plt-xapp-frame-cpp-settings"
+comment: "ric-plt-xapp-frame-cpp-settings"
diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-cpp-settings/content b/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-cpp-settings/content
new file mode 120000
index 00000000..e830ebdd
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-cpp-settings/content
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-cpp-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-cpp-settings/serverCredentialMappings.sandbox.yaml
new file mode 120000
index 00000000..d7baae2f
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-cpp-settings/serverCredentialMappings.sandbox.yaml
@@ -0,0 +1 @@
+../../../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-cpp-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-cpp-settings/serverCredentialMappings.yaml
new file mode 100644
index 00000000..40c9832d
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/ric-plt-xapp-frame-cpp-settings/serverCredentialMappings.yaml
@@ -0,0 +1,18 @@
+---
+serverCredentialMappings:
+  - credentialsId: "ric-plt-xapp-frame-cpp"
+    serverId: "releases"
+  - credentialsId: "ric-plt-xapp-frame-cpp"
+    serverId: "staging"
+  - credentialsId: "ric-plt-xapp-frame-cpp"
+    serverId: "site"
+  - credentialsId: "ric-plt-xapp-frame-cpp"
+    serverId: "snapshots"
+  - credentialsId: "docker"
+    serverId: "nexus3.o-ran-sc.org:10001"
+  - credentialsId: "ric-plt-xapp-frame-cpp"
+    serverId: "nexus3.o-ran-sc.org:10002"
+  - credentialsId: "ric-plt-xapp-frame-cpp"
+    serverId: "nexus3.o-ran-sc.org:10003"
+  - credentialsId: "ric-plt-xapp-frame-cpp"
+    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 70a6cfda..7eb12fbf 100644
--- 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-dmaapadapter/nonrtric-plt-dmaapadapter.yaml b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
index 6dc595a0..21be3cd6 100644
--- a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
+++ b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
@@ -22,7 +22,7 @@
     # maven settings file has docker credentials
     mvn-settings: nonrtric-plt-dmaapadapter-settings
     mvn-version: mvn36
-    java-version: openjdk11
+    java-version: openjdk17
 
 - project:
     <<: *dmaapadapter_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:dmaapadapter/
@@ -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/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index f350d35f..f1769e03 100644
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -22,7 +22,7 @@
     # maven settings file has docker credentials
     mvn-settings: nonrtric-settings
     mvn-version: mvn36
-    java-version: openjdk11
+    java-version: openjdk17
 
 # nonrtric:pm-pmlogger-influx
 # Maven artifacts for nonrtric:pm-pmlogger-influx
@@ -206,9 +206,13 @@
       - "{project-name}-gerrit-docker-jobs"
       - gerrit-go-verify
     stream:
-      - all:
-          branch: '*'
+      - master:
+          branch: master
+      - f-release:
+          java-version: openjdk11
+          branch: f-release
       - g-release:
+          java-version: openjdk11
           branch: g-release
 
 - project: