Fixes

Signed-off-by: Jakub Stejskal <[email protected]>
skodjob · Dec 11, 2023 · debf524 · debf524
1 parent c34ed0e
commit debf524
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/src/main/java/io/odh/test/install/OlmInstall.java b/src/main/java/io/odh/test/install/OlmInstall.java
@@ -105,13 +105,22 @@ public Subscription prepareSubscription() {
     }
 
     public void deleteCSV() {
-        LOGGER.info("Deleting CSV {}/{}", namespace, olmAppBundlePrefix);
         ResourceManager.getClient().getClient().adapt(OpenShiftClient.class).operatorHub().clusterServiceVersions().inNamespace(namespace)
             .list().getItems().stream().filter(csv -> csv.getMetadata().getName().contains(olmAppBundlePrefix)).toList()
             .forEach(csv -> {
                 LOGGER.info("Deleting CSV {}", csv.getMetadata().getName());
                 ResourceManager.getClient().getClient().adapt(OpenShiftClient.class).operatorHub().clusterServiceVersions().resource(csv).delete();
             });
+        deleteInstallPlans();
+    }
+
+    public void deleteInstallPlans() {
+        ResourceManager.getClient().getClient().adapt(OpenShiftClient.class).operatorHub().installPlans().inNamespace(namespace)
+            .list().getItems().stream().filter(ip -> ip.getSpec().getClusterServiceVersionNames().stream().toList().toString().contains(olmAppBundlePrefix)).toList()
+            .forEach(ip -> {
+                LOGGER.info("Deleting InstallPlan {}", ip.getMetadata().getName());
+                ResourceManager.getClient().getClient().adapt(OpenShiftClient.class).operatorHub().installPlans().resource(ip).delete();
+            });
     }
 
     /**

diff --git a/src/main/java/io/odh/test/platform/KubeClient.java b/src/main/java/io/odh/test/platform/KubeClient.java
@@ -27,8 +27,9 @@
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.InstallPlanBuilder;
 import io.fabric8.openshift.client.OpenShiftClient;
 import io.odh.test.Environment;
+import io.odh.test.TestConstants;
+import io.odh.test.TestUtils;
 import io.odh.test.platform.executor.Exec;
-import io.opendatahub.datasciencecluster.v1.DataScienceCluster;
 import io.opendatahub.v1alpha.OdhDashboardConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -368,15 +369,23 @@ public InstallPlan getInstallPlan(String namespaceName, String installPlanName)
         return client.adapt(OpenShiftClient.class).operatorHub().installPlans().inNamespace(namespaceName).withName(installPlanName).get();
     }
 
-    public void approveInstallPlan(String namespaceName, String installPlanName) {
+    public void approveInstallPlan(String namespaceName, String installPlanName) throws InterruptedException {
         InstallPlan installPlan = new InstallPlanBuilder(this.getInstallPlan(namespaceName, installPlanName))
             .editSpec()
             .withApproved()
             .endSpec()
             .build();
 
         LOGGER.debug("Approving InstallPlan {}", installPlanName);
-        client.adapt(OpenShiftClient.class).operatorHub().installPlans().inNamespace(namespaceName).withName(installPlanName).patch(installPlan);
+        TestUtils.waitFor("InstallPlan approval", TestConstants.GLOBAL_POLL_INTERVAL_SHORT, 15_000, () -> {
+            try {
+                client.adapt(OpenShiftClient.class).operatorHub().installPlans().inNamespace(namespaceName).withName(installPlanName).patch(installPlan);
+                return true;
+            } catch (Exception ex) {
+                LOGGER.error(String.valueOf(ex));
+                return false;
+            }
+        });
     }
 
     public InstallPlan getNonApprovedInstallPlan(String namespaceName, String csvPrefix) {

diff --git a/src/test/java/io/odh/test/e2e/upgrade/OlmUpgradeST.java b/src/test/java/io/odh/test/e2e/upgrade/OlmUpgradeST.java
@@ -32,7 +32,7 @@ public class OlmUpgradeST extends UpgradeAbstract {
     private final String startingVersion = "2.3.0";
 
     @Test
-    void testUpgradeOlm() throws IOException {
+    void testUpgradeOlm() throws IOException, InterruptedException {
         String ntbName = "test-odh-notebook";
         String ntbNamespace = "test-odh-notebook-upgrade";