Fix the uninstall test based on the fix in the product #120
Conversation
| @@ -38,12 +40,13 @@ | |||
| @Step(value = "Deploy DSC", expected = "DSC is created and ready") | |||
| } | |||
| ) | |||
| @Disabled("Disabled because of the https://issues.redhat.com/browse/RHOAIENG-499") | |||
| @DisabledIf(value = "isOdhTested", disabledReason = "This test needs to be modified to work on ODH.") | |||
There was a problem hiding this comment.
More like "ODH needs to be modified to work with the test" ;P
The problem isn't ODH but OLM, no? If you install with bundle, operator cannot uninstall, but if you install with OLM, the uninstall code (should) work on ODH as well.
There was a problem hiding this comment.
I'm not sure yet, I have to check with a real installation.
| // Now the product should start to uninstall, let's wait a bit and check the result. | ||
| TestUtils.waitFor(String.format("the '%s' namespace to be removed as operator is being uninstalled", | ||
| OdhConstants.CONTROLLERS_NAMESPACE), 2000, 20000, | ||
| OdhConstants.CONTROLLERS_NAMESPACE), 2000, 120_000, |
There was a problem hiding this comment.
I think I'd like a constant for this, but I'm not sure about the name and scope (just for this class, or global).
| if (Environment.PRODUCT.equals(Environment.PRODUCT_ODH)) { | ||
| LOGGER.info(String.format("Tested product is ODH - skipping removal of the '%s' namespace.", OdhConstants.OLM_OPERATOR_NAMESPACE)); |
There was a problem hiding this comment.
This will never run, due to the @DisabledIf, no?
There was a problem hiding this comment.
Yes, not now until we resolve this for ODH.
| @@ -122,4 +144,8 @@ void deployDataScienceCluster() { | |||
| ResourceManager.getInstance().createResourceWithWait(dsci); | |||
| ResourceManager.getInstance().createResourceWithWait(dsc); | |||
| } | |||
|
|
|||
| static boolean isOdhTested() { | |||
| return Environment.PRODUCT.equalsIgnoreCase(Environment.PRODUCT_ODH); | |||
There was a problem hiding this comment.
This should check for OLM, not ODH, I think, like I had in my PR
There was a problem hiding this comment.
This is intentional - I disabled this test on ODH for now.
Let's enable this test for RHOAI only right now. I will check what is happening with ODH sometimes later.