From a6a20d7926b0647907f188a492031635e8aefd86 Mon Sep 17 00:00:00 2001
From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Wed, 7 Sep 2022 12:00:18 -0700
Subject: [PATCH] Update local-builder

Update supporting packages for Ubuntu 18.04
and 20.04
Remove duplicates

Issue-ID: CIMAN-33
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Change-Id: I63db8b56b794dde92c70c86dcb6f060ee3cdaf7f
---
 packer/provision/local-builder.yaml | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml
index fa1038d17..5034ef2d0 100644
--- a/packer/provision/local-builder.yaml
+++ b/packer/provision/local-builder.yaml
@@ -95,7 +95,7 @@
       become: true
       when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
 
-    - name: Install base packages
+    - name: Install supporting packages (Ubuntu 18.04)
       apt:
         name:
           - unzip
@@ -112,14 +112,31 @@
           - crudini
           - maven
           - python-ncclient
+        update_cache: yes
+        state: fixed
+      become: true
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
+
+    - name: Install supporting packages (Ubuntu 20.04)
+      apt:
+        name:
+          - unzip
+          - xz-utils
+          - libxml-xpath-perl
+          - wget
+          - make
+          - sshuttle
+          - netcat
+          - libssl-dev
+          - libffi-dev
           - xmlstarlet
           - xvfb
           - crudini
           - maven
-          - python-ncclient
         update_cache: yes
+        state: fixed
       become: true
-      when: ansible_distribution == 'Ubuntu'
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
 
     - name: Install npm and addon packages
       apt:
-- 
2.16.6