From 191be7bf3c6691dd65967b45ecbddef9d35b0716 Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Mon, 2 May 2022 12:30:57 -0400
Subject: [PATCH] Run test helm install in CI

---
 .github/workflows/ci.yaml        | 29 +++++++++++++++++++++++++++--
 .github/workflows/helm-test.yaml | 23 -----------------------
 2 files changed, 27 insertions(+), 25 deletions(-)
 delete mode 100644 .github/workflows/helm-test.yaml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 17c888e6..2b151845 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -10,9 +10,9 @@ on:
     branches: [devel]
 
 jobs:
-  pull_request:
+  molecule:
     runs-on: ubuntu-18.04
-    name: pull_request
+    name: molecule
     env:
       DOCKER_API_VERSION: "1.38"
     steps:
@@ -39,3 +39,28 @@ jobs:
           sudo rm -f $(which kustomize)
           make kustomize
           KUSTOMIZE_PATH=$(readlink -f bin/kustomize) molecule test -s kind
+  helm:
+    runs-on: ubuntu-18.04
+    name: helm
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Create k8s Kind Cluster
+        uses: helm/kind-action@v1.2.0
+
+      - name: Build operator image and load into kind
+        run: |
+          IMG=awx-operator-ci make docker-build
+          kind load docker-image --name chart-testing awx-operator-ci
+
+      - name: Patch pull policy for tests
+        run: |
+          kustomize edit add patch --path ../testing/pull_policy/Never.yaml
+        working-directory: config/default
+
+      - name: Build and install helm chart
+        run: |
+          IMG=awx-operator-ci make helm-chart
+          helm install --wait my-awx-operator ./charts/awx-operator
diff --git a/.github/workflows/helm-test.yaml b/.github/workflows/helm-test.yaml
deleted file mode 100644
index 1890a1ae..00000000
--- a/.github/workflows/helm-test.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-name: helm-test
-
-on:
-  pull_request:
-    branches: [devel]
-
-  push:
-    branches: [devel]
-
-jobs:
-  test:
-    runs-on: ubuntu-18.04
-    steps:
-
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Test make helm-chart
-        run: |
-          make helm-chart