feat(test): made platform tests usable for all environments, adding c…

…onfiguration options
scc-digitalhub · Jan 9, 2025 · 39a164b · 39a164b
1 parent 2a566f1
commit 39a164b
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 23 deletions.
diff --git a/charts/digitalhub/confs/tests/init-python-script.sh b/charts/digitalhub/confs/tests/init-python-script.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 cp home/src/$TEST_SCRIPT home/git/digitalhub-tutorials/$TEST_FOLDER/$TEST_SCRIPT
 cd home/git/digitalhub-tutorials/$TEST_FOLDER
-pip install --cache-dir home/pipcache digitalhub[full] digitalhub-runtime-python digitalhub-runtime-container digitalhub-runtime-dbt digitalhub-runtime-kfp digitalhub-runtime-modelserve requests-oauthlib
+{{- include "digitalhub.testPackages" . }}
 python $TEST_SCRIPT
diff --git a/charts/digitalhub/confs/tests/python-test/s1-etl.py b/charts/digitalhub/confs/tests/python-test/s1-etl.py
@@ -37,10 +37,9 @@ def main():
         # Get Core Token
         client_id = os.getenv("CORE_CLIENT_ID")
         client_secret = os.getenv("CORE_CLIENT_SECRET")
-        scope = 'tenant1-core'
         client = BackendApplicationClient(client_id=client_id)
-        oauth = OAuth2Session(client=client, scope=scope)
-        token = oauth.fetch_token(token_url='https://core.tenant1.digitalhub-dev.smartcommunitylab.it/auth/token', client_id=client_id, client_secret=client_secret, scope=scope)
+        oauth = OAuth2Session(client=client)
+        token = oauth.fetch_token(token_url='http://{{ include "core.fullname" .Subcharts.core }}:{{ .Subcharts.core.Values.service.port }}/auth/token', client_id=client_id, client_secret=client_secret)
         os.environ["DHCORE_ACCESS_TOKEN"] = token["access_token"]
 
     # Load project

diff --git a/charts/digitalhub/confs/tests/python-test/s2-dbt.py b/charts/digitalhub/confs/tests/python-test/s2-dbt.py
@@ -37,10 +37,9 @@ def main():
         # Get Core Token
         client_id = os.getenv("CORE_CLIENT_ID")
         client_secret = os.getenv("CORE_CLIENT_SECRET")
-        scope = 'tenant1-core'
         client = BackendApplicationClient(client_id=client_id)
-        oauth = OAuth2Session(client=client, scope=scope)
-        token = oauth.fetch_token(token_url='https://core.tenant1.digitalhub-dev.smartcommunitylab.it/auth/token', client_id=client_id, client_secret=client_secret, scope=scope)
+        oauth = OAuth2Session(client=client)
+        token = oauth.fetch_token(token_url='http://{{ include "core.fullname" .Subcharts.core }}:{{ .Subcharts.core.Values.service.port }}/auth/token', client_id=client_id, client_secret=client_secret)
         os.environ["DHCORE_ACCESS_TOKEN"] = token["access_token"]
 
     # Load project

diff --git a/charts/digitalhub/confs/tests/python-test/s3-scikit-learn.py b/charts/digitalhub/confs/tests/python-test/s3-scikit-learn.py
@@ -37,10 +37,9 @@ def main():
         # Get Core Token
         client_id = os.getenv("CORE_CLIENT_ID")
         client_secret = os.getenv("CORE_CLIENT_SECRET")
-        scope = 'tenant1-core'
         client = BackendApplicationClient(client_id=client_id)
-        oauth = OAuth2Session(client=client, scope=scope)
-        token = oauth.fetch_token(token_url='https://core.tenant1.digitalhub-dev.smartcommunitylab.it/auth/token', client_id=client_id, client_secret=client_secret, scope=scope)
+        oauth = OAuth2Session(client=client)
+        token = oauth.fetch_token(token_url='http://{{ include "core.fullname" .Subcharts.core }}:{{ .Subcharts.core.Values.service.port }}/auth/token', client_id=client_id, client_secret=client_secret)
         os.environ["DHCORE_ACCESS_TOKEN"] = token["access_token"]
 
     # Load project

