X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=ric_robot_suite%2Fhelm%2Fnanobot%2Ftemplates%2Fjob-ric-robot-run.yaml;h=c4768536aa69d342e1f605a636f1e084ff2303b5;hb=3d053f85cc9c42c57850780a18afb0eef425303c;hp=b1be7c747685942956d50c91c7c3231505f35f58;hpb=c5fa07bcd8cbd614bcd813cac698385b789bcfcb;p=it%2Ftest.git

diff --git a/ric_robot_suite/helm/nanobot/templates/job-ric-robot-run.yaml b/ric_robot_suite/helm/nanobot/templates/job-ric-robot-run.yaml
index b1be7c7..c476853 100644
--- a/ric_robot_suite/helm/nanobot/templates/job-ric-robot-run.yaml
+++ b/ric_robot_suite/helm/nanobot/templates/job-ric-robot-run.yaml
@@ -14,8 +14,8 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 */}}
-{{- $platformNamespace := default .Release.Namespace .Values.ric.platform.namespace }}
-{{- $xappNamespace := default $platformNamespace .Values.ric.xapp.namespace }}
+{{- $platformNamespace := include "common.namespace.platform" . }}
+{{- $xappNamespace := include "common.namespace.xapp" .  }}
 {{- $releaseName := default "ric-full" .Values.ric.platform.releaseName }}
 {{- $jobName :=  printf "%s-%s" .Release.Name $releaseName }}
 {{- $acctName := randAlpha 6 | lower | printf "%s-%s" $jobName }}
@@ -72,7 +72,7 @@ metadata:
   namespace: {{ $xappNamespace }}
 rules:
 - apiGroups: [""]
-  resources: ["pods", "services"]
+  resources: ["pods", "pods/log", "services"]
   verbs: ["get", "list"]
 - apiGroups: ["apps"]
   resources: ["deployments", "daemonsets", "replicasets", "statefulsets"]
@@ -103,10 +103,11 @@ metadata:
   name: {{ $jobName }}-ric-robot-run
   namespace: {{ .Release.Namespace }}
 spec:
+  backoffLimit:  {{ default 0 .Values.ric.robot.job.backoffLimit }}
   template:
     spec:
       serviceAccountName: {{ $serviceAccountName }}
-      restartPolicy: Never
+      restartPolicy: {{ default "Never" .Values.ric.robot.job.restartPolicy }}
       initContainers:
         - name: {{ $jobName }}-generate-robot-kubeconfig
           {{ with .Values.images.ric.robot.job.init }}
@@ -127,13 +128,15 @@ spec:
             - name: robot-etc
               mountPath: /robot/etc
               readOnly: false
+            {{- if .Values.ric.robot.log }}
             - name: robot-log
               mountPath: /robot/log
               readOnly: false
+            {{- end }}
             - name: robot-bin
               mountPath: /robot/bin
               readOnly: true
-      {{- $secrets := dict }}   
+      {{- $secrets := dict }}
       {{- range $index, $container := .Values.images.ric.robot.job }}
       {{- if index $container "repositoryCred" }}
       {{- $_ := set $secrets $container.repositoryCred (dict "name" $container.repositoryCred) }}
@@ -166,18 +169,35 @@ spec:
             {{- if not .Values.ric.robot.job.failOnTestFail }}
             - "--NoStatusRC"
             {{- end }}
+            {{- if .Values.ric.robot.log }}
             - "-d"
             - "/robot/log"
+            {{- else }}
+            - "-o"
+            - "NONE"
+            - "-l"
+            - "NONE"
+            - "-r"
+            - "NONE"
+            - "-L"
+            - "NONE"
+            {{- end }}
             - "--console"
             - "verbose"
             - "-C"
             - "off"
-            {{- if .Values.ric.robot.tags }}
-            {{- range .Values.ric.robot.tags }}
+            {{- if .Values.ric.robot.tags.enabled }}
+            {{- range .Values.ric.robot.tags.enabled }}
             - "-i"
             - "{{.}}"
             {{- end }}
             {{- end }}
+            {{- if .Values.ric.robot.tags.disabled }}
+            {{- range .Values.ric.robot.tags.disabled }}
+            - "-e"
+            - "{{.}}"
+            {{- end }}
+            {{- end }}
             {{- if .Values.ric.robot.testsuites }}
             {{- range .Values.ric.robot.testsuites }}
             - "/robot/testsuites/{{.}}.robot"
@@ -192,20 +212,35 @@ spec:
             - name: robot-etc
               mountPath: /robot/etc
               readOnly: true
+            {{- if .Values.ric.robot.log }}
             - name: robot-log
               mountPath: /robot/log
               readOnly: false
+            {{- end }}
+            # for compatability with the ric robot, we mount
+            # both properties files and interface libraries
+            # under resources/.
+{{- range $map, $ignore := $.Files.Glob "configmap-src/*/properties/*.robot" }}
             - name: robot-properties
-              mountPath: /robot/resources/global_properties.robot
-              subPath: global_properties.robot
+              mountPath: /robot/resources/{{ base $map }}
+              subPath: {{ base $map }}
+              readOnly: true
+{{- end }}
+{{- range $map, $ignore := $.Files.Glob "configmap-src/*/resources/*.robot" }}
+            - name: robot-resources
+              mountPath: /robot/resources/{{ base $map }}
+              subPath: {{ base $map }}
               readOnly: true
+{{- end }}
       volumes:
         - name: robot-etc
           emptyDir: {}
         - name: robot-log
+        {{- if .Values.ric.robot.log }}
           hostPath:
            path: {{ default "/opt/ric/robot/log"  .Values.ric.robot.log }}
            type: DirectoryOrCreate
+        {{- end }}
         - name: robot-bin
           configMap:
            name: robot-bin
@@ -218,3 +253,7 @@ spec:
           configMap:
            name: robot-properties
            defaultMode: 0644
+        - name: robot-resources
+          configMap:
+           name: robot-resources
+           defaultMode: 0644