Merge remote-tracking branch 'origin/new-jenkins' into develop (!3213)

chore(ci): Move to new Jenkins and Openshift Cluster

- Update helm-charts with new node roles
- Add resource definition in physim helm-charts to easily schedule them
  on different cluster servers
- Update entitlement creation methodology
- Add namespace for aerial pipeline

charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.dlsim100rbtm2}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.dlsim100rbtm2 }}
       {{- end }}

charts/physims/charts/dlsim.basic/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.dlsimbasic}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.dlsimbasic }}
       {{- end }}

charts/physims/charts/ldpctest/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.ldpctest}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.ldpctest }}
       {{- end }}

charts/physims/charts/nr-dlschsim/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.nrdlschsim}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.nrdlschsim }}
       {{- end }}

charts/physims/charts/nr-dlsim.basic/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.nrdlsimbasic}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.nrdlsimbasic }}
       {{- end }}

charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.nrdlsimdmrsptrs}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.nrdlsimdmrsptrs }}
       {{- end }}

charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.nrdlsimmcsmimo}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.nrdlsimmcsmimo }}
       {{- end }}

charts/physims/charts/nr-dlsim.offset/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.nrdlsimoffset}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.nrdlsimoffset }}
       {{- end }}

charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.nrpbschsim106rb}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.nrpbschsim106rb }}
       {{- end }}

charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.nrpbchsim217rb}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.nrpbchsim217rb }}
       {{- end }}

charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.nrpbchsim273rb}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.nrpbchsim273rb }}
       {{- end }}

charts/physims/charts/nr-pbchsim.scs/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.nrpbchsim273rb}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.nrpbchsim273rb }}
       {{- end }}

charts/physims/charts/nr-prachsim/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.nrprachsim}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.nrprachsim }}
       {{- end }}

charts/physims/charts/nr-psbchsim/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.nrpsbchsim}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.nrpsbchsim }}
       {{- end }}

charts/physims/charts/nr-pucchsim/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.nrpucchsim}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.nrpucchsim }}
       {{- end }}

charts/physims/charts/nr-ulschsim/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.nrulschsim}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.nrulschsim }}
       {{- end }}

charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.nrulsim3gpp}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.nrulsim3gpp }}
       {{- end }}

charts/physims/charts/nr-ulsim.mimo/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.nrulsimmimo}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.nrulsimmimo }}
       {{- end }}

charts/physims/charts/nr-ulsim.misc/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.nrulsimmisc}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.nrulsimmisc }}
       {{- end }}

charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         ports:
@@ -39,6 +44,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.nrulsimscfdma}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.nrulsimscfdma }}
       {{- end }}

charts/physims/charts/polartest/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.polartest}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.polartest }}
       {{- end }}

charts/physims/charts/smallblocktest/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.smallblocktest}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.smallblocktest }}
       {{- end }}

charts/physims/charts/ulsim/templates/job.yaml

@@ -18,6 +18,11 @@ spec:
       - name: physim
         image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.global.resources.define}}
+        resources:
+          requests:
+            cpu: {{ .Values.global.resources.requests.cpu | quote }}
+        {{- end}}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         env:
@@ -37,6 +42,6 @@ spec:
       nodeSelector:
          {{- toYaml .Values.global.nodeSelector | nindent 12 }}
       {{- end }}
-      {{- if .Values.global.nodeName.ulsim}}
+      {{- if .Values.global.nodeName}}
       nodeName: {{ .Values.global.nodeName.ulsim }}
       {{- end }}

charts/physims/values.yaml

 # Default values for oai-physim.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
-
 global:
   serviceAccountName: oai-physim-sa
   namespace: "OAICICD_PROJECT"
-  image: 
+  image:
     registry: local
     repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran/oai-physim
     version: TAG
     # pullPolicy: IfNotPresent or Never or Always
     pullPolicy: Always
   # removing the node selector
