Skip to content

Commit

Permalink
Merge branch 'master' into rm_deprovision_on_failure
Browse files Browse the repository at this point in the history
  • Loading branch information
bdattoma authored Oct 15, 2024
2 parents 0dc83a8 + f49726c commit 863f360
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,6 @@ Verify Installed Labextension Version
Check Versions In JupyterLab
[Arguments] ${libraries-to-check}
${return_status} = Set Variable PASS
@{packages} = Create List Python Boto3 Kafka-Python Matplotlib Scikit-learn Pandas Scipy Numpy
FOR ${libString} IN @{libraries-to-check}
# libString = LibName vX.Y -> libDetail= [libName, X.Y]
@{libDetail} = Split String ${libString} ${SPACE}v
Expand Down Expand Up @@ -531,12 +530,18 @@ Check Versions In JupyterLab
${return_status} = Set Variable FAIL
END
END

# Now check that selected list of packages has same version among all the images.
@{packages} = Create List Python Boto3 Kafka-Python Scipy

Continue For Loop If "${libDetail}[0]" not in ${packages}
IF "${libDetail}[0]" not in ${package_versions}
... Set To Dictionary ${package_versions} ${libDetail}[0]=${libDetail}[1]
IF "${package_versions["${libDetail}[0]"]}" != "${libDetail}[1]"
${return_status} = Set Variable FAIL
Run Keyword And Continue On Failure FAIL "${package_versions["${libDetail}[0]"]} != ${libDetail}[1]"
Run Keyword And Continue On Failure Fail
... Version of this library in this image doesn't align with versions in other images
... "${package_versions["${libDetail}[0]"]} != ${libDetail}[1]"
END
END
RETURN ${return_status}
Expand Down
2 changes: 1 addition & 1 deletion ods_ci/tests/Tests/0500__ide/0502__ide_elyra.robot
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ Verify Hello World Pipeline Elements
Select Pipeline Project By Name
[Documentation] Select the project by project name
[Arguments] ${project_name}
${project_menu}= Set Variable xpath://*[@data-testid="project-selector-dropdown"]
${project_menu}= Set Variable xpath://*[@data-testid="project-selector-toggle"]
Wait until Element is Visible ${project_menu} timeout=20
Click Element ${project_menu}
Click Element xpath://*[@role="menuitem" and string()="${project_name}"]
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
*** Settings ***
Documentation Data Science Pipelines Operator Integration Tests - https://github.com/opendatahub-io/data-science-pipelines-operator/tree/main/tests
Suite Setup Prepare Data Science Pipelines Operator Integration Tests Suite
Suite Teardown Teardown Data Science Pipelines Operator Integration Tests Suite
Suite Teardown RHOSi Teardown
Library OperatingSystem
Library Process
Resource ../../../tasks/Resources/RHODS_OLM/install/oc_install.robot
Expand All @@ -11,10 +11,9 @@ Library ../../../libs/DataSciencePipelinesAPI.py

*** Variables ***
# For the initial commit we are hardcoding those environment variables
${DATA-SCIENCE-PIPELINES-OPERATOR-SDK_DIR} /tmp/data-science-pipelines-operator
${DSPO_SDK_DIR} /tmp/data-science-pipelines-operator
${DATA-SCIENCE-PIPELINES-OPERATOR-SDK_REPO_URL} https://github.com/opendatahub-io/data-science-pipelines-operator.git
${DATA-SCIENCE-PIPELINES-OPERATOR-SDK_REPO_BRANCH} main
${DSPANAMESPACE} dspa-e2e
${KUBECONFIGPATH} %{HOME}/.kube/config

#robocop: disable: line-too-long
Expand All @@ -24,29 +23,24 @@ Run Data Science Pipelines Operator Integration Tests
[Tags]
... DataSciencePipelines-Backend
... Tier1
... ODS-2632 AutomationBug
... ODS-2632
${openshift_api} Get Openshift Server
Log ${openshift_api}
${return_code} ${output} Run And Return Rc And Output cd ${DATA-SCIENCE-PIPELINES-OPERATOR-SDK_DIR} && make integrationtest K8SAPISERVERHOST=${openshift_api} DSPANAMESPACE=${DSPANAMESPACE} KUBECONFIGPATH=${KUBECONFIGPATH}
${return_code} ${output} Run And Return Rc And Output cd ${DSPO_SDK_DIR} && GIT_WORKSPACE=${DSPO_SDK_DIR} sh .github/scripts/tests/tests.sh --rhoai --k8s-api-server-host ${openshift_api} --kube-config ${KUBECONFIGPATH} --dspa-path ${DSPO_SDK_DIR}/tests/resources/dspa.yaml --external-dspa-path ${DSPO_SDK_DIR}/tests/resources/dspa-external.yaml --clean-infra --endpoint-type route
Log ${output}
Should Be Equal As Integers ${return_code} 0 msg= Run Data Science Pipelines Operator Integration Tests failed

