From f6b8351e29ee058102ff0f0944bce8680495628d Mon Sep 17 00:00:00 2001
From: Mohammed Ismail <mohammed.ismail@openairinterface.org>
Date: Tue, 20 Apr 2021 11:31:04 +0200
Subject: [PATCH] CI: fix on the tag
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
---
.../charts/dlsim/templates/deployment.yaml | 2 +-
.../charts/ldpctest/templates/deployment.yaml | 2 +-
.../nr-dlschsim/templates/deployment.yaml | 2 +-
.../charts/nr-dlsim/templates/deployment.yaml | 2 +-
.../nr-pbchsim/templates/deployment.yaml | 2 +-
.../nr-prachsim/templates/deployment.yaml | 2 +-
.../nr-pucchsim/templates/deployment.yaml | 2 +-
.../nr-ulschsim/templates/deployment.yaml | 2 +-
.../charts/nr-ulsim/templates/deployment.yaml | 2 +-
.../polartest/templates/deployment.yaml | 2 +-
.../smallblocktest/templates/deployment.yaml | 2 +-
.../charts/ulsim/templates/deployment.yaml | 2 +-
charts/physims/values.yaml | 76 +------------------
ci-scripts/cls_physim1.py | 1 +
14 files changed, 16 insertions(+), 85 deletions(-)
diff --git a/charts/physims/charts/dlsim/templates/deployment.yaml b/charts/physims/charts/dlsim/templates/deployment.yaml
index a8ec990e9df..9cbdd383b35 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 be4306eb4f7..ef30d9c08ad 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 a07b8ecfd41..23c3699c254 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 3d5b495d40b..4c38664e61b 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 abcf9a6ba6e..551785abc0d 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 9edcc25b7cc..52bc030c459 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 0709577ab43..d783991e0b4 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 626ff9305b7..56fb0de5b87 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 ca9c3fbd500..c0fa5ceb3b1 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 61bf705a02a..01a6efc815b 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 84fcaf41b6d..3439c2597ed 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 fbe68205420..e8c90dabc18 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 c5175cb4c0e..b348e822bb0 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 9e8d3d06135..c7bf119f85a 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')
--
GitLab