From 91c5aab23a8270890db0271d7d1c9ced6f7ba771 Mon Sep 17 00:00:00 2001
From: Thuan Vo <thuan.votann@gmail.com>
Date: Wed, 17 Jul 2024 18:58:19 -0700
Subject: [PATCH] ci: combine test jobs into a single workflow

---
 .github/workflows/chart-test.yml | 20 +++++++++++++++-
 .github/workflows/unittest.yml   | 41 --------------------------------
 2 files changed, 19 insertions(+), 42 deletions(-)
 delete mode 100644 .github/workflows/unittest.yml

diff --git a/.github/workflows/chart-test.yml b/.github/workflows/chart-test.yml
index 1552d3b6..36140df8 100644
--- a/.github/workflows/chart-test.yml
+++ b/.github/workflows/chart-test.yml
@@ -26,7 +26,7 @@ on:
       - cryostat-v[0-9]+.[0-9]+
 
 jobs:
-  test-chart:
+  helm-test:
     runs-on: ubuntu-latest
     env:
       TARGET_BRANCH: ${{ github.event.pull_request.base.ref || github.ref_name }}
@@ -62,3 +62,21 @@ jobs:
 
         kubectl create ns $TEST_NAMESPACE
         ct install --target-branch ${TARGET_BRANCH} --upgrade --namespace=$TEST_NAMESPACE --config ct.yaml --debug
+
+  helm-unittests:
+    runs-on: ubuntu-latest
+    steps:
+      - name: fail if safe-to-test label NOT applied
+        if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'safe-to-test') }}
+        run: exit 1
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Set up Helm
+        uses: azure/setup-helm@v4
+        with:
+          version: v3.14.4
+      - name: Install unit test plugin
+        run: helm plugin install https://github.com/helm-unittest/helm-unittest.git --version v0.5.1
+      - name: Run Helm unit tests
+        run: helm unittest --debug ./charts/cryostat
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
deleted file mode 100644
index def3d865..00000000
--- a/.github/workflows/unittest.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: Helm Unit Tests
-
-on:
-  push:
-    branches:
-      - main
-      - v[0-9]+
-      - v[0-9]+.[0-9]+
-      - cryostat-v[0-9]+.[0-9]+
-  
-  pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - labeled
-      - unlabeled
-    branches:
-      - main
-      - v[0-9]+
-      - v[0-9]+.[0-9]+
-      - cryostat-v[0-9]+.[0-9]+
-
-jobs:
-  helm-unittests:
-    runs-on: ubuntu-latest
-    steps:
-      - name: fail if safe-to-test label NOT applied
-        if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'safe-to-test') }}
-        run: exit 1
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Set up Helm
-        uses: azure/setup-helm@v4
-        with:
-          version: v3.14.4
-      - name: Install unit test plugin
-        run: helm plugin install https://github.com/helm-unittest/helm-unittest.git --version v0.5.1
-      - name: Run Helm unit tests
-        run: helm unittest --debug ./charts/cryostat