Automate Validate ServiceMeshControlPlaneAlreadyCreated Test Case #1762

asanzgom · 2024-08-30T11:30:24Z

RHOAIENG-2517 Test Case to validate that only one Service Mesh Control Plane per namespace/project can be created

…readyCreated

ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot

@@ -199,7 +199,7 @@
 Install RHODS In Self Managed Cluster Using CLI
  [Documentation]   Install rhods on self managed cluster using cli
  [Arguments]     ${cluster_type}     ${image_url}
-  ${return_code}    Run and Watch Command    cd ${EXECDIR}/${OLM_DIR} && ./setup.sh -t operator -u ${UPDATE_CHANNEL} -i ${image_url} -n ${OPERATOR_NAME} -p ${OPERATOR_NAMESPACE}   timeout=20 min
+  ${return_code}    Run and Watch Command    cd ${EXECDIR}/${OLM_DIR} && ./setup.sh -t operator -u ${UPDATE_CHANNEL} -i ${image_url}   timeout=20 min


...ts/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0110__service_mesh.robot

-${IS_PRESENT}                           0
-${IS_NOT_PRESENT}                       1
+${OLM_DIR}                                  olm
+${INSTALL_TYPE}                             CLi


...ts/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0110__service_mesh.robot

-${IS_NOT_PRESENT}                       1
+${OLM_DIR}                                  olm
+${INSTALL_TYPE}                             CLi
+${TEST_ENV}                                 PSI


...ts/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0110__service_mesh.robot

+${TEST_ENV}                                 PSI
+${IS_PRESENT}                               0
+${IS_NOT_PRESENT}                           1
+${MSSG_REGEX}                               denied the request: only one service mesh may be installed per project/namespace


...ts/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0110__service_mesh.robot

+    ${matches}=    Get Regexp Matches    ${OCP_CONSOLE_URL}    rh-ods
+    ${domain}=    Get From List    ${matches}    0
+    IF    "${domain}" == "rh-ods"
+        Set Global Variable    ${CLUSTER_TYPE}    selfmanaged


...ts/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0110__service_mesh.robot

+    IF    "${domain}" == "rh-ods"
+        Set Global Variable    ${CLUSTER_TYPE}    selfmanaged
+    ELSE
+        Set Global Variable    ${CLUSTER_TYPE}    managed


...ts/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0110__service_mesh.robot

+
+Delete Smcp
+    [Documentation]    Delete the ServiceMeshControlPlane already created
+    Run and Watch Command


...ts/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0110__service_mesh.robot

+    [Documentation]    Loop until the Operator deployment is ready
+    ${rc}=    Set Variable    1
+    TRY
+        WHILE    ${rc} != 0    limit=10m


...ts/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0110__service_mesh.robot

+
+Cleanup Olm Install Dir
+    [Documentation]    Clean up olm install repo
+    ${return_code}=    Run and Watch Command    rm -vRf ${EXECDIR}/${OLM_DIR}    timeout=10 min


github-actions · 2024-08-30T11:34:28Z

Robot Results

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

asanzgom · 2024-08-30T11:36:40Z

Running rhods-ci-pr-test/3305/

...ts/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0110__service_mesh.robot

ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot

CFSNM · 2024-08-30T12:44:45Z

...ts/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0110__service_mesh.robot

+Fetch Image Url And Update Channel
+    [Documentation]    Fetch url for image and Update Channel
+    ${rc}    ${out}=    Run And Return Rc And Output
+    ...    oc get catalogsource rhoai-catalog-dev --namespace openshift-marketplace -o jsonpath='{.spec.image}'


if we test a catalog source that is not created by automations and the user includes manually another name, this line will fail.

Lets see if we can get a generic way to retrieve the used catalogsource, maybe by tags or by image

try with some label selector

Added workaround to get CatalogSource from subscription

CFSNM · 2024-08-30T12:45:13Z

...ts/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0110__service_mesh.robot

+    ${rc}    ${out}=    Run And Return Rc And Output
+    ...    oc get subscription rhoai-operator-dev --namespace redhat-ods-operator -o jsonpath='{.spec.channel}'
+    Should Be Equal As Integers    ${rc}    0
+    Set Global Variable    ${UPDATE_CHANNEL}    ${out}


the same here, the subscription can have a different name if we dont use automations and we deploy the catalog source by hand

asanzgom · 2024-08-30T13:13:27Z

rhods-ci-pr-test/3306 passed successfully

CFSNM · 2024-08-30T13:55:00Z

...ts/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0110__service_mesh.robot

+    Delete Smcp
+    # Cleanup Olminstall dir
+    Cleanup Olm Install Dir
+


We need a teardown method for the test just in case some step fails, so we are back to initial state, with ODH/RHOAI installed and working

There is the suite teardown

I agree with Cesar, we need a teardown which restore the correct RHOAI status in the cluster

Ok I can move it to the Suite Teardown

Added Test Case Teardown

…readyCreated

...ts/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0110__service_mesh.robot

…readyCreated

ods_ci/tests/Resources/RHOSi.resource