diff --git a/charts/digitalhub/templates/_helpers.tpl b/charts/digitalhub/templates/_helpers.tpl
@@ -114,3 +114,19 @@ false
 {{- end }}
 {{- end }}
 
+{{/*
+Set packages versions for tests
+*/}}
+{{- define "digitalhub.testPackages" -}}
+{{- $command := "pip install --cache-dir home/pipcache" -}}
+{{- range $package := .Values.platformTests.packages -}}
+{{- $command = printf "%s %s" $command $package.name }}
+{{- if $package.tag -}}
+{{- $command = printf "%s==%s" $command $package.tag }}
+{{- end -}}
+{{- end }}
+{{- $command = printf "%s %s" $command "requests-oauthlib" }}
+{{ $command }}
+{{- end }}
+
+
diff --git a/charts/digitalhub/templates/tests/dhub-test/test-configmap.yaml b/charts/digitalhub/templates/tests/dhub-test/test-configmap.yaml
@@ -6,7 +6,7 @@ data:
 {{- $files := .Files }}
 {{- range $key, $value := .Files }}
 {{- if hasPrefix "confs/tests/python-test/" $key }}
-  {{ $key | trimPrefix "confs/tests/python-test/" }}: {{ $files.Get $key | quote }}
+  {{ $key | trimPrefix "confs/tests/python-test/" }}: {{ tpl ($files.Get $key) $ | quote }}
 {{- end }}
 {{- end }}
 ---
@@ -15,4 +15,4 @@ kind: ConfigMap
 metadata:
   name: {{ include "digitalhub.fullname" . }}-python-script-test
 data:
-{{ (.Files.Glob "confs/tests/init-python-script.sh").AsConfig | indent 2 }}
+  init-python-script.sh: {{ tpl ( .Files.Get "confs/tests/init-python-script.sh") $ | quote }}
diff --git a/charts/digitalhub/templates/tests/python-test.yaml b/charts/digitalhub/templates/tests/python-test.yaml
@@ -26,7 +26,7 @@ spec:
             runAsUser: 0
       containers:
         - name: python
-          image: python:3.10-slim
+          image: "{{ $.Values.platformTests.image | default "python" }}:{{ $.Values.platformTests.tag | default "3.10-slim" }}"
           command: ['sh', './home/scripts/init-python-script.sh']
           volumeMounts:
             - name: test-volume
@@ -40,20 +40,12 @@ spec:
               mountPath: /home/git
               readOnly: false
           env:
-            - name: "POSTGRES_USER"
-              valueFrom:
-                secretKeyRef:
-                  name: "digitalhub-owner-user.database-postgres-cluster.credentials.postgresql.acid.zalan.do"
-                  key: "username"
-            - name: "POSTGRES_PASSWORD"
-              valueFrom:
-                secretKeyRef:
-                  name: "digitalhub-owner-user.database-postgres-cluster.credentials.postgresql.acid.zalan.do"
-                  key: "password"
             - name: TEST_SCRIPT
               value: {{ $key | trimPrefix "confs/tests/python-test/" }}
             - name: TEST_FOLDER
               value: {{ $key | trimPrefix "confs/tests/python-test/" | trimSuffix ".py" }}
+            - name: OAUTHLIB_INSECURE_TRANSPORT
+              value: "True"
             {{- if $.Values.core.authentication.openId.enabled }}
             - name: "CORE_CLIENT_ID"
               valueFrom:

diff --git a/charts/digitalhub/values.yaml b/charts/digitalhub/values.yaml
@@ -549,3 +549,20 @@ kubeflow-pipelines:
     endpointPort: *minioEndpointPort
     bucket: *kfpBucket
     protocol: *minioProtocol
+
+platformTests:
+  image: ""
+  tag: ""
+  packages:
+  - name: "digitalhub[full]"
+    tag: ""
+  - name: "digitalhub-runtime-python"
+    tag: ""
+  - name: "digitalhub-runtime-container"
+    tag: ""
+  - name: "digitalhub-runtime-dbt"
+    tag: ""
+  - name: "digitalhub-runtime-kfp"
+    tag: ""
+  - name: "digitalhub-runtime-modelserve"
+    tag: ""