test(digitalhub): aligned tests for the 0.9 version with Argo Workflow

scc-digitalhub · Dec 5, 2024 · 9a437b0 · 9a437b0
1 parent 7be1d52
commit 9a437b0
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/charts/digitalhub/confs/tests/python-test/s1-etl.py b/charts/digitalhub/confs/tests/python-test/s1-etl.py
@@ -43,11 +43,16 @@ def main():
         os.environ["DHCORE_ACCESS_TOKEN"] = token["access_token"]
 
     # Load project
-    proj = dh.import_project("project-etl-ci.yml")
+    try:
+      proj = dh.import_project("projects-project-etl.yaml")
+    except:
+      proj = dh.load_project("projects-project-etl.yaml")
 
     URL = "https://opendata.comune.bologna.it/api/explore/v2.1/catalog/datasets/rilevazione-flusso-veicoli-tramite-spire-anno-2023/exports/csv?lang=it&timezone=Europe%2FRome&use_labels=true&delimiter=%3B"
     di= proj.new_dataitem(name="url_data_item",kind="table",path=URL)
-    workflow_run = proj.run('pipeline', parameters={"url": di.key})
+
+    proj.run('pipeline', action="build")
+    workflow_run = proj.run('pipeline', action="pipeline", parameters={"url": di.key})
 
     # Wait for run to finish
     poller(workflow_run)

diff --git a/charts/digitalhub/confs/tests/python-test/s2-dbt.py b/charts/digitalhub/confs/tests/python-test/s2-dbt.py
@@ -43,11 +43,16 @@ def main():
         os.environ["DHCORE_ACCESS_TOKEN"] = token["access_token"]
 
     # Load project
-    proj = dh.import_project("project-dbt-ci.yml")
+    try:
+      proj = dh.import_project("projects-project-dbt-ci.yaml")
+    except:
+      proj = dh.load_project("projects-project-dbt-ci.yaml")
 
     url = "https://gist.githubusercontent.com/kevin336/acbb2271e66c10a5b73aacf82ca82784/raw/e38afe62e088394d61ed30884dd50a6826eee0a8/employees.csv"
     di_url = proj.new_dataitem(name="url_data_item",kind="table",path=url)
-    workflow_run = proj.run('pipeline_dbt', parameters={"url": di_url.key})
+
+    proj.run('pipeline_dbt', action="build")
+    workflow_run = proj.run('pipeline_dbt', action="pipeline", parameters={"di": di_url.key})
 
     # Wait for run to finish
     poller(workflow_run)

diff --git a/charts/digitalhub/confs/tests/python-test/s3-scikit-learn.py b/charts/digitalhub/confs/tests/python-test/s3-scikit-learn.py
@@ -43,9 +43,13 @@ def main():
         os.environ["DHCORE_ACCESS_TOKEN"] = token["access_token"]
 
     # Load project
-    proj = dh.import_project("project-ml-ci.yml")
+    try:
+      proj = dh.import_project("projects-project-ml-ci.yaml")
+    except:
+      proj = dh.load_project("projects-project-ml-ci.yaml")
 
-    workflow_run = proj.run('pipeline_ml')
+    proj.run('pipeline_ml', action="build")
+    workflow_run = proj.run('pipeline_ml', action="pipeline")
 
     # Wait for run to finish
     poller(workflow_run)

diff --git a/charts/digitalhub/templates/_helpers.tpl b/charts/digitalhub/templates/_helpers.tpl
@@ -118,7 +118,12 @@ false
 Set packages versions for tests
 */}}
 {{- define "digitalhub.testPackages" -}}
-{{- $command := "pip install --cache-dir home/pipcache" -}}
+{{- $command := "" -}}
+{{- if .Values.platformTests.preRelease -}}
+{{- $command = "pip install --pre --cache-dir home/pipcache" -}}
+{{- else -}}
+{{- $command = "pip install --cache-dir home/pipcache" -}}
+{{- end -}}
 {{- range $package := .Values.platformTests.packages -}}
 {{- $command = printf "%s %s" $command $package.name }}
 {{- if $package.tag -}}