...ts/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0110__service_mesh.robot


 Suite Teardown
    [Documentation]    Suite Teardown
    RHOSi Teardown
+
+Teardown Service Mesh Control Plane Already Created


...ts/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0110__service_mesh.robot

+    ${rc}    ${out}=    Run And Return Rc And Output
+    ...    oc get catalogsource rhoai-catalog-dev --namespace openshift-marketplace -o jsonpath='{.spec.image}'
+    Should Be Equal As Integers    ${rc}    0
+    Set Global Variable    ${IMAGE_URL}    ${out}


…readyCreated

ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot

bdattoma · 2024-09-23T15:51:10Z

ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot

+        Create DataScienceCluster CustomResource Using Custom Configuration
+        Apply Custom Manifest in DataScienceCluster CustomResource Using Custom Configuration
+        ${yml} =    Get File    ${file_path}dsc_apply.yml
+        Log To Console    Applying DSC yaml
+        Log To Console    ${yml}
+        ${return_code}    ${output} =    Run And Return Rc And Output    oc apply -f ${file_path}dsc_apply.yml


is this applying multiple times the DSC? at line 282 (maybe in 283) and 287?

Ah I see, the keyword says "Apply" but it doesn-t mean to actually Apply in the cluster via OC. Unless it's only me seeing the ambiguity, would you mind clear it a bit?

That part follows the same logic as before (just some common parts) it is not newly added logic. On these lines it is just getting the file to log it into console

yeah but still, the ambiguity reading the code remains

bdattoma · 2024-09-23T15:52:59Z

ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot

@@ -335,6 +367,14 @@ Apply Custom Manifest in DataScienceCluster CustomResource Using Test Variables
         END
    END

+Apply Custom Manifest in DataScienceCluster CustomResource Using Custom Configuration
+    [Documentation]    Apply custom manifests to a DSC file
+    Log To Console    Applying Custom Manifests


it is not applying actually

Renamed to applying devFlags

that wouldn't change much, it would still not being "applying" anything on the cluster

what do you suggest?

I think that if a keyword is just editing a local YAML file, without actually applying it with OC client. it'd better to make it clear in the kw name like "Generate DataScianceCluster YAML" which gather any edit you need. Or if you need/prefer single keywords, Generate CustomManifest in DSC YAML or similar.

Then I'd expect to find a keyword which actually Applies the DSC resource in the cluster

Renamed keyword to Generate CustomManifest in DSC YAML

ty, however the same applies to the other keywords in the PR which says "Apply" but doesn-t apply

...ts/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0110__service_mesh.robot

…readyCreated

bdattoma · 2024-09-24T11:19:30Z

ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot

+    Log To Console    Applying devFlags
+    ${file_path} =    Set Variable    tasks/Resources/Files/
+    FOR    ${cmp}    IN    @{COMPONENT_LIST}
+        Run     sed -i'' -e "s|<${cmp}_devflags>||g" ${file_path}dsc_apply.yml


so, is it actually removing the dev flags?
Also, isn't this the same action done at https://github.com/red-hat-data-services/ods-ci/pull/1762/files#diff-11c2f02f8419b8b4ee8bf5f117645cfe5da320a349f21813d8da399c47a7ffb3R369

No, it is setting the key as empty as it is by default

…readyCreated

sonarqubecloud · 2024-09-25T13:56:10Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

Automate Validate ServiceMeshControlPlaneAlreadyCreated Test Case

b8bbe5d

asanzgom requested review from jgarciao, mattmahoneyrh, CFSNM and bdattoma August 30, 2024 11:30

asanzgom self-assigned this Aug 30, 2024

Merge branch 'master' into feature/Validate_ServiceMeshControlPlaneAl…

601222a

…readyCreated

github-advanced-security bot found potential problems Aug 30, 2024

View reviewed changes

asanzgom added needs testing Needs to be tested in Jenkins new test New test(s) added (PR will be listed in release-notes) labels Aug 30, 2024

asanzgom requested review from MarianMacik and jstourac August 30, 2024 11:33

asanzgom enabled auto-merge August 30, 2024 11:36

Added RHODS_OSD_INSTALL_REPO variable

da00f98

github-advanced-security bot found potential problems Aug 30, 2024

View reviewed changes

...ts/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0110__service_mesh.robot Fixed Show fixed Hide fixed

CFSNM requested changes Aug 30, 2024

View reviewed changes

changed to relative path on smcp template

3f99bc5

CFSNM requested changes Aug 30, 2024

View reviewed changes

Merge branch 'master' into feature/Validate_ServiceMeshControlPlaneAl…

3b085ac

…readyCreated

bdattoma reviewed Sep 2, 2024

View reviewed changes

...ts/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0110__service_mesh.robot Outdated Show resolved Hide resolved

asanzgom and others added 5 commits September 2, 2024 16:37

Merge branch 'master' into feature/Validate_ServiceMeshControlPlaneAl…

2296ab1

…readyCreated

removed olminstall repo

6c04140

Merge branch 'master' into feature/Validate_ServiceMeshControlPlaneAl…

