summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYao Lu <lu.yao135@zte.com.cn>2016-11-15 15:57:43 +0800
committerYao Lu <lu.yao135@zte.com.cn>2016-11-15 15:57:43 +0800
commitea6faedd90a7743829fc2f44b44c8427b040e9d6 (patch)
tree8dc0d8d2a5bfdf08c569c85b7fc22f724c7b76b9
parent615a2f2822aa47b66217a17373146ea7428837e1 (diff)
add map with local and docker path /home/cache
Change-Id: I7f3ad5c7c7f70a14b7efd6e27c9958b1e396eef0 Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>
-rwxr-xr-xci/build_rpm/build_rpms.sh2
-rwxr-xr-xcode/makefile_patch.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/ci/build_rpm/build_rpms.sh b/ci/build_rpm/build_rpms.sh
index 4f18d8ef..2d5d23e0 100755
--- a/ci/build_rpm/build_rpms.sh
+++ b/ci/build_rpm/build_rpms.sh
@@ -18,7 +18,7 @@ function build_rpm_pkg {
mkdir -p $DAISYDIR/build_output
sudo docker build -t daisy4nfv_rpm .
- sudo docker run --rm -v $DAISYDIR:/opt/daisy4nfv -t daisy4nfv_rpm \
+ sudo docker run --rm -v $DAISYDIR:/opt/daisy4nfv -v $CACHE_DIRECTORY:/home/cache -t daisy4nfv_rpm \
/opt/daisy4nfv/ci/build_rpm/build_rpms_docker.sh $OPNFV_ARTIFACT_VERSION
# Here to collect build result from $DAISYDIR/build_output
diff --git a/code/makefile_patch.sh b/code/makefile_patch.sh
index 052b222a..f4ee9184 100755
--- a/code/makefile_patch.sh
+++ b/code/makefile_patch.sh
@@ -18,7 +18,7 @@ if [ ! -f $CACHE_PATH/registry-mitaka-latest.tgz ]; then
wget -P $CACHE_PATH "http://daisycloud.org/static/files/registry-mitaka-latest.tgz"
fi
if [ ! -f $CACHE_PATH/registry-server.tar ]; then
- wget -P $CACHE_PATH "wget http://daisycloud.org/static/files/registry-server.tar"
+ wget -P $CACHE_PATH "http://daisycloud.org/static/files/registry-server.tar"
fi
cp $CACHE_PATH/CentOS-7-x86_64-Minimal-1511.iso $TOOLS_PATH/setup/bin_temp/
cp $CACHE_PATH/registry-mitaka-latest.tgz $TOOLS_PATH/setup/bin_temp/