fix(e2e-523): inital commit - fixing e2e/system tests - WIP

e2e/system/file_test_image_cached_test.go

@@ -3,20 +3,28 @@
 import (
 	"context"
 	"fmt"
+	"strings"
 	"sync"
+	"time"
 
 	"github.com/celestiaorg/knuu/pkg/instance"
 )
 
 func (s *Suite) TestFileCached() {
-	const namePrefix = "file-cached"
+	const (
+		namePrefix        = "file-cached"
+		numberOfInstances = 10
+		maxRetries        = 3
+	)
 	s.T().Parallel()
+
 	// Setup
-	ctx := context.Background()
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
+	defer cancel()
+
 	executor, err := s.Executor.NewInstance(ctx, namePrefix+"-executor")
 	s.Require().NoError(err)
 
-	const numberOfInstances = 10
 	instances := make([]*instance.Instance, numberOfInstances)
 
 	instanceName := func(i int) string {
@@ -32,8 +40,9 @@
 		wgFolders.Add(1)
 		go func(i int, instance *instance.Instance) {
 			defer wgFolders.Done()
-			// adding the folder after the Commit, it will help us to use a cached image.
-			err = instance.AddFile(resourcesHTML+"/index.html", nginxHTMLPath+"/index.html", "0:0")
+			err := s.retryOperation(func() error {
+				return instance.AddFile(resourcesHTML+"/index.html", nginxHTMLPath+"/index.html", "0:0")
+			}, maxRetries)
 			s.Require().NoError(err, "adding file to '%v'", instanceName(i))
 		}(i, ins)
 	}
@@ -49,19 +58,40 @@
 
 	// Test logic
 	for _, i := range instances {
-		s.Require().NoError(i.Commit())
-		s.Require().NoError(i.StartAsync(ctx))
+		err := s.retryOperation(func() error {
+			if err := i.Commit(); err != nil {
+				return fmt.Errorf("committing instance: %w", err)
+			}
+			if err := i.StartAsync(ctx); err != nil {
+				return fmt.Errorf("starting instance: %w", err)
+			}
+			return nil
+		}, maxRetries)
+		s.Require().NoError(err)
 	}
 
 	for _, i := range instances {
-		webIP, err := i.GetIP(ctx)
-		s.Require().NoError(err)
+		err := retryOperation(func() error {
+			webIP, err := i.GetIP(ctx)
+			if err != nil {
+				return fmt.Errorf("getting IP: %w", err)
+			}
 
-		s.Require().NoError(i.WaitInstanceIsRunning(ctx))
+			if err := i.WaitInstanceIsRunning(ctx); err != nil {
+				return fmt.Errorf("waiting for instance to run: %w", err)
+			}
 
-		wget, err := executor.ExecuteCommand(ctx, "wget", "-q", "-O", "-", webIP)
-		s.Require().NoError(err)
+			wget, err := executor.ExecuteCommand(ctx, "wget", "-q", "-O", "-", webIP)
+			if err != nil {
+				return fmt.Errorf("executing wget: %w", err)
+			}
+
+			if !strings.Contains(wget, "Hello World!") {
+				return fmt.Errorf("expected 'Hello World!' in response, got: %s", wget)
+			}
 
-		s.Assert().Contains(wget, "Hello World!")
+			return nil
+		}, maxRetries)
+		s.Require().NoError(err)
 	}
 }

e2e/system/files_to_volumes_cm_test.go

@@ -5,49 +5,13 @@
 	"fmt"
 	"strings"
 	"sync"
+	"time"
 
 	"k8s.io/apimachinery/pkg/api/resource"
 
 	"github.com/celestiaorg/knuu/pkg/instance"
 )
 
