CI: fix on the tag

Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>

charts/physims/charts/dlsim/templates/deployment.yaml

@@ -24,7 +24,7 @@ spec:
     {{- end }}
       containers:
       - name: physim
-        image: "{{ .Values.image.repository }}:{{ .Values.image.version }}"
+        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}

charts/physims/charts/ldpctest/templates/deployment.yaml

@@ -24,7 +24,7 @@ spec:
     {{- end }}
       containers:
       - name: physim
-        image: "{{ .Values.image.repository }}:{{ .Values.image.version }}"
+        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}

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

@@ -24,7 +24,7 @@ spec:
     {{- end }}
       containers:
       - name: physim
-        image: "{{ .Values.image.repository }}:{{ .Values.image.version }}"
+        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}

charts/physims/charts/nr-dlsim/templates/deployment.yaml

@@ -24,7 +24,7 @@ spec:
     {{- end }}
       containers:
       - name: physim
-        image: "{{ .Values.image.repository }}:{{ .Values.image.version }}"
+        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}

charts/physims/charts/nr-pbchsim/templates/deployment.yaml

@@ -24,7 +24,7 @@ spec:
     {{- end }}
       containers:
       - name: physim
-        image: "{{ .Values.image.repository }}:{{ .Values.image.version }}"
+        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}

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

@@ -24,7 +24,7 @@ spec:
     {{- end }}
       containers:
       - name: physim
-        image: "{{ .Values.image.repository }}:{{ .Values.image.version }}"
+        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}

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

@@ -24,7 +24,7 @@ spec:
     {{- end }}
       containers:
       - name: physim
-        image: "{{ .Values.image.repository }}:{{ .Values.image.version }}"
+        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}

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

@@ -24,7 +24,7 @@ spec:
     {{- end }}
       containers:
       - name: physim
-        image: "{{ .Values.image.repository }}:{{ .Values.image.version }}"
+        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}

charts/physims/charts/nr-ulsim/templates/deployment.yaml

@@ -24,7 +24,7 @@ spec:
     {{- end }}
       containers:
       - name: physim
-        image: "{{ .Values.image.repository }}:{{ .Values.image.version }}"
+        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}

charts/physims/charts/polartest/templates/deployment.yaml

@@ -24,7 +24,7 @@ spec:
     {{- end }}
       containers:
       - name: physim
-        image: "{{ .Values.image.repository }}:{{ .Values.image.version }}"
+        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}

charts/physims/charts/smallblocktest/templates/deployment.yaml

@@ -24,7 +24,7 @@ spec:
     {{- end }}
       containers:
       - name: physim
-        image: "{{ .Values.image.repository }}:{{ .Values.image.version }}"
+        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}

charts/physims/charts/ulsim/templates/deployment.yaml

@@ -24,7 +24,7 @@ spec:
     {{- end }}
       containers:
       - name: physim
-        image: "{{ .Values.image.repository }}:{{ .Values.image.version }}"
+        image: "{{ .Values.global.image.repository }}:{{ .Values.global.image.version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}

charts/physims/values.yaml

@@ -5,150 +5,80 @@
 global:
   serviceAccountName: oai-physim-sa
   namespace: "oaicicd-ran-tmp"
-
+  image:
+    repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
+    version: TAG
 
 ## Declaring values specific to coressponding physim to overwrite
 
 dlsim:
   replicaCount: 1
-  image:
-    registry: local
-    repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
-    version: temp
-    # pullPolicy: IfNotPresent or Never or Always
-    pullPolicy: Always
   service:
     type: ClusterIP
     port: 80
 
 ulsim:
   replicaCount: 1
-  image:
-    registry: local
-    repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
-    version: temp
-    # pullPolicy: IfNotPresent or Never or Always
-    pullPolicy: Always
   service:
     type: ClusterIP
     port: 80
 
 ldpctest:
   replicaCount: 1
-  image:
-    registry: local
-    repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
-    version: temp
-    # pullPolicy: IfNotPresent or Never or Always
-    pullPolicy: Always
   service:
     type: ClusterIP
     port: 80
 
 polartest:
   replicaCount: 1
-  image:
-    registry: local
-    repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
-    version: temp
-    # pullPolicy: IfNotPresent or Never or Always
-    pullPolicy: Always
   service:
     type: ClusterIP
     port: 80
 
 nr-pbchsim:
   replicaCount: 1
-  image:
-    registry: local
-    repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
-    version: temp
-    # pullPolicy: IfNotPresent or Never or Always
-    pullPolicy: Always
   service:
     type: ClusterIP
     port: 80
 
 nr-dlsim:
   replicaCount: 1
-  image:
-    registry: local
-    repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
-    version: temp
-    # pullPolicy: IfNotPresent or Never or Always
-    pullPolicy: Always
   service:
     type: ClusterIP
     port: 80
 
 nr-dlschsim:
   replicaCount: 1
-  image:
-    registry: local
-    repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
-    version: temp
-    # pullPolicy: IfNotPresent or Never or Always
-    pullPolicy: Always
   service:
     type: ClusterIP
     port: 80
 
 smallblocktest:
   replicaCount: 1
-  image:
-    registry: local
-    repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
-    version: temp
-    # pullPolicy: IfNotPresent or Never or Always
-    pullPolicy: Always
   service:
     type: ClusterIP
     port: 80
 
 nr-ulschsim:
   replicaCount: 1
-  image:
-    registry: local
-    repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
-    version: temp
-    # pullPolicy: IfNotPresent or Never or Always
-    pullPolicy: Always
   service:
     type: ClusterIP
     port: 80
 
 nr-pucchsim:
   replicaCount: 1
-  image:
-    registry: local
-    repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
-    version: temp
-    # pullPolicy: IfNotPresent or Never or Always
-    pullPolicy: Always
   service:
     type: ClusterIP
     port: 80
 
 nr-ulsim:
   replicaCount: 1
-  image:
-    registry: local
-    repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
-    version: temp
-    # pullPolicy: IfNotPresent or Never or Always
-    pullPolicy: Always
   service:
     type: ClusterIP
     port: 80
 
 nr-prachsim:
   replicaCount: 1
-  image:
-    registry: local
-    repository: image-registry.openshift-image-registry.svc:5000/oaicicd-ran-tmp/oai-physim
-    version: temp
-    # pullPolicy: IfNotPresent or Never or Always
-    pullPolicy: Always
   service:
     type: ClusterIP
     port: 80

ci-scripts/cls_physim1.py

@@ -171,6 +171,7 @@ class PhySim:
 			logging.debug('\u001B[1m Image "oai-physim" push to OC Cluster Registry Successfully\u001B[0m')
 
 		# Using helm charts deployment
+		mySSH.command(f'sed -i -e "s#TAG#{imageTag}#g" ./charts/physims/values.yaml', '\$', 6)
 		mySSH.command('helm install physim ./charts/physims/ | tee -a cmake_targets/log/physim_helm_summary.txt 2>&1', '\$', 6)
 		if mySSH.getBefore().count('STATUS: deployed') == 0:
 			logging.error('\u001B[1m Deploying PhySim Failed using helm chart on OC Cluster\u001B[0m')