diff options
Diffstat (limited to 'ci/kolla-build.sh')
| -rwxr-xr-x | ci/kolla-build.sh | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/ci/kolla-build.sh b/ci/kolla-build.sh index 44b1c038..cca98db5 100755 --- a/ci/kolla-build.sh +++ b/ci/kolla-build.sh @@ -31,7 +31,10 @@ error_trap() exit $exitcode } -WORK_DIR=/tmp +SCRIPT_PATH=$(readlink -f $(dirname $0)) +WORKSPACE=$(cd ${SCRIPT_PATH}/..; pwd) + +WORK_DIR=$WORKSPACE while getopts "l:b:j:t:e:w:h" OPTION do #Only get what we need @@ -46,8 +49,6 @@ BUILD_OUTPUT_DIR=$WORK_DIR/kolla-build-output ############Builder VM operations################ -SCRIPT_PATH=$(readlink -f $(dirname $0)) -WORKSPACE=$(cd ${SCRIPT_PATH}/..; pwd) DEPLOY_PATH=$WORKSPACE/deploy # VM configurations @@ -64,7 +65,7 @@ PARAS_IMAGE=${PARAS_FROM_DEPLOY#* * * } # qcow2 image modifier location CREATE_QCOW2_PATH=$WORKSPACE/tools # temp storage for qcow2 image modifier -IMWORKDIR=${IMWORKDIR:-/tmp/workdir/daisy} +IMWORKDIR=${IMWORKDIR:-$WORKSPACE/img} # set extra ssh paramters SSH_PARAS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" @@ -129,15 +130,16 @@ function build_kolla_image_in_daisy_vm() ssh $SSH_PARAS $DAISY_IP "${REMOTE_SPACE}/ci/kolla-build-vm.sh $VM_PARAMS" rc=$? if [ $rc -ne 0 ]; then - echo "daisy install failed" + echo "image build failed" exit 1 else - echo "daisy install successfully" + echo "image build successfully" fi rm -rf $BUILD_OUTPUT_DIR - mkdir -p $BUILD_OUTPUT_DIR scp -r root@$DAISY_IP:$BUILD_OUTPUT_DIR $WORK_DIR + realuser=$(who am i | awk '{print $1}') + chown -R $realuser:$realuser $WORK_DIR } trap "error_trap" EXIT SIGTERM |