X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=packer%2Fprovision%2Fhelm.yaml;h=2ab517f7dffab5b71a69777f81575ace8fe0d44e;hb=e94c02a64690ccac2dd57b8e0852041514805bdf;hp=0b14beee9ef25629185a904ef94897e0513a2a40;hpb=3942f383338f340ff9f1803dba1c0408bce529a1;p=ci-management.git

diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml
index 0b14beee9..2ab517f7d 100644
--- a/packer/provision/helm.yaml
+++ b/packer/provision/helm.yaml
@@ -6,9 +6,8 @@
   become_method: sudo
 
   vars:
-    kubectl_version: 1.15.11
-    helm_version: 2.16.6
-    helm3_version: 3.3.4
+    kubectl_version: 1.19.11
+    helm3_6_version: 3.6.3
     chartmuseum_version: 0.12.0
 
   tasks:
@@ -19,55 +18,46 @@
         mode: 0775
       become: yes
 
-    - name: 'Install Helm {{helm_version}}'
+    - name: 'Install Helm3.6 {{helm3_6_version}}'
       block:
-        - name: 'Fetch tar.gz'
-          get_url:
-            url: "http://storage.googleapis.com/kubernetes-helm/helm-v{{helm_version}}-linux-amd64.tar.gz"
-            dest: "/tmp/helm-v{{helm_version}}-linux-amd64.tar.gz"
-        - name: 'Unarchive'
-          unarchive:
-            src: "/tmp/helm-v{{helm_version}}-linux-amd64.tar.gz"
-            dest: /tmp
-            remote_src: true
-          become: yes
-        - name: 'Move helm to /usr/local/bin and set as executable'
-          command: 'mv /tmp/linux-amd64/helm /usr/local/bin/helm'
-          become: yes
-        - name: 'Check helm.'
-          command: 'which helm'
-
-    - name: 'Install Helm3 {{helm3_version}}'
-      block:
-        - name: create directory
+        - name: 'Create directory /tmp/helm3.6'
           file:
-            path: /tmp/helm3
+            path: /tmp/helm3.6
             state: directory
-        - name: 'Fetch tar.gz'
+        - name: 'Fetch tar.gz for Helm 3.6'
           get_url:
-            url: "https://get.helm.sh/helm-v{{helm3_version}}-linux-amd64.tar.gz"
-            dest: "/tmp/helm3/helm-v{{helm3_version}}-linux-amd64.tar.gz"
-        - name: 'Unarchive'
+            url: "https://get.helm.sh/helm-v{{helm3_6_version}}-linux-amd64.tar.gz"
+            dest: /tmp/helm3.6
+        - name: 'Unarchive Helm 3.6'
           unarchive:
-            src: "/tmp/helm3/helm-v{{helm3_version}}-linux-amd64.tar.gz"
-            dest: /tmp/helm3
+            src: "/tmp/helm3.6/helm-v{{helm3_6_version}}-linux-amd64.tar.gz"
+            dest: /tmp/helm3.6
             remote_src: true
           become: yes
-        - name: 'Move helm to /usr/local/bin and set as executable'
-          command: 'mv /tmp/helm3/linux-amd64/helm /usr/local/bin/helm3'
+        - name: 'Move Helm 3.6 bin to /usr/local/bin and set as executable'
+          command: 'mv /tmp/helm3.6/linux-amd64/helm /usr/local/bin/helm3.6'
           become: yes
-        - name: 'Check helm3.'
-          command: 'which helm3'
-        - name: 'Check kubectl.'
+        - name: 'Check Helm 3.6'
+          command: 'which helm3.6'
+        - name: 'Check kubectl {{kubectl_version}}'
           command: 'which kubectl'
 
+        - name: 'Install Helm 3.6'
+          shell: |
+             echo "----> Installing helm3.6"
+             wget 'https://get.helm.sh/helm-v{{helm3_6_version}}-linux-amd64.tar.gz'
+             tar -xvf 'https://get.helm.sh/helm-v{{helm3_6_version}}-linux-amd64.tar.gz'
+             mv linux-amd64/helm /usr/local/bin/helm3.6
+             which helm3.6
+          become: true
+
     - name: 'Install ChartMuseum {{chartmuseum_version}}'
       block:
-        - name: 'Fetch bin'
+        - name: 'Fetch bin for ChartMuseum'
           get_url:
             url: "https://s3.amazonaws.com/chartmuseum/release/v{{ chartmuseum_version }}/bin/linux/amd64/chartmuseum"
             dest: /usr/local/bin/chartmuseum
             mode: "0755"
           become: yes
-        - name: 'Check chartmuseum.'
+        - name: 'Check ChartMuseum {{chartmuseum_version}}'
           command: 'which chartmuseum'