-// TestOneVolumeNoFiles tests the scenario where we have one volume and no files.
-// the initContainer command that it generates looks like:
-// no initContainer command, as there is no volumes, nor files.
-func (s *Suite) TestNoVolumesNoFiles() {
-	const namePrefix = "no-volumes-no-files"
-	s.T().Parallel()
-	// Setup
-
-	ctx := context.Background()
-	executor, err := s.Executor.NewInstance(ctx, namePrefix+"-executor")
-	s.Require().NoError(err)
-
-	target := s.createNginxInstance(ctx, namePrefix+"-target")
-	s.Require().NoError(target.Commit())
-
-	// Cleanup
-	s.T().Cleanup(func() {
-		err := instance.BatchDestroy(ctx, executor, target)
-		if err != nil {
-			s.T().Logf("error destroying instance: %v", err)
-		}
-	})
-
-	// Test logic
-	s.Require().NoError(target.StartAsync(ctx))
-
-	webIP, err := target.GetIP(ctx)
-	s.Require().NoError(err)
-
-	s.Require().NoError(target.WaitInstanceIsRunning(ctx))
-
-	wget, err := executor.ExecuteCommand(ctx, "wget", "-q", "-O", "-", webIP)
-	s.Require().NoError(err)
-
-	s.Assert().Contains(wget, "Welcome to nginx!")
-}
-
 // TestOneVolumeNoFiles tests the scenario where we have one volume and no files.
 // the initContainer command that it generates looks like:
 // mkdir -p /knuu && if [ -d /opt/vol1 ] && [ \"$(ls -A /opt/vol1)\" ]; then cp -r /opt/vol1/* /knuu//opt/vol1 && chown -R 0:0 /knuu/* ;fi
@@ -213,18 +177,20 @@
 	}
 }
 
-// TestOneVolumeOneFile tests the scenario where we have one volume and one file.
+// TestOneVolumeTwoFiles tests the scenario where we have one volume and two files.
 // the initContainer command that it generates looks like:
 // mkdir -p /knuu && mkdir -p /knuu/usr/share/nginx/html && chmod -R 777 /knuu//usr/share/nginx/html && if [ -d /usr/share/nginx/html ] && [ \"$(ls -A /usr/share/nginx/html)\" ]; then cp -r /usr/share/nginx/html/* /knuu//usr/share/nginx/html && chown -R 0:0 /knuu/* ;fi
 func (s *Suite) TestOneVolumeTwoFiles() {
 	const (
 		namePrefix        = "one-volume-two-files"
 		numberOfInstances = 2
+		maxRetries        = 3
 	)
 	s.T().Parallel()
-	// Setup
 
-	ctx := context.Background()
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
+	defer cancel()
+
 	executor, err := s.Executor.NewInstance(ctx, namePrefix+"-executor")
 	s.Require().NoError(err)
 
@@ -240,12 +206,18 @@
 		wgFolders.Add(1)
 		go func(i *instance.Instance) {
 			defer wgFolders.Done()
-			// adding the folder after the Commit, it will help us to use a cached image.
-			err := i.AddFile(resourcesFileCMToFolder+"/test_1", nginxHTMLPath+"/index.html", "0:0")
-			s.Require().NoError(err, "adding file to '%v'", i.Name())
-
-			err = i.AddFile(resourcesFileCMToFolder+"/test_2", nginxHTMLPath+"/index-2.html", "0:0")
-			s.Require().NoError(err, "adding file to '%v'", i.Name())
+			err := s.retryOperation(func() error {
+				err := i.AddFile(resourcesFileCMToFolder+"/test_1", nginxHTMLPath+"/index.html", "0:0")
+				if err != nil {
+					return fmt.Errorf("adding file to '%v': %w", i.Name(), err)
+				}
+				err = i.AddFile(resourcesFileCMToFolder+"/test_2", nginxHTMLPath+"/index-2.html", "0:0")
+				if err != nil {
+					return fmt.Errorf("adding file to '%v': %w", i.Name(), err)
+				}
+				return nil
+			}, maxRetries)
+			s.Require().NoError(err)
 		}(i)
 	}
 	wgFolders.Wait()
@@ -260,8 +232,16 @@
 
 	// Test logic
 	for _, i := range instances {
-		s.Require().NoError(i.Commit())
-		s.Require().NoError(i.StartAsync(ctx))
+		err := retryOperation(func() error {
+			if err := i.Commit(); err != nil {
+				return fmt.Errorf("committing instance: %w", err)
+			}
+			if err := i.StartAsync(ctx); err != nil {
+				return fmt.Errorf("starting instance: %w", err)
+			}
+			return nil
+		}, maxRetries)
+		s.Require().NoError(err)
 	}
 
 	for _, i := range instances {

e2e/system/utils.go

@@ -0,0 +1,18 @@
+package system
+
+import (
+	"fmt"
+	"time"
+)
+
+func retryOperation(operation func() error, maxRetries int) error {
+	var err error
+	for i := 0; i < maxRetries; i++ {
+		err = operation()
+		if err == nil {
+			return nil
+		}
+		time.Sleep(time.Second * time.Duration(i+1))
+	}
+	return fmt.Errorf("operation failed after %d retries: %w", maxRetries, err)
+}