#robocop: disable: line-too-long
*** Keywords ***
Prepare Data Science Pipelines Operator Integration Tests Suite
[Documentation] Prepare Data Science Pipelines Operator Integration Tests Suite
${return_code} ${output} Run And Return Rc And Output rm -fR ${DATA-SCIENCE-PIPELINES-OPERATOR-SDK_DIR}
${return_code} ${output} Run And Return Rc And Output rm -fR ${DSPO_SDK_DIR}
Log ${output}
${return_code} ${output} Run And Return Rc And Output git clone ${DATA-SCIENCE-PIPELINES-OPERATOR-SDK_REPO_URL} ${DATA-SCIENCE-PIPELINES-OPERATOR-SDK_DIR}
${return_code} ${output} Run And Return Rc And Output git clone ${DATA-SCIENCE-PIPELINES-OPERATOR-SDK_REPO_URL} ${DSPO_SDK_DIR}
Log ${output}
Should Be Equal As Integers ${return_code} 0 msg=Unable to clone data-science-pipelines-operator repo ${DATA-SCIENCE-PIPELINES-OPERATOR-SDK_REPO_URL}:${DATA-SCIENCE-PIPELINES-OPERATOR-SDK_REPO_BRANCH}:${DATA-SCIENCE-PIPELINES-OPERATOR-SDK_DIR}
${return_code} ${output} Run And Return Rc And Output cd ${DATA-SCIENCE-PIPELINES-OPERATOR-SDK_DIR} && git checkout -b it_test origin/${DATA-SCIENCE-PIPELINES-OPERATOR-SDK_REPO_BRANCH}
Should Be Equal As Integers ${return_code} 0 msg=Unable to clone data-science-pipelines-operator repo ${DATA-SCIENCE-PIPELINES-OPERATOR-SDK_REPO_URL}:${DATA-SCIENCE-PIPELINES-OPERATOR-SDK_REPO_BRANCH}:${DSPO_SDK_DIR}
${return_code} ${output} Run And Return Rc And Output cd ${DSPO_SDK_DIR} && git checkout -b it_test origin/${DATA-SCIENCE-PIPELINES-OPERATOR-SDK_REPO_BRANCH}
Should Be Equal As Integers ${return_code} 0 msg=Unable to checkout data-science-pipelines-operator
RHOSi Setup
${rc} ${out}= Run And Return Rc And Output oc new-project ${DSPANAMESPACE}
Should Be Equal As Integers ${rc} 0 msg=Cannot create a new project ${DSPANAMESPACE}

Teardown Data Science Pipelines Operator Integration Tests Suite
${return_code} ${output} Run And Return Rc And Output oc delete project ${DSPANAMESPACE} --force --grace-period=0
Log ${output}
RHOSi Teardown
# Store login information into dedicated config
Login To OCP Using API And Kubeconfig ${OCP_ADMIN_USER.USERNAME} ${OCP_ADMIN_USER.PASSWORD} ${KUBECONFIGPATH}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ${IS_NOT_PRESENT} 1
Validate DSC and DSCI Created With Errors When Service Mesh Operator Is Not Installed #robocop:disable
[Documentation] The purpose of this Test Case is to validate that DSC and DSCI are created
... without Service Mesh Operator installed, but with errors
[Tags] Operator Tier3 ODS-2584 RHOAIENG-2514
[Tags] Operator Tier3 ODS-2584 RHOAIENG-2514 ExcludeOnDisconnected
Remove DSC And DSCI Resources
Uninstall Service Mesh Operator CLI
Expand All @@ -50,7 +50,7 @@ Validate DSC and DSCI Created With Errors When Service Mesh Operator Is Not Inst
Validate DSC and DSCI Created With Errors When Serverless Operator Is Not Installed #robocop:disable
[Documentation] The purpose of this Test Case is to validate that DSC and DSCI are created
... without Serverless Operator installed, but with errors
[Tags] Operator Tier3 ODS-2586 RHOAIENG-2512
[Tags] Operator Tier3 ODS-2586 RHOAIENG-2512 ExcludeOnDisconnected
Remove DSC And DSCI Resources
Uninstall Serverless Operator CLI
Expand All @@ -70,7 +70,7 @@ Validate DSC and DSCI Created With Errors When Serverless Operator Is Not Instal
Validate DSC and DSCI Created With Errors When Service Mesh And Serverless Operators Are Not Installed #robocop:disable
[Documentation] The purpose of this Test Case is to validate that DSC and DSCI are created
... without dependant operators ((servicemesh, serverless) installed, but with errors
[Tags] Operator Tier3 ODS-2527 RHOAIENG-2518
[Tags] Operator Tier3 ODS-2527 RHOAIENG-2518 ExcludeOnDisconnected
Remove DSC And DSCI Resources
Uninstall Service Mesh Operator CLI
Expand All @@ -96,7 +96,7 @@ Validate DSC and DSCI Created With No Errors When Kserve Serving Is Unmanaged An
[Documentation] The purpose of this Test Case is to validate that DSC and DSCI are created
... without dependant operators ((servicemesh, serverless) installed and with no errors
... because the Kserve component serving is unmanaged
[Tags] Operator Tier3 RHOAIENG-3472
[Tags] Operator Tier3 RHOAIENG-3472 ExcludeOnDisconnected
Remove DSC And DSCI Resources
Uninstall Service Mesh Operator CLI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ${MSSG_REGEX} denied the request: only one service
*** Test Cases ***
Validate Service Mesh Control Plane Already Created
[Documentation] This Test Case validates that only one ServiceMeshControlPlane is allowed to be installed per project/namespace
[Tags] RHOAIENG-2517
[Tags] RHOAIENG-2517 ExcludeOnDisconnected
Fetch Image Url And Update Channel
Check Whether DSC Exists And Save Component Statuses
Fetch Cluster Type By Domain
Expand Down

0 comments on commit 863f360

Please sign in to comment.