Adapt Trusted CA bundles tests to ODH #1380

asanzgom · 2024-04-15T12:12:11Z

No description provided.

ods_ci/tests/Resources/OCP.resource

ods_ci/tests/Tests/100__deploy/130__operators/130__rhods_operator/139__trusted_ca_bundles.robot

asanzgom · 2024-04-15T12:15:03Z

rhods-ci-pr-test/2692/ In progress

github-actions · 2024-04-15T12:15:34Z

Robot Results

✅ Passed	❌ Failed	⏭️ Skipped	Total	Pass %
448	0	0	448	100

jstourac · 2024-04-15T14:29:59Z

Basically LGTM.

I just don't feel very comfortable with the different approaches we have to configure product specific constants - somewhere we count respective values in the running code directly, elsewhere we expect to use this file.

mattmahoneyrh · 2024-04-15T14:32:16Z

@asanzgom Has this PR been by Jenkins job for both ODH and RHOAI?
Also, this is also a fix to the Serverless test, right?

ods_ci/tests/Resources/RHOSi.resource

+    [Arguments]    ${PRODUCT}
+    IF    "${PRODUCT}" == "RHODS"
+        Set Suite Variable    ${OPERATOR_APPNAME}     Red Hat OpenShift AI
+        Set Suite Variable    ${OPERATOR_NAME}    Red Hat OpenShift AI


ods_ci/tests/Resources/RHOSi.resource

+        Set Suite Variable    ${OPERATOR_APPNAME}     Red Hat OpenShift AI
+        Set Suite Variable    ${OPERATOR_NAME}    Red Hat OpenShift AI
+        Set Suite Variable    ${OPERATOR_DEPLOYMENT_NAME}    rhods-operator
+        Set Suite Variable    ${OPERATOR_LABEL_SELECTOR}    name=rhods-operator


ods_ci/tests/Resources/RHOSi.resource

+        Set Suite Variable    ${OPERATOR_DEPLOYMENT_NAME}    rhods-operator
+        Set Suite Variable    ${OPERATOR_LABEL_SELECTOR}    name=rhods-operator
+    ELSE IF    "${PRODUCT}" == "ODH"
+        Set Suite Variable    ${OPERATOR_APPNAME}  Open Data Hub Operator


ods_ci/tests/Resources/RHOSi.resource

+        Set Suite Variable    ${OPERATOR_LABEL_SELECTOR}    name=rhods-operator
+    ELSE IF    "${PRODUCT}" == "ODH"
+        Set Suite Variable    ${OPERATOR_APPNAME}  Open Data Hub Operator
+        Set Suite Variable    ${OPERATOR_NAME}    Open Data Hub Operator


ods_ci/tests/Resources/RHOSi.resource

+    ELSE IF    "${PRODUCT}" == "ODH"
+        Set Suite Variable    ${OPERATOR_APPNAME}  Open Data Hub Operator
+        Set Suite Variable    ${OPERATOR_NAME}    Open Data Hub Operator
+        Set Suite Variable    ${OPERATOR_DEPLOYMENT_NAME}    opendatahub-operator-controller-manager


ods_ci/tests/Resources/RHOSi.resource

+        Set Suite Variable    ${OPERATOR_APPNAME}  Open Data Hub Operator
+        Set Suite Variable    ${OPERATOR_NAME}    Open Data Hub Operator
+        Set Suite Variable    ${OPERATOR_DEPLOYMENT_NAME}    opendatahub-operator-controller-manager
+        Set Suite Variable    ${OPERATOR_LABEL_SELECTOR}    control-plane=controller-manager


asanzgom · 2024-04-15T14:35:49Z

Triggered odh-smoke/52/

bdattoma · 2024-04-15T14:36:41Z

Basically LGTM.

I just don't feel very comfortable with the different approaches we have to configure product specific constants - somewhere we count respective values in the running code directly, elsewhere we expect to use this file.

Agree with Jan's point