-  nodeSelector: {}
-  # It is not a good way of assigning pods to the nodes: this way we bypass the scheduler. At the moment we don't provide the resource information of these pods.
-  # Therefore, Openshift assigns the pods to the same node because it thinks the pods don't consume much resources. This isn't the case, they consume a lot of resources.
-  nodeName:
-    dlsim100rbtm2: acamas
-    dlsimbasic: acamas
-    ldpctest: acamas
-    nrdlschsim: acamas
-    nrdlsimbasic: acamas
-    nrdlsimdmrsptrs: acamas
-    nrdlsimmcsmimo: acamas
-    nrdlsimoffset: dedale
-    nrpbschsim106rb: dedale
-    nrpbchsim217rb: dedale
-    nrpbchsim273rb: dedale
-    nrpbchsimscs: dedale
-    nrpsbchsim: dedale
-    nrprachsim: dedale
-    nrpucchsim: dedale
-    nrulschsim: demophon
-    nrulsim3gpp: demophon
-    nrulsimmimo: demophon
-    nrulsimmisc: demophon
-    nrulsimscfdma: demophon
-    polartest: demophon
-    smallblocktest: demophon
-    ulsim: demophon
+  # will place on two nodes intel 3rd gen and 5th gen with RT kernel
+  nodeSelector:
+    type: ran
+  nodeName: ''
+  resources:
+    define: false
+    requests:
+      cpu: 1.5

ci-scripts/ci_infra.yaml

@@ -64,21 +64,21 @@ adb_ue_2:
 oc-cn5g:
   Host: avra
   Namespace: "oaicicd-core-for-ci-ran"
-  CNPath: "/opt/oai-cn5g-fed-develop-2024-april-00102"
+  CNPath: "/opt/oai-cn5g-fed-develop-2025-jan"
   NetworkScript: echo "inet 172.21.6.102"
   RunIperf3Server: False
 
 oc-cn5g-20897:
   Host: cacofonix
   Namespace: "oaicicd-core-for-fhi72"
-  CNPath: "/opt/oai-cn5g-fed-develop-2024-april-20897"
+  CNPath: "/opt/oai-cn5g-fed-develop-2025-jan"
   NetworkScript: echo "inet 172.21.6.105"
   RunIperf3Server: False
 
 oc-cn5g-20897-aerial2:
   Host: aerial2
-  Namespace: "oaicicd-core-for-fhi72"
-  CNPath: "/opt/oai-cn5g-fed-develop-2024-april-20897"
+  Namespace: "oaicicd-core-for-nvidia-aerial"
+  CNPath: "/opt/oai-cn5g-fed-develop-2025-jan"
   NetworkScript: echo "inet 172.21.6.105"
   RunIperf3Server: False
 

ci-scripts/cls_cluster.py

@@ -129,19 +129,9 @@ class Cluster:
 
 	def _recreate_entitlements(self):
 		# recreating entitlements, don't care if deletion fails
-		self.cmd.run('oc delete secret etc-pki-entitlement')
-		ret = self.cmd.run('ls /etc/pki/entitlement/???????????????????.pem | tail -1', silent=True)
-		regres1 = re.search(r"/etc/pki/entitlement/[0-9]+.pem", ret.stdout)
-		ret = self.cmd.run('ls /etc/pki/entitlement/???????????????????-key.pem | tail -1', silent=True)
-		regres2 = re.search(r"/etc/pki/entitlement/[0-9]+-key.pem", ret.stdout)
-		if regres1 is None or regres2 is None:
-			logging.error("could not find entitlements")
-			return False
-		file1 = regres1.group(0)
-		file2 = regres2.group(0)
-		ret = self.cmd.run(f'oc create secret generic etc-pki-entitlement --from-file {file1} --from-file {file2}')
-		regres = re.search(r"secret/etc-pki-entitlement created", ret.stdout)
-		if ret.returncode != 0 or regres is None:
+		self.cmd.run(f'oc delete secret etc-pki-entitlement')
+		ret = self.cmd.run(f"oc get secret etc-pki-entitlement -n openshift-config-managed -o json | jq 'del(.metadata.resourceVersion)' | jq 'del(.metadata.creationTimestamp)' | jq 'del(.metadata.uid)' | jq 'del(.metadata.namespace)' | oc create -f -", silent=True)
+		if ret.returncode != 0:
 			logging.error("could not create secret/etc-pki-entitlement")
 			return False
 		return True

ci-scripts/cls_physim1.py

@@ -137,9 +137,7 @@ class PhySim:
 			logging.debug(f'\u001B[1m   Now using project {ocProjectName}\u001B[0m')
 
 		# Using helm charts deployment
