X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=env%2Fubuntu%2Fbootloader-env%2F02_clean_bootloader_package_req.sh;h=6bb3b15c2e1578bf7925d578c39b39463ea6f45b;hb=bcee4e738ce66b69957abb987dda40032264e6f7;hp=539d5404ac18085fe8a3290c123c535ba261f91d;hpb=71033a920680e2495f14948c347e99ed2558f6d7;p=icn.git

diff --git a/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh b/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh
index 539d540..6bb3b15 100755
--- a/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh
+++ b/env/ubuntu/bootloader-env/02_clean_bootloader_package_req.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -ex
+set -eux -o pipefail
 
 source $(dirname $PWD)/../lib/common.sh
 source $(dirname $PWD)/../lib/logging.sh
@@ -9,26 +9,28 @@ if [[ $EUID -ne 0 ]]; then
     exit 1
 fi
 
-if [[ $(lsb_release -d | cut -f2) != $UBUNTU_BIONIC ]]; then
-    echo "Currently Ubuntu 18.04.2 LTS is only supported"
-    exit 1
-fi
+function autoremove {
+    rm -rf /etc/apt/sources.list.d/*
+}
 
 function clean_essential_packages {
     apt-get update
     for package in crudini curl dnsmasq figlet golang nmap patch psmisc \
-        python-pip python-requests python-setuptools vim wget; do
+        python3-pip python3-requests python3-setuptools vim wget; do
         apt-get remove $package -y
     done
+    update-alternatives --remove python /usr/bin/python3
+    update-alternatives --remove pip /usr/bin/pip3
 
-    apt-get autoremove -y
-    rm -rf /etc/apt/sources.list.d/*
+    autoremove
 }
 
 function check_prerequisite {
     if !(which pip); then
-        apt-get install python-pip -y
+        apt-get install python3-pip -y
     fi
+    update-alternatives --install /usr/bin/python python /usr/bin/python3 1
+    update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1
 
     if !(which curl); then
         apt-get install curl -y
@@ -40,9 +42,9 @@ function check_prerequisite {
 }
 
 function clean_ironic_packages {
-    for package in jq nodejs python-ironicclient \
-        python-ironic-inspector-client python-lxml python-netaddr \
-        python-openstackclient unzip genisoimage; do
+    for package in python3-ironicclient \
+        python3-ironic-inspector-client \
+        python3-openstackclient genisoimage; do
         apt-get remove $package -y
     done
 }
@@ -54,28 +56,18 @@ function clean_docker_packages {
         $(lsb_release -cs) \
         stable"
     apt-get update
+    docker rmi -f $(docker image ls -a -q)
     apt-get remove docker-ce -y
-    for package in apt-transport-https ca-certificates gnupg-agent \
-            software-properties-common; do
-        apt-get remove $package -y
-    done
-
     apt-get remove -y docker \
         docker-engine \
         docker.io \
         containerd \
         runc \
         docker-ce
-
+    apt-get purge docker-* -y --allow-change-held-packages
     apt-get update
 }
 
-function clean_podman_packages {
-    apt-get update
-    add-apt-repository -y ppa:projectatomic/ppa
-    apt-get remove podman -y
-}
-
 function clean_kubernetes_packages {
     #Just to make sure kubernetes packages are removed during the download
     curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
@@ -97,56 +89,16 @@ function clean_apt_cache {
 
 }
 
-function mv_apt_cache {
-    shopt -s extglob
-    pushd /var/cache/apt/archives
-
-    if [ $(ls -1q . | wc -l ) -gt 2 ]; then
-        $(mv !("lock"|"partial") $LOCAL_APT_REPO)
-    fi
-    popd
-}
-
-function check_dir {
-    if [ ! -d $1 ]; then
-        mkdir -p $1
-    fi
-}
-
-function clean_dir {
-    shopt -s extglob
-    pushd $1
-
-    if [ $(ls -1q . | wc -l ) -ne 0 ]; then
-        $(rm -r ./*)
-    fi
-    popd
-}
-
 if [ "$1" == "--only-packages" ]; then
     check_prerequisite
-    clean_docker_packages
-    clean_ironic_packages
-    clean_essential_packages
+    clean_docker_packages || true
+    autoremove
     exit 0
 fi
 
 check_prerequisite
 clean_apt_cache
-check_dir $LOCAL_APT_REPO
-clean_dir $LOCAL_APT_REPO
-check_dir $PIP_CACHE_DIR
-clean_dir $PIP_CACHE_DIR
-check_dir $BUILD_DIR
-clean_dir $BUILD_DIR
-check_dir $CONTAINER_IMAGES_DIR
-clean_dir $CONTAINER_IMAGES_DIR
 clean_kubernetes_packages
-clean_podman_packages
 clean_docker_packages
 clean_ironic_packages
 clean_essential_packages
-rm -rf $LOCAL_APT_REPO
-rm -rf $PIP_CACHE_DIR
-rm -rf $BUILD_DIR
-rm -rf $CONTAINER_IMAGES_DIR