From: Eric Ball <eball@linuxfoundation.org>
Date: Fri, 12 Feb 2021 18:02:20 +0000 (+0000)
Subject: Merge "Fix broken ARM64 REC build"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=f90a17661cc6db1e7da9914500de102700a0c724;hp=71c16d731fd9a5b3bd86d147abf7b83bf149ffb8

Merge "Fix broken ARM64 REC build"
---

diff --git a/jjb/akraino-templates/akraino-ta-common-macros.yaml b/jjb/akraino-templates/akraino-ta-common-macros.yaml
index ef068d8..58f92cd 100644
--- a/jjb/akraino-templates/akraino-ta-common-macros.yaml
+++ b/jjb/akraino-templates/akraino-ta-common-macros.yaml
@@ -318,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
diff --git a/jjb/shell/ta-iso-deploy.sh b/jjb/shell/ta-iso-deploy.sh
index e40eeba..1614b73 100644
--- a/jjb/shell/ta-iso-deploy.sh
+++ b/jjb/shell/ta-iso-deploy.sh
@@ -29,9 +29,10 @@ nexus_repo_url="$NEXUS_URL/content/repositories/$NEXUS_REPO"
 mkdir -p "$upload_dir1"
 mkdir -p "$upload_dir2"
 
+sudo apt install -y rename # "rename" disappeared in Ubuntu 18.04
 platform_arch=$(uname -m)
 if [ "${platform_arch}" != 'x86_64' ]; then
-    # On non-x86 architecture, rename the artifacts appropiately
+    # On non-x86 architecture, rename the artifacts appropriately
     pushd "$WORKSPACE/work/results/images/"
     rename "s/\./.${platform_arch}./" *.*
     sed -i "s/\./.${platform_arch}./" *."${platform_arch}".iso.*