From 81091863e7e02681b5951b211bbba69282d0a430 Mon Sep 17 00:00:00 2001
From: Jefferson Ramos <jrangelramos@gmail.com>
Date: Wed, 29 Jun 2022 10:35:30 -0300
Subject: [PATCH] test: explicit define builder for e2e tests tied to golang as
 test remote repo, config and envs (#1081)

---
 test/_e2e/cmd_build_test.go             | 6 +++++-
 test/_e2e/cmd_config_envs_test.go       | 2 ++
 test/_e2e/cmd_config_labels_test.go     | 2 ++
 test/_e2e/cmd_config_volumes_test.go    | 2 ++
 test/_e2e/config.go                     | 2 +-
 test/_e2e/e2e_remote_repository_test.go | 1 +
 test/_e2e/func_test_proj.go             | 2 ++
 7 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/test/_e2e/cmd_build_test.go b/test/_e2e/cmd_build_test.go
index 0e820eee..0ee5be86 100644
--- a/test/_e2e/cmd_build_test.go
+++ b/test/_e2e/cmd_build_test.go
@@ -15,7 +15,11 @@ import (
 // Build runs `func build' command for a given test project.
 func Build(t *testing.T, knFunc *TestShellCmdRunner, project *FunctionTestProject) {
 
-	result := knFunc.Exec("build", "--path", project.ProjectPath, "--registry", GetRegistry())
+	buildArgs := []string{"build", "--path", project.ProjectPath, "--registry", GetRegistry()}
+	if project.Builder != "" {
+		buildArgs = append(buildArgs, "--builder", project.Builder)
+	}
+	result := knFunc.Exec(buildArgs...)
 	if result.Error != nil {
 		t.Fail()
 	}
diff --git a/test/_e2e/cmd_config_envs_test.go b/test/_e2e/cmd_config_envs_test.go
index 3d57301d..6467d804 100644
--- a/test/_e2e/cmd_config_envs_test.go
+++ b/test/_e2e/cmd_config_envs_test.go
@@ -104,6 +104,7 @@ func TestConfigEnvs(t *testing.T) {
 	project.FunctionName = "test-config-envs"
 	project.ProjectPath = filepath.Join(os.TempDir(), project.FunctionName)
 	project.RemoteRepository = "http://github.com/boson-project/test-templates.git"
+	project.Builder = "pack"
 
 	Create(t, knFunc.TestShell, project)
 	defer func() { _ = project.RemoveProjectFolder() }()
@@ -164,6 +165,7 @@ func TestConfigEnvs(t *testing.T) {
 
 	// Deploy
 	knFunc.TestShell.WithEnv(testEnvName, testEnvValue)
+	Build(t, knFunc.TestShell, &project)
 	Deploy(t, knFunc.TestShell, &project)
 	defer Delete(t, knFunc.TestShell, &project)
 	ReadyCheck(t, knFunc.TestShell, project)
diff --git a/test/_e2e/cmd_config_labels_test.go b/test/_e2e/cmd_config_labels_test.go
index 4919b4ef..7cb72199 100644
--- a/test/_e2e/cmd_config_labels_test.go
+++ b/test/_e2e/cmd_config_labels_test.go
@@ -57,6 +57,7 @@ func TestConfigLabel(t *testing.T) {
 	project.Template = "http"
 	project.FunctionName = "test-config-labels"
 	project.ProjectPath = filepath.Join(os.TempDir(), project.FunctionName)
+	project.Builder = "pack"
 
 	Create(t, knFunc.TestShell, project)
 	defer func() { _ = project.RemoveProjectFolder() }()
@@ -75,6 +76,7 @@ func TestConfigLabel(t *testing.T) {
 
 	// Deploy
 	knFunc.TestShell.WithEnv(testEnvName, testEnvValue)
+	Build(t, knFunc.TestShell, &project)
 	Deploy(t, knFunc.TestShell, &project)
 	defer Delete(t, knFunc.TestShell, &project)
 
diff --git a/test/_e2e/cmd_config_volumes_test.go b/test/_e2e/cmd_config_volumes_test.go
index 290b1d90..a66d9e48 100644
--- a/test/_e2e/cmd_config_volumes_test.go
+++ b/test/_e2e/cmd_config_volumes_test.go
@@ -101,6 +101,7 @@ func TestConfigVolumes(t *testing.T) {
 	project.FunctionName = "test-config-volumes"
 	project.ProjectPath = filepath.Join(os.TempDir(), project.FunctionName)
 	project.RemoteRepository = "http://github.com/boson-project/test-templates.git"
+	project.Builder = "pack"
 
 	Create(t, knFunc.TestShell, project)
 	defer project.RemoveProjectFolder()
@@ -139,6 +140,7 @@ func TestConfigVolumes(t *testing.T) {
 	configVolumesRemove("/bad-cm", enter)
 
 	// Deploy
+	Build(t, knFunc.TestShell, &project)
 	Deploy(t, knFunc.TestShell, &project)
 	defer Delete(t, knFunc.TestShell, &project)
 	ReadyCheck(t, knFunc.TestShell, project)
diff --git a/test/_e2e/config.go b/test/_e2e/config.go
index 7a727db0..88fddd86 100644
--- a/test/_e2e/config.go
+++ b/test/_e2e/config.go
@@ -8,7 +8,7 @@ import (
 // Intended to provide setup configuration for E2E tests
 const (
 	defaultRegistry        = "localhost:50000/user"
-	testTemplateRepository = "http://github.com/lance/test-templates.git" //nolint:varcheck,deadcode
+	testTemplateRepository = "http://github.com/boson-project/test-templates.git" //nolint:varcheck,deadcode
 )
 
 // GetRegistry returns registry
diff --git a/test/_e2e/e2e_remote_repository_test.go b/test/_e2e/e2e_remote_repository_test.go
index fbd1e9ee..f6457a41 100644
--- a/test/_e2e/e2e_remote_repository_test.go
+++ b/test/_e2e/e2e_remote_repository_test.go
@@ -20,6 +20,7 @@ func TestRemoteRepository(t *testing.T) {
 	project.Template = "e2e"
 	project.FunctionName = "func-remote-repo"
 	project.ProjectPath = filepath.Join(os.TempDir(), project.FunctionName)
+	project.Builder = "pack"
 
 	result := knFunc.Exec("create", project.ProjectPath,
 		"--language", project.Runtime,
diff --git a/test/_e2e/func_test_proj.go b/test/_e2e/func_test_proj.go
index eef41817..7dc4c8fa 100644
--- a/test/_e2e/func_test_proj.go
+++ b/test/_e2e/func_test_proj.go
@@ -22,6 +22,8 @@ type FunctionTestProject struct {
 	Template string
 	// Git Location of a Remote Repository used to pull the template
 	RemoteRepository string
+	// Indicates which builder should be uses (i.e: pack|s2i)
+	Builder string
 	// Indicates function is already built
 	IsBuilt bool
 	// Indicates function is already deployed