Refine chart tests

stackhpc · Oct 29, 2024 · ae52dc9 · ae52dc9
1 parent 9a099be
commit ae52dc9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/chart/templates/test/end-to-end.yml b/chart/templates/test/end-to-end.yml
@@ -1,4 +1,4 @@
-{{- if .Values.api.enabled -}}
+{{- if and .Values.ui.enabled .Values.api.enabled -}}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -15,7 +15,11 @@ spec:
         command:
         - python
         - gradio-client-test.py
+        {{- if .Values.ingress.ui.enabled }}
+        - {{ .Values.ingress.host }}{{ .Values.ingress.ui.path }}
+        {{- else }}
         - http://{{ .Values.ui.service.name }}.{{ .Release.Namespace }}.svc
+        {{- end }}
       restartPolicy: Never
   # Allow plenty of retries since downloading
   # model weights can take a long time.

diff --git a/chart/templates/test/web-app.yml b/chart/templates/test/web-app.yml
@@ -1,4 +1,4 @@
-{{- if not .Values.api.enabled -}}
+{{- if and .Values.ui.enabled (not .Values.api.enabled) -}}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -15,7 +15,11 @@ spec:
         command:
         - nc
         - -vz
+        {{- if .Values.ingress.ui.enabled }}
+        - {{ .Values.ingress.host | trimPrefix 'http://' | trimPrefix 'https://' }}{{ .Values.ingress.ui.path }}
+        {{- else }}
         - {{ .Values.ui.service.name }}.{{ .Release.Namespace }}.svc
+        {{- end }}
         - "80"
       restartPolicy: Never
   backoffLimit: 3