-		mySSH.command(f'grep -rl OAICICD_PROJECT ./charts/ | xargs sed -i -e "s#OAICICD_PROJECT#{ocProjectName}#"', '\$', 30)
-		mySSH.command(f'sed -i -e "s#TAG#{imageTag}#g" ./charts/physims/values.yaml', '\$', 6)
-		mySSH.command('helm install physim ./charts/physims/ --wait 2>&1 | tee -a cmake_targets/log/physim_helm_summary.txt', '\$', 30)
+		mySSH.command(f'helm install physim ./charts/physims/ --set global.image.version={imageTag} --wait 2>&1 | tee -a cmake_targets/log/physim_helm_summary.txt', '\$', 30)
 		if mySSH.getBefore().count('STATUS: deployed') == 0:
 			logging.error('\u001B[1m Deploying PhySim Failed using helm chart on OC Cluster\u001B[0m')
 			mySSH.command('helm uninstall physim | tee -a cmake_targets/log/physim_helm_summary.txt 2>&1', '\$', 30)

ci-scripts/xml_files/container_sa_fhi72_metanoia_up2_2x2.xml

@@ -53,11 +53,10 @@
   </testCase>
 
   <testCase id="110000">
-    <class>Pull_Cluster_Image</class>
-    <desc>Pull Images from Cluster</desc>
-    <oc_project>oaicicd-ran</oc_project>
+    <class>Pull_Local_Registry</class>
+    <desc>Pull Images from Local Registry</desc>
+    <svr_id>0</svr_id>
     <images>oai-gnb-fhi72</images>
-    <node>cacofonix</node>
   </testCase>
 
   <testCase id="800813">

openshift/README.md

