summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhijiang Hu <hu.zhijiang@zte.com.cn>2017-02-22 09:19:06 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-22 09:19:06 +0000
commitf4a614caf60085929165a21f7c1bfe5d5f47fb09 (patch)
treeb8007c468a62e3e441097aba2a9d0619835f9b8f
parent348d21c371ea54fd904784b9d9236081e56912be (diff)
parentcecb07ffac55ed186389557140f3b6f44806b0a4 (diff)
Merge "Add executable attribute to opnfv bin file"
-rwxr-xr-xci/build_rpm/build_rpms_docker.sh1
-rwxr-xr-xci/deploy/deploy.sh5
2 files changed, 6 insertions, 0 deletions
diff --git a/ci/build_rpm/build_rpms_docker.sh b/ci/build_rpm/build_rpms_docker.sh
index 62993042..4434157a 100755
--- a/ci/build_rpm/build_rpms_docker.sh
+++ b/ci/build_rpm/build_rpms_docker.sh
@@ -52,5 +52,6 @@ do
done
cd ..
mv target/el7/noarch/installdaisy_el7_noarch.bin target/el7/noarch/opnfv-${OPNFV_ARTIFACT_VERSION}.bin
+chmod +x target/el7/noarch/opnfv-${OPNFV_ARTIFACT_VERSION}.bin
cp target/el7/noarch/opnfv-${OPNFV_ARTIFACT_VERSION}.bin $rpm_output_dir
exit $rc
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index a24289c7..238b1ad5 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -179,6 +179,11 @@ if [ $DRY_RUN -eq 1 ]; then
exit 1
fi
+if [ ! -x ${WORKSPACE}/opnfv.bin ]; then
+ echo "opnfv.bin does not exist in WORKSPACE or is not executable, exit."
+ exit 1
+fi
+
test -d ${VM_STORAGE} || mkdir -p ${VM_STORAGE}
function create_node