Run e2e tests as matrix for builder & deployer combintation

Author: creydr

.github/workflows/test-e2e.yml

@@ -11,8 +11,13 @@ concurrency:
 
 jobs:
   test-e2e:
-    name: E2E Tests
+    name: E2E Tests (${{ matrix.builder }}/${{ matrix.deployer }})
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        builder: [pack, s2i]
+        deployer: [knative, raw, keda]
     steps:
       - name: Clone the code
         uses: actions/checkout@v4
@@ -50,4 +55,6 @@ jobs:
         env:
           REGISTRY_INSECURE: true
           REGISTRY: kind-registry:5000
+          DEFAULT_BUILDER: ${{ matrix.builder }}
+          DEFAULT_DEPLOYER: ${{ matrix.deployer }}
         run: make test-e2e

test/e2e/func_middleware_update_test.go

@@ -76,11 +76,9 @@ var _ = Describe("Middleware Update", func() {
 			DeferCleanup(os.RemoveAll, repoDir)
 
 			// Deploy function using the same OLD func CLI version
-			out, err := utils.RunFuncWithVersion(oldFuncVersion, "deploy",
-				"--namespace", functionNamespace,
-				"--path", repoDir,
-				"--registry", utils.Registry(),
-				fmt.Sprintf("--registry-insecure=%t", utils.IsRegistryInsecure()))
+			out, err := utils.RunFuncDeploy(repoDir,
+				utils.WithNamespace(functionNamespace),
+				utils.WithDeployCliVersion(oldFuncVersion))
 			Expect(err).NotTo(HaveOccurred())
 			_, _ = fmt.Fprint(GinkgoWriter, out)
 

test/utils/func.go

@@ -33,12 +33,27 @@ func RunFunc(command string, args ...string) (string, error) {
 	return Run(cmd)
 }
 
+// RunFuncWithVersion executes the func CLI with a specific version
+// It downloads and caches the version if not already present
+func RunFuncWithVersion(version string, command string, args ...string) (string, error) {
+	funcBinary, err := ensureFuncVersion(version)
+	if err != nil {
+		return "", err
+	}
+
+	allArgs := append([]string{command}, args...)
+	cmd := exec.Command(funcBinary, allArgs...)
+	return Run(cmd)
+}
+
 // RunFuncDeploy runs func deploy
 func RunFuncDeploy(functionDir string, optFns ...FuncDeployOption) (string, error) {
 	opts := &FuncDeployOptions{
 		// defaults
 		Registry:         Registry(),
 		RegistryInsecure: IsRegistryInsecure(),
+		Builder:          os.Getenv("DEFAULT_BUILDER"),
+		Deployer:         os.Getenv("DEFAULT_DEPLOYER"),
 	}
 
 	for _, optFn := range optFns {
@@ -63,20 +78,11 @@ func RunFuncDeploy(functionDir string, optFns ...FuncDeployOption) (string, erro
 		args = append(args, "--deployer", opts.Deployer)
 	}
 
-	return RunFunc("deploy", args...)
-}
-
-// RunFuncWithVersion executes the func CLI with a specific version
-// It downloads and caches the version if not already present
-func RunFuncWithVersion(version string, command string, args ...string) (string, error) {
-	funcBinary, err := ensureFuncVersion(version)
-	if err != nil {
-		return "", err
+	if opts.CliVersion != "" {
+		return RunFuncWithVersion(opts.CliVersion, "deploy", args...)
 	}
 
-	allArgs := append([]string{command}, args...)
-	cmd := exec.Command(funcBinary, allArgs...)
-	return Run(cmd)
+	return RunFunc("deploy", args...)
 }
 
 type FuncDeployOptions struct {
@@ -85,6 +91,7 @@ type FuncDeployOptions struct {
 	Namespace        string
 	Builder          string
 	Deployer         string
+	CliVersion       string
 }
 
 type FuncDeployOption func(*FuncDeployOptions)
@@ -107,6 +114,12 @@ func WithDeployer(deployer string) FuncDeployOption {
 	}
 }
 
+func WithDeployCliVersion(version string) FuncDeployOption {
+	return func(opts *FuncDeployOptions) {
+		opts.CliVersion = version
+	}
+}
+
 // ensureFuncVersion ensures the specified func version is available and returns its path
 func ensureFuncVersion(version string) (string, error) {
 	projectDir, err := GetProjectDir()