From 8f534ccc1eb7d5b59a9014947374bc6d0c951a8f Mon Sep 17 00:00:00 2001
From: Miguel Angel Ajo Pelayo <miguelangel@ajo.es>
Date: Thu, 8 May 2025 13:54:11 +0200
Subject: [PATCH 1/2] Add E2E testing support for release branches

(cherry picked from commit dc3c43d8f89581a77f0a0eef38048a2ce8a50876)
---
 .github/workflows/e2e.yaml     | 5 +++--
 .github/workflows/lint.yaml    | 4 +++-
 .github/workflows/pr-kind.yaml | 1 +
 .github/workflows/test.yaml    | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 58690ddb..495c94cd 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -4,7 +4,7 @@ on:
   pull_request:
     branches:
       - main
-
+      - 'release-*'
 jobs:
   e2e-tests:
     strategy:
@@ -17,7 +17,8 @@ jobs:
       - uses: jumpstarter-dev/jumpstarter-e2e@main
         with:
           controller-ref: ${{ github.ref }}
-          jumpstarter-ref: main
+          # use the matching branch on the jumpstarter repo
+          jumpstarter-ref: ${{ github.event.pull_request.base.ref }}
   e2e-tests-28d6b1cc3b49ab9ae176918ab9709a2e2522c97e:
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index ba9a331a..c55af737 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -4,9 +4,11 @@ on:
   push:
     branches:
       - main
+      - 'release-*'
   pull_request:
     branches:
       - main
+      - 'release-*'
 
 jobs:
   lint-helm:
@@ -34,4 +36,4 @@ jobs:
           go-version: 1.22
 
       - name: Run go linter
-        run: make lint
\ No newline at end of file
+        run: make lint
diff --git a/.github/workflows/pr-kind.yaml b/.github/workflows/pr-kind.yaml
index 2d1e06d8..d27ff2e7 100644
--- a/.github/workflows/pr-kind.yaml
+++ b/.github/workflows/pr-kind.yaml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - 'release-*'
 
 jobs:
   deploy-kind:
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 7c0f3ebe..e6e356e3 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - 'release-*'
 
 jobs:
   tests:

From dd154470b9313481b1fa27a2ce525c42a5819ee8 Mon Sep 17 00:00:00 2001
From: Miguel Angel Ajo Pelayo <majopela@redhat.com>
Date: Thu, 8 May 2025 14:10:43 +0200
Subject: [PATCH 2/2] Update .github/workflows/e2e.yaml e2e release branch

---
 .github/workflows/e2e.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 495c94cd..fa699572 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -14,7 +14,7 @@ jobs:
           - ubuntu-24.04-arm
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: jumpstarter-dev/jumpstarter-e2e@main
+      - uses: jumpstarter-dev/jumpstarter-e2e@release-0.6
         with:
           controller-ref: ${{ github.ref }}
           # use the matching branch on the jumpstarter repo