asanzgom · 2024-04-15T14:37:48Z

@asanzgom Has this PR been by Jenkins job for both ODH and RHOAI? Also, this is also a fix to the Serverless test, right?

I have triggered for ODH now odh-smoke/52/ and will trigger on another cluster with RHOAI and yes, I moved common Keyword and fixed compatibility backwards for the serverless Test Case

asanzgom · 2024-04-15T15:15:12Z

odh-smoke/55/ passed

asanzgom · 2024-04-15T15:49:50Z

Ran successful on RHOAI rhods-smoke/5103

jgarciao · 2024-04-15T16:50:05Z

ods_ci/tests/Resources/RHOSi.resource

@@ -70,6 +70,7 @@ Protect Sensitive Variables In Keywords
 Initialize Global Variables
    [Documentation]   Sets global variables
    [Arguments]    ${force_fetch}=False
+    Assign Vars According To Product    ${PRODUCT}


${PRODUCT} is already a global variable so you don't need this argument

I had to include it as an input param because of:
Validate Trusted CA Bundles State Managed :: The purpose of this t... | FAIL | Parent suite setup failed: Keyword 'RHOSi.Assign Vars According To Product' expected 1 argument, got 0.

ods_ci/tests/Tests/100__deploy/130__operators/130__rhods_operator/139__trusted_ca_bundles.robot

jgarciao · 2024-04-15T16:52:03Z

...sts/Tests/100__deploy/130__operators/140__serverless_operator/140__serverless_operator.robot

@@ -42,23 +42,13 @@ Suite Setup
    [Documentation]    Suite Setup
    Set Library Search Order    SeleniumLibrary
    RHOSi Setup
+    Assign Vars According To Product    ${PRODUCT}


This is not needed (already done in RHOSi Setup)

I still see this line to be removed

jgarciao · 2024-04-15T16:57:45Z

I just don't feel very comfortable with the different approaches we have to configure product specific constants - somewhere we count respective values in the running code directly, elsewhere we expect to use this file.

I think the code at Assign Vars According To Product could be moved to the existing Initialize Global Variables and use it only for global variables (variables that might be used in more than one test suite). For variables that will be used only in a test suite, they can be declared in the test suite itself and then overwritten for ODH using test-variables-odh-overwrite.

asanzgom · 2024-04-16T07:32:07Z

I just don't feel very comfortable with the different approaches we have to configure product specific constants - somewhere we count respective values in the running code directly, elsewhere we expect to use this file.

I think the code at Assign Vars According To Product could be moved to the existing Initialize Global Variables and use it only for global variables (variables that might be used in more than one test suite). For variables that will be used only in a test suite, they can be declared in the test suite itself and then overwritten for ODH using test-variables-odh-overwrite.

It is already moved inside Initialize Global Variables

jgarciao · 2024-04-16T15:06:29Z

...sts/Tests/100__deploy/130__operators/140__serverless_operator/140__serverless_operator.robot

@@ -42,23 +42,13 @@ Suite Setup
    [Documentation]    Suite Setup
    Set Library Search Order    SeleniumLibrary
    RHOSi Setup
+    Assign Vars According To Product    ${PRODUCT}


I still see this line to be removed

sonarqubecloud · 2024-04-16T15:45:29Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

jgarciao · 2024-04-16T16:47:47Z

Merging after the agreement in today's Automation Meeting

* Adapt Trusted CA bundles tests to ODH * Moved Assign Vars According to Product to RHOSi.resource * remove as input param * removed trailing whitespace * removed Assign Vars According To Product invokation

