add more logs

Signed-off-by: Tiger Kaovilai <[email protected]>

Author: kaovilai

Makefile

@@ -437,7 +437,8 @@ test-e2e-ginkgo: test-e2e-setup
 	-provider=$(CLUSTER_TYPE) \
 	-creds_secret_ref=$(CREDS_SECRET_REF) \
 	-artifact_dir=$(ARTIFACT_DIR) \
-	-oc_cli=$(OC_CLI)
+	-oc_cli=$(OC_CLI) \
+	--ginkgo.timeout=2h
 
 .PHONY: test-e2e
 test-e2e: volsync-install test-e2e-ginkgo

tests/e2e/dpa_deployment_suite_test.go

@@ -648,7 +648,7 @@ var _ = Describe("Configuration testing for DPA Custom Resource", func() {
 			if len(dpa.Spec.Configuration.Velero.DefaultPlugins) > 0 {
 				log.Printf("Checking for default plugins")
 				for _, plugin := range dpa.Spec.Configuration.Velero.DefaultPlugins {
-					Eventually(DoesPluginExist(namespace, plugin), timeoutMultiplier*time.Minute*3, time.Second*5).Should(BeTrue())
+					Eventually(DoesPluginExist(namespace, plugin), timeoutMultiplier*time.Minute*6, time.Second*5).Should(BeTrue())
 				}
 			}
 
@@ -657,21 +657,23 @@ var _ = Describe("Configuration testing for DPA Custom Resource", func() {
 			if len(dpa.Spec.Configuration.Velero.CustomPlugins) > 0 {
 				log.Printf("Checking for custom plugins")
 				for _, plugin := range dpa.Spec.Configuration.Velero.CustomPlugins {
-					Eventually(DoesCustomPluginExist(namespace, plugin), timeoutMultiplier*time.Minute*3, time.Second*5).Should(BeTrue())
+					Eventually(DoesCustomPluginExist(namespace, plugin), timeoutMultiplier*time.Minute*6, time.Second*5).Should(BeTrue())
 				}
 			}
-
+			
+			log.Printf("Waiting for restic daemonset to have nodeselector")
 			if dpa.Spec.Configuration.Restic != nil && dpa.Spec.Configuration.Restic.PodConfig != nil {
 				for key, value := range dpa.Spec.Configuration.Restic.PodConfig.NodeSelector {
 					log.Printf("Waiting for restic daemonset to get node selector")
-					Eventually(ResticDaemonSetHasNodeSelector(namespace, key, value), timeoutMultiplier*time.Minute*3, time.Second*5).Should(BeTrue())
+					Eventually(ResticDaemonSetHasNodeSelector(namespace, key, value), timeoutMultiplier*time.Minute*6, time.Second*5).Should(BeTrue())
 				}
 			}
 			// wait at least 1 minute after reconciled
 			Eventually(func() bool {
 				//has it been at least 1 minute since reconciled?
+				log.Printf("Waiting for 1 minute after reconciled: %v elapsed", time.Since(timeReconciled).String())
 				return time.Now().After(timeReconciled.Add(time.Minute))
-			}, timeoutMultiplier*time.Minute*3, time.Second).Should(BeTrue())
+			}, timeoutMultiplier*time.Minute*5, time.Second*5).Should(BeTrue())
 			adpLogsAfterOneMinute, err := GetOpenShiftADPLogs(dpaCR.Namespace)
 			Expect(err).NotTo(HaveOccurred())
 			// We expect adp logs to be the same after 1 minute

tests/e2e/lib/subscription_helpers.go

@@ -35,12 +35,33 @@ func (d *DpaCustomResource) GetOperatorSubscription() (*Subscription, error) {
 	return &Subscription{&sl.Items[0]}, nil
 }
 
+func (s *Subscription) Refresh() error {
+	cfg, err := config.GetConfig()
+	if err != nil {
+		return err
+	}
+	c, err := client.New(cfg, client.Options{})
+	if err != nil {
+		return err
+	}
+	return c.Get(context.Background(), types.NamespacedName{Namespace: s.Namespace, Name: s.Name}, s.Subscription)
+}
+
 func (s *Subscription) getCSV() (*operators.ClusterServiceVersion, error) {
+	err := s.Refresh()
+	if err != nil {
+		return nil, err
+	}
+
 	client, err := client.New(config.GetConfigOrDie(), client.Options{})
 	if err != nil {
 		return nil, err
 	}
 	var installPlan operators.InstallPlan
+
+	if s.Status.InstallPlanRef == nil {
+		return nil, errors.New("no install plan found in subscription")
+	}
 	err = client.Get(context.Background(), types.NamespacedName{Namespace: s.Namespace, Name: s.Status.InstallPlanRef.Name}, &installPlan)
 	if err != nil {
 		return nil, err
@@ -59,6 +80,7 @@ func (s *Subscription) CsvIsReady() bool {
 		log.Printf("Error getting CSV: %v", err)
 		return false
 	}
+	log.Default().Printf("CSV status phase: %v", csv.Status.Phase)
 	return csv.Status.Phase == operators.CSVPhaseSucceeded
 }
 func (s *Subscription) CsvIsInstalling() bool {