diff --git a/charts/physims/charts/dlsim/templates/deployment.yaml b/charts/physims/charts/dlsim/templates/deployment.yaml
index a8ec990e9df9c68e8a5c3c4a8e0a8843aa8521c0..9cbdd383b35dcc1f19e7a0c02ccd6db658dda2ea 100644
--- a/charts/physims/charts/dlsim/templates/deployment.yaml
+++ b/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 }}
diff --git a/charts/physims/charts/ldpctest/templates/deployment.yaml b/charts/physims/charts/ldpctest/templates/deployment.yaml
index be4306eb4f7bc578f4e1d0d9b3e7debc441eed28..ef30d9c08ad335dc4611d5798ae3edac560dbac6 100644
--- a/charts/physims/charts/ldpctest/templates/deployment.yaml
+++ b/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 }}
diff --git a/charts/physims/charts/nr-dlschsim/templates/deployment.yaml b/charts/physims/charts/nr-dlschsim/templates/deployment.yaml
index a07b8ecfd41513a4d8c02d4c4f1442782b4b510c..23c3699c254cec67a8b1a100a53a0c9e0b72817d 100644
--- a/charts/physims/charts/nr-dlschsim/templates/deployment.yaml
+++ b/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 }}
diff --git a/charts/physims/charts/nr-dlsim/templates/deployment.yaml b/charts/physims/charts/nr-dlsim/templates/deployment.yaml
index 3d5b495d40be0cfc4036347a025bafd2bee05c6c..4c38664e61b14c8a473f1193b5686725a93089bc 100644
--- a/charts/physims/charts/nr-dlsim/templates/deployment.yaml
+++ b/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 }}
diff --git a/charts/physims/charts/nr-pbchsim/templates/deployment.yaml b/charts/physims/charts/nr-pbchsim/templates/deployment.yaml
index abcf9a6ba6e9213bf48b5cb03c368561582ac12f..551785abc0ddf08998599cef769a34ccc09f93f4 100644
--- a/charts/physims/charts/nr-pbchsim/templates/deployment.yaml
+++ b/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 }}
diff --git a/charts/physims/charts/nr-prachsim/templates/deployment.yaml b/charts/physims/charts/nr-prachsim/templates/deployment.yaml
index 9edcc25b7ccd67c8edbb11351b283619227c0d2b..52bc030c4591ba8ed74d424021cd91406087c5de 100644
--- a/charts/physims/charts/nr-prachsim/templates/deployment.yaml
+++ b/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 }}
diff --git a/charts/physims/charts/nr-pucchsim/templates/deployment.yaml b/charts/physims/charts/nr-pucchsim/templates/deployment.yaml
index 0709577ab4318d25070d7105b63a2c2cb3a35640..d783991e0b4a3f572b82ca2665c8443cd4465dde 100644
--- a/charts/physims/charts/nr-pucchsim/templates/deployment.yaml
+++ b/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 }}
diff --git a/charts/physims/charts/nr-ulschsim/templates/deployment.yaml b/charts/physims/charts/nr-ulschsim/templates/deployment.yaml
index 626ff9305b735ec27cbbdfc34568507ed73a1b5c..56fb0de5b878954ca95179d0c49a60d10a0af102 100644
--- a/charts/physims/charts/nr-ulschsim/templates/deployment.yaml
+++ b/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 }}
diff --git a/charts/physims/charts/nr-ulsim/templates/deployment.yaml b/charts/physims/charts/nr-ulsim/templates/deployment.yaml
index ca9c3fbd5000b1a0926460ed73b0fbeac500d2d2..c0fa5ceb3b1b28c578c4cf6b1be3623574b15a68 100644
--- a/charts/physims/charts/nr-ulsim/templates/deployment.yaml
+++ b/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 }}
diff --git a/charts/physims/charts/polartest/templates/deployment.yaml b/charts/physims/charts/polartest/templates/deployment.yaml
index 61bf705a02a82888e4f4598bb097c2d3d1dbc358..01a6efc815b7cba88f777b4fc0c495960845f582 100644
--- a/charts/physims/charts/polartest/templates/deployment.yaml
+++ b/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 }}
diff --git a/charts/physims/charts/smallblocktest/templates/deployment.yaml b/charts/physims/charts/smallblocktest/templates/deployment.yaml
index 84fcaf41b6df6581a501e405a62011cd935889a2..3439c2597ed787be2d53102c8ce4c719314fddeb 100644
--- a/charts/physims/charts/smallblocktest/templates/deployment.yaml
+++ b/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 }}
diff --git a/charts/physims/charts/ulsim/templates/deployment.yaml b/charts/physims/charts/ulsim/templates/deployment.yaml
index fbe68205420a622ed2c455b80aa510c8c87f5493..e8c90dabc1857c673d8a6a51d8c1da40d799ea2d 100644
--- a/charts/physims/charts/ulsim/templates/deployment.yaml
+++ b/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 }}
diff --git a/charts/physims/values.yaml b/charts/physims/values.yaml
index c5175cb4c0e968172a8bd53e081af3c2c9ae374f..b348e822bb0e2e64ed7ae2f2c1c6e737f0afd5ec 100644
--- a/charts/physims/values.yaml
+++ b/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
diff --git a/ci-scripts/cls_physim1.py b/ci-scripts/cls_physim1.py
index 9e8d3d06135b04e62c3d673278430493a00a556c..c7bf119f85a58bae9e8b69692017f8db49ab6db7 100644
--- a/ci-scripts/cls_physim1.py
+++ b/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')