From: Paul Carver <pcarver@att.com>
Date: Thu, 4 Feb 2021 15:55:38 +0000 (+0000)
Subject: Fix broken ARM64 REC build
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F54%2F4154%2F2;p=ci-management.git

Fix broken ARM64 REC build

The REC ARM64 build has been broken for a while, likely due to the
change of Jenkins builder nodes from Ubuntu 16.04 to 18.04. A number of
fixes are needed, not all known at this time. This change is a start at
fixing them.

1) Force installation of libvirt-daemon-system because the start of
   libvirt is failing when it used to succeed.

2) Install "rename" command. This was present in Ubuntu 16.04, missing
   in 18.04 and back again in 20.04. The Arm build hosts were changed
   from 16.04 to 18.04 a while back and the build has been broken ever
   since (due to multiple issues).

Change-Id: I1cf7ed62bd796bb20da21c9205487c0c6a079e85
Signed-off-by: Paul Carver <pcarver@att.com>
---

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.*