7b4abdf

…readyCreated

Merge branch 'master' into feature/Validate_ServiceMeshControlPlaneAl…

8f1f664

…readyCreated

Added Test Case teardown + restored -p & -n flags

4cd24cb

github-advanced-security bot found potential problems Sep 5, 2024

View reviewed changes

Merge branch 'master' into feature/Validate_ServiceMeshControlPlaneAl…

38b1dbf

…readyCreated

bdattoma reviewed Sep 23, 2024

View reviewed changes

ods_ci/tasks/Resources/RHODS_OLM/install/oc_install.robot Outdated Show resolved Hide resolved

bdattoma reviewed Sep 23, 2024

View reviewed changes

...ts/0100__platform/0101__deploy/0104__operators/0104__rhods_operator/0110__service_mesh.robot Outdated Show resolved Hide resolved

Merge branch 'master' into feature/Validate_ServiceMeshControlPlaneAl…

df37b0a

…readyCreated

asanzgom dismissed CFSNM’s stale review via df37b0a September 24, 2024 09:05

CFSNM previously approved these changes Sep 24, 2024

View reviewed changes

changed to use Load Json string + renamed kw to applying devflags

54e611f

asanzgom dismissed CFSNM’s stale review via 54e611f September 24, 2024 09:30

asanzgom requested a review from CFSNM September 24, 2024 09:31

CFSNM previously approved these changes Sep 24, 2024

View reviewed changes

bdattoma reviewed Sep 24, 2024

View reviewed changes

Renamed kw to Generate CustomManifest in DSC YAML

dec7e54

asanzgom dismissed CFSNM’s stale review via dec7e54 September 24, 2024 11:45

asanzgom requested review from bdattoma and CFSNM September 24, 2024 12:42

Merge branch 'master' into feature/Validate_ServiceMeshControlPlaneAl…

17c986c

…readyCreated

CFSNM previously approved these changes Sep 24, 2024

View reviewed changes

Merge branch 'master' into feature/Validate_ServiceMeshControlPlaneAl…

1be5592

…readyCreated

asanzgom disabled auto-merge September 24, 2024 15:06

asanzgom and others added 2 commits September 25, 2024 14:11

Merge branch 'master' into feature/Validate_ServiceMeshControlPlaneAl…

1171fce

…readyCreated

added final check for smcp + rename kws + modelregistry field update

3474104

asanzgom dismissed CFSNM’s stale review via 3474104 September 25, 2024 12:16

asanzgom enabled auto-merge September 25, 2024 12:16

bdattoma approved these changes Sep 25, 2024

View reviewed changes

Merge branch 'master' into feature/Validate_ServiceMeshControlPlaneAl…

ac4fccf

…readyCreated

FedeAlonso approved these changes Sep 25, 2024

View reviewed changes

asanzgom merged commit 9219cc1 into red-hat-data-services:master Sep 25, 2024
8 checks passed

asanzgom deleted the feature/Validate_ServiceMeshControlPlaneAlreadyCreated branch September 25, 2024 14:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Automate Validate ServiceMeshControlPlaneAlreadyCreated Test Case #1762

Automate Validate ServiceMeshControlPlaneAlreadyCreated Test Case #1762

asanzgom commented Aug 30, 2024 •

edited

Loading

github-actions bot commented Aug 30, 2024 •

edited

Loading

asanzgom commented Aug 30, 2024 •

edited

Loading

CFSNM Aug 30, 2024

bdattoma Sep 2, 2024

asanzgom Sep 17, 2024

CFSNM Aug 30, 2024

asanzgom commented Aug 30, 2024

CFSNM Aug 30, 2024

asanzgom Aug 30, 2024

bdattoma Sep 2, 2024

asanzgom Sep 2, 2024

asanzgom Sep 5, 2024

bdattoma Sep 23, 2024 •

edited

Loading

bdattoma Sep 23, 2024

asanzgom Sep 24, 2024

bdattoma Sep 24, 2024

bdattoma Sep 23, 2024

asanzgom Sep 24, 2024

bdattoma Sep 24, 2024

asanzgom Sep 24, 2024

bdattoma Sep 24, 2024

asanzgom Sep 24, 2024

bdattoma Sep 24, 2024

bdattoma Sep 24, 2024

asanzgom Sep 24, 2024

sonarqubecloud bot commented Sep 25, 2024

Automate Validate ServiceMeshControlPlaneAlreadyCreated Test Case #1762

Automate Validate ServiceMeshControlPlaneAlreadyCreated Test Case #1762

Conversation

asanzgom commented Aug 30, 2024 • edited Loading

github-actions bot commented Aug 30, 2024 • edited Loading

Robot Results

asanzgom commented Aug 30, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

asanzgom commented Aug 30, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bdattoma Sep 23, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Sep 25, 2024

Quality Gate passed

asanzgom commented Aug 30, 2024 •

edited

Loading

github-actions bot commented Aug 30, 2024 •

edited

Loading

asanzgom commented Aug 30, 2024 •

edited

Loading

bdattoma Sep 23, 2024 •

edited

Loading