Merge branch 'v-mitim/add_ubuntu_20_to_ci' of https://github.com/miketimofeev/virtual-environments into v-mitim/add_ubuntu_20_to_ci

images/linux/scripts/installers/python.sh

@@ -8,10 +8,16 @@
 source $HELPER_SCRIPTS/document.sh
 
 # Install Python, Python 3, pip, pip3
+if isUbuntu20 ; then
     apt-get install -y --no-install-recommends python3 python3-dev python3-pip
 
     curl https://bootstrap.pypa.io/get-pip.py --output get-pip.py
     python2 get-pip.py
+fi
+
+if isUbuntu16 || isUbuntu18 ; then
+    apt-get install -y --no-install-recommends python python-dev python-pip python3 python3-dev python3-pip
+fi
 
 # Run tests to determine that the software installed as expected
 echo "Testing to make sure that script performed as expected, and basic scenarios work"

images/linux/ubuntu2004.json

@@ -265,7 +265,7 @@
         {
             "type": "shell",
             "scripts":[
-                "{{template_dir}}/scripts/installers/1804/android.sh",
+                "{{template_dir}}/scripts/installers/2004/android.sh",
                 "{{template_dir}}/scripts/installers/azpowershell.sh",
                 "{{template_dir}}/scripts/installers/python.sh"
             ],