X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fakraino-templates%2Fakraino-ta-common-macros.yaml;h=be0a956e26026eed0af340dd17ed3f81aecf2a8d;hb=4c4a98f89de1535dec8cbf821155cd773c8d4d33;hp=ef9cbcf5efd0f41fd6ba675db3ac91611dfbc273;hpb=ecd7ed34ed2a547d8d64dddae12c1087754f7981;p=ci-management.git

diff --git a/jjb/akraino-templates/akraino-ta-common-macros.yaml b/jjb/akraino-templates/akraino-ta-common-macros.yaml
index ef9cbcf..be0a956 100644
--- a/jjb/akraino-templates/akraino-ta-common-macros.yaml
+++ b/jjb/akraino-templates/akraino-ta-common-macros.yaml
@@ -112,11 +112,12 @@
 - builder:
     name: ta-builder-tox
     builders:
-        - lf-pip-install:
-            pip-packages: tox
         - shell: |2-
             #!/bin/bash -ex
-            source /tmp/v/tox/bin/activate
+            source ~/lf-env.sh
+
+            lf-activate-venv tox
+            tox --version
             for f in $(find $GERRIT_PROJECT -name tox.ini); do
                 pushd $(dirname $f)
                 tox
@@ -131,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
@@ -140,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
@@ -200,6 +201,7 @@
           # Ensure python-tools are installed in case job template does not
           # call the lf-infra-pre-build macro.
           - ../../global-jjb/shell/python-tools-install.sh
+      - shell: !include-raw:
           - ../shell/ta-rpm-deploy.sh
       - shell: !include-raw:
           - ../../global-jjb/shell/logs-clear-credentials.sh
@@ -219,6 +221,7 @@
           # Ensure python-tools are installed in case job template does not
           # call the lf-infra-pre-build macro.
           - ../../global-jjb/shell/python-tools-install.sh
+      - shell: !include-raw:
           - ../shell/ta-iso-deploy.sh
       - shell: !include-raw:
           - ../../global-jjb/shell/logs-clear-credentials.sh
@@ -287,9 +290,10 @@
       - shell: |2-
           #!/bin/bash -ex
           if apt --version 2>1 >/dev/null; then
+              sudo chmod +r /boot/vmlinuz*
               if ! docker --version 2>1 >/dev/null; then
                   sudo apt update
-                  sudo apt install -y apt-transport-https ca-certificates curl software-properties-common
+                  sudo apt install -y apt-transport-https ca-certificates curl software-properties-common rename
                   curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
                   sudo add-apt-repository -y "deb http://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
                   sudo apt update
@@ -314,7 +318,7 @@
           if apt --version 2>1 >/dev/null; then
               if ! createrepo --version 2>1 >/dev/null; then
                   sudo apt update
-                  sudo apt install -y createrepo libguestfs-tools jq
+                  sudo apt install -y createrepo libguestfs-tools jq libvirt-daemon-system
               fi
           else
               sudo yum -y install createrepo libguestfs-tools-c jq
@@ -385,6 +389,7 @@
 - publisher:
     name: ta-publisher-job-merge
     publishers:
+      - lf-infra-publish
       - ta-publisher-ci-build:
           arch: '{arch}'
       - trigger-parameterized-builds: