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

.github/workflows/knuu_testing.yml

@@ -18,7 +18,7 @@ jobs:
           - pkg: "./e2e/basic"
             timeout: 15m
           - pkg: "./e2e/system"
-            timeout: 15m
+            timeout: 30m
           - pkg: "./e2e/netshaper"
             timeout: 60m
     runs-on: ubuntu-latest

e2e/basic/basic_test.go

@@ -24,12 +24,6 @@ func (ts *TestSuite) TestBasic() {
 	ts.Require().NoError(target.Build().SetStartCommand("sleep", "infinity"))
 	ts.Require().NoError(target.Build().Commit(ctx))
 
-	ts.T().Cleanup(func() {
-		if err := target.Execution().Destroy(ctx); err != nil {
-			ts.T().Logf("error destroying instance: %v", err)
-		}
-	})
-
 	// Test Logic
 	ts.Require().NoError(target.Execution().Start(ctx))
 

e2e/netshaper/netshaper_test.go

@@ -9,7 +9,6 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/celestiaorg/knuu/pkg/instance"
 	"github.com/celestiaorg/knuu/pkg/sidecars/netshaper"
 )
 
@@ -47,14 +46,6 @@ func (s *Suite) TestNetShaperBandwidth() {
 	btSidecar := netshaper.New()
 	s.Require().NoError(iperfServer.Sidecars().Add(ctx, btSidecar))
 
-	s.T().Cleanup(func() {
-		s.T().Log("Tearing down TestNetShaperBandwidth test...")
-		err := instance.BatchDestroy(ctx, iperfServer, iperfClient)
-		if err != nil {
-			s.T().Logf("error destroying instances: %v", err)
-		}
-	})
-
 	// Prepare iperf client & server
 
 	s.Require().NoError(iperfServer.Execution().Start(ctx))
@@ -156,14 +147,6 @@ func (s *Suite) TestNetShaperPacketloss() {
 	executor, err := mother.CloneWithName("executor")
 	s.Require().NoError(err)
 
-	s.T().Cleanup(func() {
-		s.T().Log("Tearing down TestNetShaperPacketloss test...")
-		err := instance.BatchDestroy(ctx, executor, target)
-		if err != nil {
-			s.T().Logf("error destroying instances: %v", err)
-		}
-	})
-
 	// Prepare ping executor & target
 
 	s.Require().NoError(target.Execution().Start(ctx))
@@ -259,14 +242,6 @@ func (s *Suite) TestNetShaperLatency() {
 	executor, err := mother.CloneWithName("executor")
 	s.Require().NoError(err)
 
-	s.T().Cleanup(func() {
-		s.T().Log("Tearing down TestNetShaperLatency test...")
-		err := instance.BatchDestroy(ctx, executor, target)
-		if err != nil {
-			s.T().Logf("error destroying instances: %v", err)
-		}
-	})
-
 	// Prepare ping executor & target
 
 	s.Require().NoError(target.Execution().Start(ctx))
@@ -369,14 +344,6 @@ func (s *Suite) TestNetShaperJitter() {
 	executor, err := mother.CloneWithName("executor")
 	s.Require().NoError(err)
 
-	s.T().Cleanup(func() {
-		s.T().Log("Tearing down TestNetShaperJitter test...")
-		err := instance.BatchDestroy(ctx, executor, target)
-		if err != nil {
-			s.T().Logf("error destroying instances: %v", err)
-		}
-	})
-
 	// Prepare ping executor & target
 
 	s.Require().NoError(target.Execution().Start(ctx))

e2e/system/build_from_git_test.go

@@ -7,85 +7,90 @@ import (
 	"github.com/celestiaorg/knuu/pkg/builder"
 )
 
+const (
+	gitRepo   = "https://github.com/celestiaorg/knuu.git"
+	gitBranch = "test/build-from-git" // This branch has a Dockerfile and is protected as to not be deleted
+)
+
 func (s *Suite) TestBuildFromGit() {
 	const namePrefix = "build-from-git"
-	s.T().Parallel()
 
 	// Setup
 	ctx := context.Background()
 
+	s.T().Log("Creating new instance")
 	target, err := s.Knuu.NewInstance(namePrefix)
-	s.Require().NoError(err)
+	s.Require().NoError(err, "Error creating new instance")
 
 	s.T().Log("Building the image")
 
 	// This is a blocking call which builds the image from git repo
 	err = target.Build().SetGitRepo(ctx, builder.GitContext{
-		Repo:     "https://github.com/celestiaorg/knuu.git",
-		Branch:   "test/build-from-git", // This branch has a Dockerfile and is protected as to not be deleted
+		Repo:     gitRepo,
+		Branch:   gitBranch,
 		Username: "",
 		Password: "",
 	})
-	s.Require().NoError(err)
-
+	s.Require().NoError(err, "Error setting git repo")
 	s.T().Log("Image built")
 
-	s.T().Cleanup(func() {
-		if err := target.Execution().Destroy(ctx); err != nil {
-			s.T().Logf("Error cleaning up knuu: %v", err)
-		}
-	})
-
 	s.Require().NoError(target.Build().Commit(ctx))
 
 	s.T().Logf("Starting instance")
 	s.Require().NoError(target.Execution().Start(ctx))
 
-	s.T().Logf("Instance started")
+	s.T().Log("Instance started")
 
+	s.T().Log("Getting file bytes")
 	// The file is created by the dockerfile in the repo,
 	// so to make sure it is built correctly, we check the file
 	data, err := target.Storage().GetFileBytes(ctx, "/test.txt")
 	s.Require().NoError(err)
 
 	data = []byte(strings.TrimSpace(string(data)))
-	s.Assert().Equal([]byte("Hello, World!"), data, "File bytes do not match")
+	s.Assert().Equal([]byte("Hello, World!"), data, "file bytes do not match.")
 }
+
 func (s *Suite) TestBuildFromGitWithModifications() {
-	const namePrefix = "build-from-git-with-modifications"
-	s.T().Parallel()
+	const (
+		namePrefix = "build-from-git-with-modifications"
+		maxRetries = 3
+	)
 
 	// Setup
+	ctx := context.Background()
+
+	s.T().Log("Creating new instance")
 	target, err := s.Knuu.NewInstance(namePrefix)
 	s.Require().NoError(err)
 
-	ctx := context.Background()
-	// This is a blocking call which builds the image from git repo
-	err = target.Build().SetGitRepo(ctx, builder.GitContext{
-		Repo:     "https://github.com/celestiaorg/knuu.git",
-		Branch:   "test/build-from-git", // This branch has a Dockerfile and is protected as to not be deleted
-		Username: "",
-		Password: "",
-	})
+	s.T().Log("Setting git repo")
+	err = s.retryOperation(func() error {
+		return target.Build().SetGitRepo(ctx, builder.GitContext{
+			Repo:     gitRepo,
+			Branch:   gitBranch,
+			Username: "",
+			Password: "",
+		})
+	}, maxRetries)
 	s.Require().NoError(err)
 
 	s.Require().NoError(target.Build().SetStartCommand("sleep", "infinity"))
 
-	err = target.Storage().AddFileBytes([]byte("Hello, world!"), "/home/hello.txt", "root:root")
-	s.Require().NoError(err, "Error adding file")
+	const (
+		filePath     = "/home/hello.txt"
+		expectedData = "Hello, world!"
+	)
 
-	s.Require().NoError(target.Build().Commit(ctx))
+	err = target.Storage().AddFileBytes([]byte(expectedData), filePath, "root:root")
+	s.Require().NoError(err)
 
-	s.T().Cleanup(func() {
-		if err := target.Execution().Destroy(ctx); err != nil {
-			s.T().Logf("Error cleaning up knuu: %v", err)
-		}
-	})
+	s.Require().NoError(target.Build().Commit(ctx))
 
 	s.Require().NoError(target.Execution().Start(ctx))
 
-	data, err := target.Storage().GetFileBytes(ctx, "/home/hello.txt")
-	s.Require().NoError(err, "Error getting file bytes")
+	gotData, err := target.Storage().GetFileBytes(ctx, filePath)
+	s.Require().NoError(err)
 
-	s.Assert().Equal([]byte("Hello, world!"), data, "File bytes do not match")
+	s.Assert().Equal([]byte(expectedData), gotData, "file bytes do not match.")
 }

e2e/system/env_to_json_test.go

@@ -15,8 +15,6 @@ func (s *Suite) TestEnvToJSON() {
 		numberOfInstances = 2
 	)
 
-	s.T().Parallel()
-
 	// Setup
 	ctx := context.Background()
 	executor, err := s.Executor.NewInstance(ctx, namePrefix+"-executor")
@@ -61,14 +59,6 @@ func (s *Suite) TestEnvToJSON() {
 		instances[i] = ins
 	}
 
-	s.T().Cleanup(func() {
-		all := append(instances, executor)
-		err := instance.BatchDestroy(ctx, all...)
-		if err != nil {
-			s.T().Logf("error destroying instances: %v", err)
-		}
-	})
-
 	// Test logic
 	for _, i := range instances {
 		webIP, err := i.Network().GetIP(ctx)

e2e/system/external_file_test.go

@@ -5,13 +5,10 @@ import (
 	"io"
 	"os"
 	"path/filepath"
-
-	"github.com/celestiaorg/knuu/pkg/instance"
 )
 
 func (s *Suite) TestExternalFile() {
 	const namePrefix = "external-file"
-	s.T().Parallel()
 	// Setup
 
 	ctx := context.Background()
@@ -43,13 +40,6 @@ func (s *Suite) TestExternalFile() {
 
 	s.Require().NoError(server.Build().Commit(ctx))
 
-	s.T().Cleanup(func() {
-		err := instance.BatchDestroy(ctx, executor, server)
-		if err != nil {
-			s.T().Logf("error destroying instance: %v", err)
-		}
-	})
-
 	// Test logic
 	serverIP, err := server.Network().GetIP(ctx)
 	s.Require().NoError(err)