From 77b06f997e48083da9830316a24154d84c8297b1 Mon Sep 17 00:00:00 2001
From: Jan Nanista <jan.jakub.nanista@gmail.com>
Date: Tue, 29 Apr 2025 12:19:10 -0700
Subject: [PATCH 1/3] fix: Fix k8s pipeline configuration

---
 .github/workflows/per-pr.yml                      |  5 +++++
 .../{run-k8s.yml => reusable-run-k8s.yml}         |  9 +--------
 .github/workflows/scheduled-k8s.yml               | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 8 deletions(-)
 rename .github/workflows/{run-k8s.yml => reusable-run-k8s.yml} (94%)
 create mode 100644 .github/workflows/scheduled-k8s.yml

diff --git a/.github/workflows/per-pr.yml b/.github/workflows/per-pr.yml
index d668b97a..232cdb63 100644
--- a/.github/workflows/per-pr.yml
+++ b/.github/workflows/per-pr.yml
@@ -43,6 +43,11 @@ jobs:
       - name: Run Starlark
         run: kurtosis run ${{ github.workspace }} --verbosity detailed
 
+  run_k8s_test:
+    name: Run k8s tests
+    uses: ./.github/workflows/reusable-run-k8s.yml
+    secrets: inherit
+  
   lint:
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/run-k8s.yml b/.github/workflows/reusable-run-k8s.yml
similarity index 94%
rename from .github/workflows/run-k8s.yml
rename to .github/workflows/reusable-run-k8s.yml
index 9a472531..a47a94a9 100644
--- a/.github/workflows/run-k8s.yml
+++ b/.github/workflows/reusable-run-k8s.yml
@@ -1,14 +1,7 @@
 name: Run k8s test
 
 on:
-  pull_request:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 2 * * *'
-
-concurrency:
-  group: "scheduled-test"
-  cancel-in-progress: false
+  workflow_call:
 
 jobs:
   run_k8s_test:
diff --git a/.github/workflows/scheduled-k8s.yml b/.github/workflows/scheduled-k8s.yml
new file mode 100644
index 00000000..d98851ce
--- /dev/null
+++ b/.github/workflows/scheduled-k8s.yml
@@ -0,0 +1,15 @@
+name: Run k8s test
+
+on:
+  schedule:
+    - cron: '0 2 * * *'
+
+concurrency:
+  group: "scheduled-test"
+  cancel-in-progress: false
+
+jobs:
+  run_k8s_test:
+    name: Run k8s tests
+    uses: ./.github/workflows/reusable-run-k8s.yml
+    secrets: inherit
\ No newline at end of file

From 7841272448a742e8637f2455ba27cafeb29bbbb8 Mon Sep 17 00:00:00 2001
From: Jan Nanista <jan.jakub.nanista@gmail.com>
Date: Tue, 29 Apr 2025 12:23:06 -0700
Subject: [PATCH 2/3] chore: Add nice names

---
 .github/workflows/per-pr.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/per-pr.yml b/.github/workflows/per-pr.yml
index 232cdb63..d7736d35 100644
--- a/.github/workflows/per-pr.yml
+++ b/.github/workflows/per-pr.yml
@@ -9,6 +9,7 @@ concurrency:
 
 jobs:
   run_with_args:
+    name: Run kurtosis with arguments
     strategy:
       matrix:
         file_name:
@@ -28,6 +29,7 @@ jobs:
 
   # Make sure that `kurtosis run .` without an --args-file works fine (the defaults in input_parser.star are correct)
   run_without_args:
+    name: Run kurtosis without arguments
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
@@ -49,6 +51,7 @@ jobs:
     secrets: inherit
   
   lint:
+    name: Lint
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
@@ -61,6 +64,7 @@ jobs:
         run: kurtosis lint ${{ github.workspace }}
 
   test:
+    name: Unit tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository

From 6e36b398d060aa248b4b926a4d06a9bb20b224ae Mon Sep 17 00:00:00 2001
From: Jan Nanista <jan.jakub.nanista@gmail.com>
Date: Tue, 29 Apr 2025 12:37:35 -0700
Subject: [PATCH 3/3] chore: Concurrency

---
 .github/workflows/conventional-pr-title-checker.yml | 2 +-
 .github/workflows/per-pr.yml                        | 2 +-
 .github/workflows/release-please.yml                | 4 ++++
 .github/workflows/scheduled-k8s.yml                 | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/conventional-pr-title-checker.yml b/.github/workflows/conventional-pr-title-checker.yml
index 754ab048..96e10838 100644
--- a/.github/workflows/conventional-pr-title-checker.yml
+++ b/.github/workflows/conventional-pr-title-checker.yml
@@ -10,7 +10,7 @@ on:
 
 # cancel redundant builds
 concurrency:
-  group: "title-checker-${{ github.head_ref }}"
+  group: "${{ github.workflow_ref }}-${{ github.head_ref }}"
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/per-pr.yml b/.github/workflows/per-pr.yml
index d7736d35..5eb7b9d7 100644
--- a/.github/workflows/per-pr.yml
+++ b/.github/workflows/per-pr.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
 
 concurrency:
-  group: "tests-${{ github.head_ref }}"
+  group: "${{ github.workflow_ref }}-${{ github.head_ref }}"
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index 32a7a761..58c01e7d 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -9,6 +9,10 @@ permissions:
 
 name: release-please
 
+concurrency:
+  group: ${{ github.workflow_ref }}
+  cancel-in-progress: false
+
 jobs:
   release-please:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/scheduled-k8s.yml b/.github/workflows/scheduled-k8s.yml
index d98851ce..709b3d70 100644
--- a/.github/workflows/scheduled-k8s.yml
+++ b/.github/workflows/scheduled-k8s.yml
@@ -5,7 +5,7 @@ on:
     - cron: '0 2 * * *'
 
 concurrency:
-  group: "scheduled-test"
+  group: ${{ github.workflow_ref }}
   cancel-in-progress: false
 
 jobs: