Merge pull request #1111 from dinhxuanvu/fix-flaky-e2e

Fix several flaky e2e test cases

Author: openshift-merge-robot

test/e2e/installplan_e2e_test.go

@@ -659,6 +659,8 @@ func TestCreateInstallPlanWithPreExistingCRDOwners(t *testing.T) {
 		// Update the subscription resource to point to the beta CSV
 		err = crc.OperatorsV1alpha1().Subscriptions(testNamespace).DeleteCollection(metav1.NewDeleteOptions(0), metav1.ListOptions{})
 		require.NoError(t, err)
+		// Delete orphaned csv
+		require.NoError(t, crc.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Delete(mainStableCSV.GetName(), &metav1.DeleteOptions{}))
 
 		// existing cleanup should remove this
 		createSubscriptionForCatalog(t, crc, testNamespace, subscriptionName, mainCatalogSourceName, mainPackageName, betaChannel, "", v1alpha1.ApprovalAutomatic)
@@ -1192,6 +1194,8 @@ func TestInstallPlanWithDeprecatedVersionCRD(t *testing.T) {
 			// Update the subscription resource to point to the beta CSV
 			err = crc.OperatorsV1alpha1().Subscriptions(testNamespace).DeleteCollection(metav1.NewDeleteOptions(0), metav1.ListOptions{})
 			require.NoError(t, err)
+			// Delete orphaned csv
+			require.NoError(t, crc.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Delete(mainStableCSV.GetName(), &metav1.DeleteOptions{}))
 
 			// existing cleanup should remove this
 			createSubscriptionForCatalog(t, crc, testNamespace, subscriptionName, mainCatalogSourceName, mainPackageName, betaChannel, "", v1alpha1.ApprovalAutomatic)
@@ -1241,6 +1245,8 @@ func TestInstallPlanWithDeprecatedVersionCRD(t *testing.T) {
 			// Update the subscription resource to point to the beta CSV
 			err = crc.OperatorsV1alpha1().Subscriptions(testNamespace).DeleteCollection(metav1.NewDeleteOptions(0), metav1.ListOptions{})
 			require.NoError(t, err)
+			// Delete orphaned csv
+			require.NoError(t, crc.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Delete(mainBetaCSV.GetName(), &metav1.DeleteOptions{}))
 
 			// existing cleanup should remove this
 			createSubscriptionForCatalog(t, crc, testNamespace, subscriptionName, mainCatalogSourceName, mainPackageName, deltaChannel, "", v1alpha1.ApprovalAutomatic)

test/e2e/subscription_e2e_test.go

@@ -921,6 +921,8 @@ func TestSubscriptionUpdatesExistingInstallPlan(t *testing.T) {
 	// Delete this subscription
 	err = crc.OperatorsV1alpha1().Subscriptions(testNamespace).DeleteCollection(metav1.NewDeleteOptions(0), metav1.ListOptions{})
 	require.NoError(t, err)
+	// Delete orphaned csvB
+	require.NoError(t, crc.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Delete(csvB.GetName(), &metav1.DeleteOptions{}))
 
 	// Create an InstallPlan for csvB
 	ip := &v1alpha1.InstallPlan{