@@ -49,11 +49,11 @@ will need `etc-pki-entitlement` inside the container image.
 To import `etc-pki-entitlement` in your project follow this
 [guide](https://docs.openshift.com/container-platform/4.14/cicd/builds/running-entitled-builds.html#builds-source-secrets-entitlements_running-entitled-builds)
 
-In case you have difficulties in following it then you can copy the
-certificates from an RHEL9 host
+You can do it as a kubeadmin/system admin user or you should have the rights 
+to read secrets from `openshift-config-managed` project
 
 ```bash
-oc create secret generic etc-pki-entitlement --from-file /etc/pki/entitlement/{NUMBER_ON_YOUR_COMPUTER}.pem --from-file /etc/pki/entitlement/{NUMBER_ON_YOUR_COMPUTER}-key.pem
+oc get secret etc-pki-entitlement -n openshift-config-managed -o json |   jq 'del(.metadata.resourceVersion)' | jq 'del(.metadata.creationTimestamp)' |   jq 'del(.metadata.uid)' | jq 'del(.metadata.namespace)' |   oc create -f -
 ```
 
 # 2. Build of `base` shared image

openshift/oai-clang-bc.yaml

@@ -19,15 +19,16 @@
 # *      contact@openairinterface.org
 # */
 #---------------------------------------------------------------------
-
+## Resource consumption 3Gi, 5CPU
 kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
   name: "oai-clang"
+  namespace: "oaicicd-ran"
 spec:
-    runPolicy: "Serial"
     nodeSelector:
-        kubernetes.io/hostname: demophon
+        node-role.kubernetes.io/fhi72-intel3: ""
+    runPolicy: "Serial"
     source:
         type: "Binary"
     strategy:

openshift/oai-enb-bc.yaml

@@ -25,6 +25,15 @@ apiVersion: build.openshift.io/v1
 metadata:
     name: "oai-enb"
 spec:
+    resources:
+      limits:
+        cpu: 2
+        memory: 2Gi
+      requests:
+        cpu: 0.5
+        memory: 1Gi
+    nodeSelector:
+        node-role.kubernetes.io/ran-build: ""
     runPolicy: "Serial"
     source:
         type: "Binary"

openshift/oai-gnb-aw2s-bc.yaml

@@ -24,7 +24,17 @@ kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
   name: "oai-gnb-aw2s"
+  namespace: "oaicicd-ran"
 spec:
+    resources:
+      limits:
+        cpu: 2
+        memory: 2Gi
+      requests:
+        cpu: 0.5
+        memory: 1Gi
+    nodeSelector:
+        node-role.kubernetes.io/fhi72: ""
     runPolicy: "Serial"
     source:
         type: "Binary"

openshift/oai-gnb-bc.yaml

@@ -24,7 +24,17 @@ kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
   name: "oai-gnb"
+  namespace: "oaicicd-ran"
 spec:
+    resources:
+      limits:
+        cpu: 2
+        memory: 2Gi
+      requests:
+        cpu: 0.5
+        memory: 1Gi
+    nodeSelector:
+        node-role.kubernetes.io/ran-build: ""
     runPolicy: "Serial"
     source:
         type: "Binary"

openshift/oai-gnb-fhi72-bc.yaml

@@ -24,7 +24,17 @@ kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
   name: "oai-gnb-fhi72"
+  namespace: "oaicicd-ran"
 spec:
+    resources:
+      limits:
+        cpu: 2
+        memory: 2Gi
+      requests:
+        cpu: 0.5
+        memory: 1Gi
+    nodeSelector:
+        node-role.kubernetes.io/fhi72: ""
     runPolicy: "Serial"
     source:
         type: "Binary"

openshift/oai-lte-ue-bc.yaml

@@ -24,7 +24,17 @@ kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
     name: "oai-lte-ue"
+    namespace: "oaicicd-ran"
 spec:
+    resources:
+      limits:
+        cpu: 2
+        memory: 2Gi
+      requests:
+        cpu: 0.5
+        memory: 1Gi
+    nodeSelector:
+        node-role.kubernetes.io/ran-base: ""
     runPolicy: "Serial"
     source:
         type: "Binary"

openshift/oai-nr-cuup-bc.yaml

@@ -25,6 +25,15 @@ apiVersion: build.openshift.io/v1
 metadata:
   name: "oai-nr-cuup"
 spec:
+    resources:
+      limits:
+        cpu: 1
+        memory: 2Gi
+      requests:
+        cpu: 0.5
+        memory: 1Gi
+    nodeSelector:
+        node-role.kubernetes.io/ran-build: ""
     runPolicy: "Serial"
     source:
         type: "Binary"

openshift/oai-nr-ue-bc.yaml

@@ -24,7 +24,17 @@ kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
     name: "oai-nr-ue"
+    namespace: "oaicicd-ran"
 spec:
+    resources:
+      limits:
+        cpu: 2
+        memory: 2Gi
+      requests:
+        cpu: 0.5
+        memory: 1Gi
+    nodeSelector:
+        node-role.kubernetes.io/fhi72-intel3: ""
     runPolicy: "Serial"
     source:
         type: "Binary"

openshift/oai-physim-bc.yaml

@@ -19,15 +19,17 @@
 # *      contact@openairinterface.org
 # */
 #---------------------------------------------------------------------
+### Resource consumption 12Gi, 19CPU (SMT ENABLED)
 
 kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
   name: "oai-physim"
+  namespace: "oaicicd-ran"
 spec:
     runPolicy: "Serial"
     nodeSelector:
-        kubernetes.io/hostname: demophon
+        node-role.kubernetes.io/ran-base: ""
     source:
         type: "Binary"
     strategy:

openshift/ran-base-bc.yaml

@@ -20,14 +20,16 @@
 # */
 #---------------------------------------------------------------------
 #
+### Resource consumption 16Gi, 10CPU
 kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
   name: "ran-base"
+  namespace: "oaicicd-ran"
 spec:
     runPolicy: "Serial"
     nodeSelector:
-        kubernetes.io/hostname: acamas
+        node-role.kubernetes.io/ran-base: ""
     source:
         type: "Binary"
         secrets:

openshift/ran-build-bc.yaml

@@ -20,14 +20,16 @@
 # */
 #---------------------------------------------------------------------
 #
+### Resource consumption 2.5Gi, 17CPU (SMT ENABLED)
 kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
   name: "ran-build"
+  namespace: "oaicicd-ran"
 spec:
     runPolicy: "Serial"
     nodeSelector:
-        kubernetes.io/hostname: acamas
+        node-role.kubernetes.io/ran-build: ""
     source:
         type: "Binary"
     strategy:

openshift/ran-build-fhi72-bc.yaml

@@ -20,14 +20,16 @@
 # */
 #---------------------------------------------------------------------
 #
+### Resource consumption 5Gi, 9CPU
 kind: BuildConfig
 apiVersion: build.openshift.io/v1
 metadata:
   name: "ran-build-fhi72"
+  namespace: "oaicicd-ran"
 spec:
     runPolicy: "Serial"
     nodeSelector:
-        kubernetes.io/hostname: demophon
+        node-role.kubernetes.io/fhi72: ""
     source:
         type: "Binary"
     strategy: