Revert "Use apt-get to install python-minimal"

This reverts commit 9eca5443d48cde7a5f16e16cb16d89e3cd3ab66c.

This only works intermittently, therefore reverting the commit.

Change-Id: If7a2f9850e1054e251e596d104e6c4ba9eb52338
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/provision/install-python.sh b/provision/install-python.sh
index d3fbe22..5c06432 100755 (executable)
--- a/provision/install-python.sh
+++ b/provision/install-python.sh
@@ -29,15 +29,9 @@ function is_ubuntu()
 }
 
 if is_ubuntu; then
-    # TODO: Find out what is causing apt unable to refresh the package source
-    # which results in "E: Unable to locate package python-minimal" seen only
-    # on the Jenkins packer jobs and not local packer builds.
-    # This may have todo with apt overriding the package_mirrors variables
-    # (%availability_zone, %region) required in /etc/cloud/cloud.cfg.
     echo "Installing python-minimal..."
-    apt-get clean all -y
-    apt-get -y update
-    apt-get install -y python-minimal
+    apt -y update
+    apt install -y python-minimal
 fi
 
 type python

diff --git a/releasenotes/notes/use-apt-get-python-install-047586b8c69644b6.yaml b/releasenotes/notes/use-apt-get-python-install-047586b8c69644b6.yaml
deleted file mode 100644 (file)
index 909e02d..0000000
--- a/releasenotes/notes/use-apt-get-python-install-047586b8c69644b6.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-fixes:
-  - |
-    Use apt-get instead of apt to install python-minimal.
-
-    Using apt does not refresh the package mirrors (for packer build run within
-    Jenkins) and fails with "E: Unable to locate package python-minimal"
-    to install python-minimal.
-
-    With apt issue is reproducable:
-    https://logs.opendaylight.org/releng/vex-yul-odl-jenkins-1/builder-packer-merge-ubuntu-16.04-docker/74
-
-    Use apt-get instead as a workaround to resolve the package from the mirrors
-    sussessfully:
-    https://logs.opendaylight.org/releng/vex-yul-odl-jenkins-1/builder-packer-merge-ubuntu-16.04-docker/73