From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Tue, 7 Mar 2023 18:56:07 +0000 (+0000)
Subject: Merge "Deleting xapp-frame-rust settings file"
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=076937df3f0f036c7fd8f84152a0a4cacb8ad978;hp=59130c5a59ad38842160a2ebc636739191c3b877;p=ci-management.git

Merge "Deleting xapp-frame-rust settings file"
---

diff --git a/global-jjb b/global-jjb
index 02860f86..42fbb1b5 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 02860f86d24223854948d1d13a91a77496e7bd0f
+Subproject commit 42fbb1b57b7f344ef6193fb5391d787c5ade86ca
diff --git a/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm-settings/config-params.yaml
new file mode 100644
index 00000000..45d2729f
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm-settings/config-params.yaml
@@ -0,0 +1,3 @@
+---
+name: "nonrtric-plt-ranpm"
+comment: "nonrtric-plt-ranpm"
diff --git a/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm-settings/content b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm-settings/content
new file mode 120000
index 00000000..e830ebdd
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm-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/nonrtric-plt-ranpm-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm-settings/serverCredentialMappings.sandbox.yaml
new file mode 120000
index 00000000..8f920579
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm-settings/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-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm-settings/serverCredentialMappings.yaml
new file mode 100644
index 00000000..c046c4b8
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm-settings/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"
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
index 00000000..5d8c468a
--- /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/nonrtric-plt-ranpm/content b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm/content
new file mode 120000
index 00000000..e830ebdd
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/nonrtric-plt-ranpm/content
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file
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
index 00000000..8f920579
--- /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
index 00000000..c0d2598e
--- /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/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-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
index 4023b3fb..c0011ce0 100644
--- a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
+++ b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
@@ -22,7 +22,7 @@
     # maven settings file has docker credentials
     mvn-settings: nonrtric-plt-informationcoordinatorservice-settings
     mvn-version: mvn36
-    java-version: openjdk11
+    java-version: openjdk17
 
 - project:
     <<: *informationcoordinatorservice_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:informationcoordinatorservice
@@ -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
index 00000000..3fc481d6
--- /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/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 46f31bcd..f350d35f 100644
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -24,6 +24,27 @@
     mvn-version: mvn36
     java-version: openjdk11
 
+# nonrtric:pm-pmlogger-influx
+# Maven artifacts for nonrtric:pm-pmlogger-influx
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-plt-pm-pmlogger-influx
+    project-name: '{name}'
+    mvn-opts: '-Ddocker.skip=true'
+    mvn-params: '-f pmlog -Dbuild.number=${{BUILD_NUMBER}}'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'pmlog/.*'
+    build-node: ubuntu1804-builder-4c-4g
+    jobs:
+      - gerrit-maven-verify
+      - gerrit-maven-merge
+      # Disable stage for now (Will move to another repo before release)     - gerrit-maven-stage
+      # Disable clm for now  (Will move to another repo before release)     - gerrit-maven-clm
+    stream:
+      - master:
+          branch: master
+
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-test-kafka-procon
diff --git a/jjb/o-du-l2/o-du-l2.yaml b/jjb/o-du-l2/o-du-l2.yaml
index 0ddbe8d6..c574af71 100644
--- a/jjb/o-du-l2/o-du-l2.yaml
+++ b/jjb/o-du-l2/o-du-l2.yaml
@@ -38,6 +38,8 @@
     stream:
       - master:
           branch: master
+      - sch_slice_based:
+          branch: sch_slice_based
 
 - project:
     <<: *o_du_l2_common
@@ -52,6 +54,8 @@
     stream:
       - master:
           branch: master
+      - sch_slice_based:
+          branch: sch_slice_based
 
 - project:
     <<: *o_du_l2_common