From: Paul Carver <pcarver@att.com>
Date: Wed, 9 Jun 2021 15:36:40 +0000 (-0400)
Subject: Move install of "rename" into ARM conditional
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=e662fa54f11638c8e6ae4c8f3573ac78aabb84c9;hp=a457654d1fa3a0792bb86fffdf06746aa99d4374

Move install of "rename" into ARM conditional

In order to fix the ARM build it was necessary to install the "rename"
command, but that was done via apt which does not exist on CentOS (the
ARM build is done on Ubuntu, the AMD build on CentOS) and the "rename"
command is not required for the AMD build. This change fixes that
mistake.

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

diff --git a/jjb/shell/ta-iso-deploy.sh b/jjb/shell/ta-iso-deploy.sh
index 1614b73..d3b1cec 100644
--- a/jjb/shell/ta-iso-deploy.sh
+++ b/jjb/shell/ta-iso-deploy.sh
@@ -29,10 +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 appropriately
+    sudo apt install -y rename # "rename" disappeared in Ubuntu 18.04
     pushd "$WORKSPACE/work/results/images/"
     rename "s/\./.${platform_arch}./" *.*
     sed -i "s/\./.${platform_arch}./" *."${platform_arch}".iso.*