Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Pipelines upgrade test (backport to 2.14.0) #1972

Open
wants to merge 1 commit into
base: releases/2.14.0
Choose a base branch
from
Open

Fix Pipelines upgrade test (backport to 2.14.0) #1972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions ods_ci/libs/DataSciencePipelinesKfp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,22 @@ def check_run_status(self, run_id, timeout=160):
count += 1
return run_status # pyright: ignore [reportPossiblyUnboundVariable]

@keyword
def get_last_run_by_pipeline_name(self, pipeline_name: str | None = None, namespace: str | None = None):
"""
Gets run_id of the last run created for pipeline_name
:param pipeline_name:
:param namespace:
:return:
run_id
"""
pipeline_id = self.client.get_pipeline_id(pipeline_name)
pipeline_version_id = self.get_last_pipeline_version(pipeline_id)
all_runs = self.get_all_runs(namespace=namespace, pipeline_version_id=pipeline_version_id)
if len(all_runs) > 0:
return all_runs[-1].run_id
return None

@keyword
def delete_pipeline(self, pipeline_id):
"""Deletes a pipeline"""
Expand Down
11 changes: 9 additions & 2 deletions ods_ci/tests/Resources/CLI/DataSciencePipelines/DataSciencePipelinesBackend.resource
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ Wait Until Pipeline Server Is Deployed
... Verify DSPv1 Pipeline Server Deployments namespace=${namespace}
END


Wait Until Pipeline Server Is Deleted
[Documentation] Waits until all pipeline server pods are deleted
[Arguments] ${namespace}
Expand All @@ -187,7 +186,6 @@ Create Secret With Pipelines Object Storage Information
Run And Verify Command oc create secret generic dashboard-dspa-secret -n ${namespace} --from-literal=AWS_ACCESS_KEY_ID=${object_storage_access_key} --from-literal=AWS_SECRET_ACCESS_KEY=${object_storage_secret_key} # robocop: off=line-too-long
Run And Verify Command oc label secret dashboard-dspa-secret -n ${namespace} opendatahub.io/dashboard=true


Import Pipeline And Create Run
[Documentation]
[Arguments] ${namespace} ${username} ${password}
Expand Down Expand Up @@ -215,6 +213,15 @@ Import Pipeline And Create Run

RETURN ${pipeline_id} ${pipeline_version_id} ${pipeline_run_id} ${experiment_id}

Get Last Run By Pipeline Name
[Documentation] Returns ${pipeline_run_id} of the last run for the last version of ${pipeline_name}
[Arguments] ${namespace} ${username} ${password} ${pipeline_name}

DataSciencePipelinesKfp.Setup Client user=${username} pwd=${password} project=${namespace}
${pipeline_run_id}= DataSciencePipelinesKfp.Get Last Run By Pipeline Name pipeline_name=${pipeline_name}

RETURN ${pipeline_run_id}

Verify Run Status
[Documentation] Verifies pipeline run status matches ${pipeline_run_expected_status}
[Arguments] ${namespace} ${username} ${password}
Expand Down
10 changes: 6 additions & 4 deletions ods_ci/tests/Resources/CLI/DataSciencePipelines/DataSciencePipelinesUpgradeTesting.resource
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Resource ../../../Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/


*** Variables ***
${PROJECT}= dsp-upgrade-testing
${PROJECT}= upg-dsp
${PIPELINE_LONGRUNNING_FILEPATH}= tests/Resources/Files/pipeline-samples/v2/cache-disabled/pip_index_url/take_nap_compiled.yaml # robocop: disable:line-too-long


Expand All @@ -24,9 +24,13 @@ Verify Resources After Upgrade

DataSciencePipelinesBackend.Wait Until Pipeline Server Is Deployed namespace=${PROJECT}

${take_nap_run_id}= DataSciencePipelinesBackend.Get Last Run By Pipeline Name
... namespace=${PROJECT} username=${TEST_USER.USERNAME} password=${TEST_USER.PASSWORD}
... pipeline_name=take-nap

Verify Run Status
... namespace=${PROJECT} username=${TEST_USER.USERNAME} password=${TEST_USER.PASSWORD}
... pipeline_run_id=${DSP_LONGRUNNING_PIPELINE_RUN_ID} pipeline_run_expected_status=RUNNING
... pipeline_run_id=${take_nap_run_id} pipeline_run_expected_status=RUNNING

Projects.Delete Project Via CLI By Display Name ${PROJECT}

Expand Down Expand Up @@ -60,5 +64,3 @@ Start Long Running Pipeline
... pipeline_package_path=${PIPELINE_LONGRUNNING_FILEPATH}
... pipeline_run_name=take-nap-run
... pipeline_run_params=${pipeline_run_params}

Set Global Variable ${DSP_LONGRUNNING_PIPELINE_RUN_ID} ${pipeline_run_id}
Loading