* Fix bug in "Trusted Ca Bundles" test suite in ODH Signed-off-by: Jorge Garcia Oncins <[email protected]> * Move non-critical monitoring test to Sanity Signed-off-by: Jorge Garcia Oncins <[email protected]> * Revert "Fix bug in "Trusted Ca Bundles" test suite in ODH" This reverts commit 914efd1. * Fix kw "Verify Cluster Settings Is Available" for ODH Signed-off-by: Jorge Garcia Oncins <[email protected]> * Fix must-grather test for ODH Signed-off-by: Jorge Garcia Oncins <[email protected]> * Exclude "Image Digest" test in ODH Signed-off-by: Jorge Garcia Oncins <[email protected]> * Read Tier1 tag in must-gather test Signed-off-by: Jorge Garcia Oncins <[email protected]> * Fix some of the robocop warnings in must-gather test Signed-off-by: Jorge Garcia Oncins <[email protected]> Signed-off-by: Jorge Garcia Oncins <[email protected]> * Change `IBM Watson Studio` to `IBM watsonx.ai` title in 2.9+ https://issues.redhat.com/browse/RHOAIENG-4447 * Update link for Jupyter card in the Explore page * Update Xpath for WORKBENCH_IMAGE (#1382) The following Xpath values have to be updated for RHOAI 2.9: - `$WORKBENCH_IMAGE_MENU_BTN_XP` - `$WORKBENCH_IMAGE_VER_DROPDOWN` Signed-off-by: manosnoam <[email protected]> * fix: ODS-1814 wrong xpath (#1383) * fix: ODS-1814 wrong xpath * use data-testid and minor linter change * Migrate pipelines tests to DSPv2 * fix: ODS-2054 issues (#1384) * fix: ODS-2054 issues * modify the sleep in order to be an active wait * cap case * Adapt Trusted CA bundles tests to ODH (#1380) * Adapt Trusted CA bundles tests to ODH * Moved Assign Vars According to Product to RHOSi.resource * remove as input param * removed trailing whitespace * removed Assign Vars According To Product invokation * Verify That There Are No Sample Pipelines After Creating Pipeline Server in RHOAI (#1368) * Added Automation for RHOAIENG-4382 * removed RunThisTest tag * Added Fail and Made some changes * Added Fail and Made some changes * replaced Import Pipeline * replaced Import Pipeline with new Keyword * Modified sample pipelines verification --------- Co-authored-by: Jorge <[email protected]> * Fix required xpaths for the selection of the model server template (#1387) * Fix required xpaths for the selection of the model server template This change is necessary for the latest RHOAI 2.9 preRC build. * Followup for 58fbb14 - deduplicate the methods for model serving runtime selection * fix: ODS-2276 and ODS-2279 issues (#1388) --------- Signed-off-by: Jorge Garcia Oncins <[email protected]> Signed-off-by: manosnoam <[email protected]> Co-authored-by: Jan Stourac <[email protected]> Co-authored-by: Noam Manos <[email protected]> Co-authored-by: Fede Alonso <[email protected]> Co-authored-by: Diego Lovison <[email protected]> Co-authored-by: Adrián Sanz Gómiz <[email protected]> Co-authored-by: RAGHUL M <[email protected]>

Adapt Trusted CA bundles tests to ODH

bb68921

asanzgom requested review from jgarciao and mattmahoneyrh April 15, 2024 12:12

asanzgom self-assigned this Apr 15, 2024

asanzgom requested review from bdattoma and jstourac April 15, 2024 12:12

github-advanced-security bot found potential problems Apr 15, 2024

View reviewed changes

Moved Assign Vars According to Product to RHOSi.resource

0bc51d6

github-advanced-security bot found potential problems Apr 15, 2024

View reviewed changes

bdattoma added needs testing Needs to be tested in Jenkins enhancements Bugfixes, enhancements, refactoring, ... in tests or libraries (PR will be listed in release-notes) labels Apr 15, 2024

Merge branch 'master' into hotfix/adapt_trusted_ca_bundles_test_to_odh

e1991df

jgarciao requested changes Apr 15, 2024

View reviewed changes

mattmahoneyrh previously approved these changes Apr 15, 2024

View reviewed changes

asanzgom requested a review from jgarciao April 16, 2024 07:32

