From a934f8318728186964466f28ee2beff42091e6e0 Mon Sep 17 00:00:00 2001
From: Phil Sphicas <phil.sphicas@att.com>
Date: Mon, 25 Oct 2021 18:28:46 -0700
Subject: [PATCH] Lint job: Install Helm before chart-testing

Ensure that Helm is installed before running ct.

Change-Id: Id8a12a0d08ad930d6052af21071cba87c127dadd
---
 playbooks/lint.yml | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/playbooks/lint.yml b/playbooks/lint.yml
index 0c92067cb..2a1e93eed 100644
--- a/playbooks/lint.yml
+++ b/playbooks/lint.yml
@@ -15,7 +15,10 @@
 
 - hosts: all
   roles:
-    - ensure-chart-testing
+    - name: ensure-helm
+      helm_version: "3.6.3"
+    - name: ensure-chart-testing
+      chart_testing_version: "3.4.0"
     - name: chart-testing
       chart_testing_options: "--chart-dirs=. --validate-maintainers=false"
       zuul_work_dir: "{{ work_dir }}"
@@ -23,18 +26,6 @@
     work_dir: "{{ zuul.project.src_dir }}/{{ zuul_osh_infra_relative_path | default('') }}"
 
   tasks:
-    - name: install helm3
-      become_user: root
-      shell: |
-        TMP_DIR=$(mktemp -d)
-        curl -sSL https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz | tar -zxv --strip-components=1 -C ${TMP_DIR}
-        sudo mv ${TMP_DIR}/helm /usr/bin/helm
-        rm -rf ${TMP_DIR}
-      environment:
-        HELM_VERSION: "v3.6.3"
-      args:
-        executable: /bin/bash
-
     - name: make all
       make:
         chdir: "{{ zuul.project.src_dir }}"