From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Tue, 29 Dec 2020 21:52:46 +0000 (+0000)
Subject: Merge "Update common-packer to v0.7.1"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=0af912d4ef237162a244b5c08f3e7567feef000e;hp=231e5cded69b8d02794465498c4d9106c258d3f5

Merge "Update common-packer to v0.7.1"
---

diff --git a/jjb/akraino-templates/akraino-ta-common-macros.yaml b/jjb/akraino-templates/akraino-ta-common-macros.yaml
index a0d578c..ef068d8 100644
--- a/jjb/akraino-templates/akraino-ta-common-macros.yaml
+++ b/jjb/akraino-templates/akraino-ta-common-macros.yaml
@@ -132,7 +132,7 @@
             #  Skip RPM build in case no *.spec file is found within the {project-to-build}
             if [ -n "$(find {project-to-build} -name '*.spec')" ]
             then
-                if apt --version 2>1 >/dev/null; then
+                if apt --version >/dev/null 2>&1; then
                     # We need a specific version of mock (1.4.14) and devtools
                     # not available in Ubuntu/Debian repos, so fetch them from RHEL mirrors
                     if [ "$(mock --version 2>/dev/null)" != '1.4.14' ]; then
@@ -141,17 +141,17 @@
                         sudo apt update
                         # Explicitly install mock dependencies
                         sudo apt install -y createrepo alien systemd-container python-pip \
-                                            python-decoratortools yum-utils usermode pigz
+                                            python-peak.util.decorators yum-utils usermode pigz
                         wget http://vault.centos.org/centos/7.6.1810/os/x86_64/Packages/rpmdevtools-8.3-5.el7.noarch.rpm \
                              https://kojipkgs.fedoraproject.org/packages/mock/1.4.14/2.el7/noarch/mock-1.4.14-2.el7.noarch.rpm
                         sudo alien -d *.rpm
-                        sudo dpkg -i *.deb
+                        sudo dpkg --force-overwrite -i *.deb
                         rm -rf *.rpm *.deb
                         # RHEL tools hardcode the full path for certain distro tools
                         sudo ln -sf /bin/tar /usr/bin/gtar
                         sudo ln -sf /bin/machinectl /bin/df /usr/bin/
                         # Some mock dependencies are only available via pip
-                        sudo pip install distro pyroute2
+                        sudo pip install distro pyroute2 lxml urllib3
                     fi
                 else
                     sudo yum install -y createrepo