From: Yao Lu Date: Tue, 15 Nov 2016 07:57:43 +0000 (+0800) Subject: add map with local and docker path /home/cache X-Git-Tag: 1.0.0~88 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ea6faedd90a7743829fc2f44b44c8427b040e9d6;p=daisy.git add map with local and docker path /home/cache Change-Id: I7f3ad5c7c7f70a14b7efd6e27c9958b1e396eef0 Signed-off-by: Yao Lu --- 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/