X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=packer%2Fprovision%2Flocal-builder.yaml;h=21af013647f866f559d63de43f884503283f05b9;hb=1793cf1428ff7969b5f8913a6bfa658630fcdff9;hp=34609814416347a30499b8af0654580c82c54799;hpb=a1493e0a098c9a8b5a1c041262ec584df011482f;p=ci-management.git

diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml
index 346098144..21af01364 100644
--- a/packer/provision/local-builder.yaml
+++ b/packer/provision/local-builder.yaml
@@ -19,17 +19,6 @@
       become: true
       when: ansible_distribution == 'Ubuntu'
 
-    - name: Install python-tox and deps
-      pip:
-        name:
-          - tox
-          - tox-pyenv
-          - virtualenv
-          - more-itertools~=5.0.0
-          - zipp==1.0.0
-        state: present
-      become: true
-
     - name: Install Python 3.6 and packages
       apt:
         name:
@@ -52,6 +41,25 @@
       become: true
       when: ansible_distribution == 'Ubuntu'
 
+    - name: Install Python 3.8
+      apt:
+        name:
+          - python3.8
+          - python3.8-dev
+          - python3.8-tk
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
+    - name: Install Python 3.9
+      apt:
+        name:
+          - python3.9
+          - python3.9-dev
+          - python3.9-tk
+          - python3.9-distutils
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
     - name: Install libssl1.0-dev dep
       apt:
         name: libssl1.0-dev
@@ -66,9 +74,17 @@
         update_cache: yes
         state: fixed
       become: true
-      when: ansible_distribution == 'Ubuntu'
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
+
+    - name: Install libnode-dev dep for npm
+      apt:
+        name: libnode-dev
+        update_cache: yes
+        state: fixed
+      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
@@ -85,14 +101,32 @@
           - 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
+          - python3-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: