Use v1.20.1 for both init and deploy in middleware update test

The middleware update test was failing because:
- InitializeRepoWithFunction() used current func CLI to init the repo
- Current func CLI creates new instance-based template structure
- Old func CLI (v1.20.0) couldn't understand the new template format
- This caused buildpack lifecycle failures (status code 51)

Solution:
- Add InitializeRepoWithFunctionVersion() to allow specifying func CLI version
- Use v1.20.1 for both 'func init' and 'func deploy' to ensure compatibility
- v1.20.1 still doesn't have middleware-version label (added in v1.21.0),
  so it's suitable for testing the middleware update functionality

Author: creydr

.github/workflows/test-e2e-bundle.yml

@@ -4,6 +4,10 @@ on:
   push:
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test-bundle-e2e:
     name: Bundle E2E Tests

.github/workflows/test-e2e.yml

@@ -4,6 +4,10 @@ on:
   push:
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test-e2e:
     name: E2E Tests

test/e2e/func_middleware_update_test.go

@@ -58,17 +58,19 @@ var _ = Describe("Middleware Update", func() {
 			Expect(err).NotTo(HaveOccurred())
 			DeferCleanup(cleanup)
 
-			// Initialize repository with function code
-			repoDir, err = utils.InitializeRepoWithFunction(repoURL, username, password, "go")
-			Expect(err).NotTo(HaveOccurred())
-			DeferCleanup(os.RemoveAll, repoDir)
-
 			functionNamespace, err = utils.GetTestNamespace()
 			Expect(err).NotTo(HaveOccurred())
 			DeferCleanup(cleanupNamespaces, functionNamespace)
 
-			// Deploy function using OLD func CLI version
-			out, err := utils.RunFuncWithVersion("v1.20.0", "deploy",
+			// Initialize repository with function code using OLD func CLI version
+			// v1.20.1 has no middleware-version label and uses instance-compatible templates
+			oldFuncVersion := "v1.20.1"
+			repoDir, err = utils.InitializeRepoWithFunctionVersion(repoURL, username, password, "go", oldFuncVersion)
+			Expect(err).NotTo(HaveOccurred())
+			DeferCleanup(os.RemoveAll, repoDir)
+
+			// Deploy function using the same OLD func CLI version
+			out, err := utils.RunFuncWithVersion(oldFuncVersion, "deploy",
 				"--namespace", functionNamespace,
 				"--path", repoDir,
 				"--registry", registry,
@@ -119,7 +121,7 @@ var _ = Describe("Middleware Update", func() {
 			// We use skopeo with localhost:5001 (port-forward to the registry) to
 			// directly inspect the OCI image labels and verify the middleware was updated.
 
-			// Get initial image digest from func describe (deployed with old v1.20.0)
+			// Get initial image digest from func describe (deployed with v1.20.1)
 			out, err := utils.RunFunc("describe", deployedFunctionName, "-n", functionNamespace, "-o", "yaml")
 			Expect(err).NotTo(HaveOccurred())
 
@@ -129,9 +131,9 @@ var _ = Describe("Middleware Update", func() {
 
 			initialImage := initialInstance.Image
 			Expect(initialImage).NotTo(BeEmpty(), "Initial image should be available from func describe")
-			_, _ = fmt.Fprintf(GinkgoWriter, "Initial image (deployed with v1.20.0): %s\n", initialImage)
+			_, _ = fmt.Fprintf(GinkgoWriter, "Initial image (deployed with v1.20.1): %s\n", initialImage)
 
-			// Verify initial image has no middleware-version label (old func CLI)
+			// Verify initial image has no middleware-version label (v1.20.1 doesn't set it)
 			initialImageLocal := strings.Replace(initialImage, "kind-registry:5000", "localhost:5001", 1)
 			// Remove tag if both tag and digest are present (skopeo doesn't support this format)
 			if strings.Contains(initialImageLocal, "@") {
@@ -160,7 +162,7 @@ var _ = Describe("Middleware Update", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			initialMiddlewareVersion := initialImageLabels.Labels["middleware-version"]
-			_, _ = fmt.Fprintf(GinkgoWriter, "Initial middleware-version label: '%s' (expected empty for v1.20.0)\n",
+			_, _ = fmt.Fprintf(GinkgoWriter, "Initial middleware-version label: '%s' (expected empty for v1.20.1)\n",
 				initialMiddlewareVersion)
 
 			// Create a Function resource

test/utils/git.go

@@ -33,13 +33,24 @@ func buildAuthURL(repoURL, username, password string) string {
 
 // InitializeRepoWithFunction creates a function project and pushes it to the Gitea repo
 func InitializeRepoWithFunction(repoURL, username, password, language string) (repoDir string, err error) {
+	return InitializeRepoWithFunctionVersion(repoURL, username, password, language, "")
+}
+
+// InitializeRepoWithFunctionVersion creates a function project with a specific func CLI version
+// If version is empty, uses the current func CLI
+func InitializeRepoWithFunctionVersion(repoURL, username, password, language, version string) (repoDir string, err error) {
 	repoDir = fmt.Sprintf("%s/func-test-%s", os.TempDir(), rand.String(10))
 
 	// Build authenticated URL
 	authURL := buildAuthURL(repoURL, username, password)
 
 	// Initialize function (func init creates the directory)
-	if _, err = RunFunc("init", "-l", language, repoDir); err != nil {
+	if version == "" {
+		_, err = RunFunc("init", "-l", language, repoDir)
+	} else {
+		_, err = RunFuncWithVersion(version, "init", "-l", language, repoDir)
+	}
+	if err != nil {
 		return "", fmt.Errorf("failed to init function: %w", err)
 	}