Merge branch 'master' into hotfix/adapt_trusted_ca_bundles_test_to_odh

7dd78da

asanzgom requested a review from FedeAlonso April 16, 2024 13:23

remove as input param

078fe72

asanzgom dismissed mattmahoneyrh’s stale review via 078fe72 April 16, 2024 14:20

Merge branch 'master' into hotfix/adapt_trusted_ca_bundles_test_to_odh

0f7680a

jgarciao requested changes Apr 16, 2024

View reviewed changes

removed trailing whitespace

edf377f

jgarciao self-requested a review April 16, 2024 15:26

jgarciao previously approved these changes Apr 16, 2024

View reviewed changes

removed Assign Vars According To Product invokation

c98579f

asanzgom dismissed jgarciao’s stale review via c98579f April 16, 2024 15:37

asanzgom requested review from jgarciao and mattmahoneyrh April 16, 2024 15:37

FedeAlonso approved these changes Apr 16, 2024

View reviewed changes

Merge branch 'master' into hotfix/adapt_trusted_ca_bundles_test_to_odh

306e3b6

jgarciao approved these changes Apr 16, 2024

View reviewed changes

jgarciao merged commit 24f666c into red-hat-data-services:master Apr 16, 2024
8 checks passed

asanzgom deleted the hotfix/adapt_trusted_ca_bundles_test_to_odh branch April 17, 2024 07:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adapt Trusted CA bundles tests to ODH #1380

Adapt Trusted CA bundles tests to ODH #1380

asanzgom commented Apr 15, 2024

asanzgom commented Apr 15, 2024

github-actions bot commented Apr 15, 2024

jstourac commented Apr 15, 2024

mattmahoneyrh commented Apr 15, 2024 •

edited

Loading

asanzgom commented Apr 15, 2024

bdattoma commented Apr 15, 2024

asanzgom commented Apr 15, 2024

asanzgom commented Apr 15, 2024

asanzgom commented Apr 15, 2024

jgarciao Apr 15, 2024

asanzgom Apr 16, 2024

asanzgom Apr 16, 2024

jgarciao Apr 15, 2024

asanzgom Apr 16, 2024 •

edited

Loading

jgarciao Apr 16, 2024

jgarciao commented Apr 15, 2024

asanzgom commented Apr 16, 2024

jgarciao Apr 16, 2024

sonarqubecloud bot commented Apr 16, 2024

jgarciao commented Apr 16, 2024

Adapt Trusted CA bundles tests to ODH #1380

Adapt Trusted CA bundles tests to ODH #1380

Conversation

asanzgom commented Apr 15, 2024

asanzgom commented Apr 15, 2024

github-actions bot commented Apr 15, 2024

Robot Results

jstourac commented Apr 15, 2024

mattmahoneyrh commented Apr 15, 2024 • edited Loading

asanzgom commented Apr 15, 2024

bdattoma commented Apr 15, 2024

asanzgom commented Apr 15, 2024

asanzgom commented Apr 15, 2024

asanzgom commented Apr 15, 2024

jgarciao Apr 15, 2024

Choose a reason for hiding this comment

asanzgom Apr 16, 2024

Choose a reason for hiding this comment

asanzgom Apr 16, 2024

Choose a reason for hiding this comment

jgarciao Apr 15, 2024

Choose a reason for hiding this comment

asanzgom Apr 16, 2024 • edited Loading

Choose a reason for hiding this comment

jgarciao Apr 16, 2024

Choose a reason for hiding this comment

jgarciao commented Apr 15, 2024

asanzgom commented Apr 16, 2024

jgarciao Apr 16, 2024

Choose a reason for hiding this comment

sonarqubecloud bot commented Apr 16, 2024

Quality Gate passed

jgarciao commented Apr 16, 2024

mattmahoneyrh commented Apr 15, 2024 •

edited

Loading

asanzgom Apr 16, 2024 •

edited

Loading