summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorchenjiankun <chenjiankun1@huawei.com>2017-03-13 09:25:19 +0000
committerJing Lu <lvjing5@huawei.com>2017-03-14 02:46:33 +0000
commitbdca0f8486398ed4d3957727dccacc65ac0b24cb (patch)
tree3cf225da7adc27fa0e8c2963d02abfb5040cf789 /tools
parentedd6d4cadadf8c84bb212b1108c0b89ce535a19b (diff)
Bugfix: fatal: destination path '/opt/tempT' already exists and is not an empty directory.
JIRA: YARDSTICK-588 ubuntu-server-cloudimg-modify.sh: fixes and cleanup https://build.opnfv.org/ci/view/fuel/job/yardstick-fuel-virtual-daily-master/1233/console saw this in an error log, not sure if it is a real error + [[ amd64 = \a\r\m\6\4 ]] + git clone https://github.com/kdlucas/byte-unixbench.git /opt/tempT fatal: destination path '/opt/tempT' already exists and is not an empty directory. + error_trap + local rc=128 + set +e + '[' -z '' ']' + exitcode=128 workaround by deletign /opt/tempT always before cloning also improve ln with relative symlink and forcing filename target Change-Id: Ia9c35a877207494623055b1b2134f7834fadedf8 Signed-off-by: chenjiankun <chenjiankun1@huawei.com> (cherry picked from commit f31b7d56c07c17607df605aacc9b60bf786428e0)
Diffstat (limited to 'tools')
-rwxr-xr-xtools/ubuntu-server-cloudimg-modify.sh27
1 files changed, 16 insertions, 11 deletions
diff --git a/tools/ubuntu-server-cloudimg-modify.sh b/tools/ubuntu-server-cloudimg-modify.sh
index ce320a205..bffd83a7b 100755
--- a/tools/ubuntu-server-cloudimg-modify.sh
+++ b/tools/ubuntu-server-cloudimg-modify.sh
@@ -76,36 +76,41 @@ apt-get install -y \
stress \
sysstat
+CLONE_DEST=/opt/tempT
+
+# remove before cloning
+rm -rf -- "${CLONE_DEST}"
+
if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then
wget https://github.com/kdlucas/byte-unixbench/archive/master.zip
unzip master.zip && rm master.zip
- mkdir /opt/tempT
- mv byte-unixbench-master/UnixBench /opt/tempT
+ mkdir "${CLONE_DEST}"
+ mv byte-unixbench-master/UnixBench "${CLONE_DEST}"
sed -i -e 's/OPTON += -march=native -mtune=native/OPTON += -march=armv8-a -mtune=generic/g' \
- -e 's/OPTON += -march=native/OPTON += -march=armv8-a/g' /opt/tempT/UnixBench/Makefile
+ -e 's/OPTON += -march=native/OPTON += -march=armv8-a/g' "${CLONE_DEST}/UnixBench/Makefile"
else
- git clone https://github.com/kdlucas/byte-unixbench.git /opt/tempT
+ git clone https://github.com/kdlucas/byte-unixbench.git "${CLONE_DEST}"
fi
-make --directory /opt/tempT/UnixBench/
+make --directory "${CLONE_DEST}/UnixBench/"
if [ "${YARD_IMG_ARCH}" = "arm64" ]; then
wget https://github.com/beefyamoeba5/ramspeed/archive/master.zip
unzip master.zip && rm master.zip
- mkdir /opt/tempT/RAMspeed
- mv ramspeed-master/* /opt/tempT/RAMspeed/
+ mkdir "${CLONE_DEST}/RAMspeed"
+ mv ramspeed-master/* "${CLONE_DEST}/RAMspeed/"
else
- git clone https://github.com/beefyamoeba5/ramspeed.git /opt/tempT/RAMspeed
+ git clone https://github.com/beefyamoeba5/ramspeed.git "${CLONE_DEST}/RAMspeed"
fi
-cd /opt/tempT/RAMspeed/ramspeed-2.6.0
+cd "${CLONE_DEST}/RAMspeed/ramspeed-2.6.0"
mkdir temp
bash build.sh
if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then
wget https://github.com/beefyamoeba5/cachestat/archive/master.zip
unzip master.zip && rm master.zip
- mv cachestat-master/cachestat /opt/tempT
+ mv cachestat-master/cachestat "${CLONE_DEST}"
else
- git clone https://github.com/beefyamoeba5/cachestat.git /opt/tempT/Cachestat
+ git clone https://github.com/beefyamoeba5/cachestat.git "${CLONE_DEST}/Cachestat"
fi
# restore symlink