diff options
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/build_rpm/build_rpms.sh | 8 | ||||
| -rwxr-xr-x | ci/build_rpm/build_rpms_docker.sh | 9 | ||||
| -rwxr-xr-x | ci/deploy/deploy.sh | 7 |
3 files changed, 14 insertions, 10 deletions
diff --git a/ci/build_rpm/build_rpms.sh b/ci/build_rpm/build_rpms.sh index db5a42e9..2175bd97 100755 --- a/ci/build_rpm/build_rpms.sh +++ b/ci/build_rpm/build_rpms.sh @@ -36,9 +36,13 @@ function cleanup_container { ${containers_to_kill} | egrep -v '(^\s*$)' | sort | uniq) echo "Stopping containers... $containers_to_kill" - (sudo docker stop -t 2 ${containers_to_kill} 2>&1) > /dev/null + sudo docker stop -t 2 ${containers_to_kill} echo "Removing containers... $containers_to_kill" - (sudo docker rm -v -f ${containers_to_kill} 2>&1) > /dev/null + + # Prevent "removal of container daisy is already in progress" + sleep 10 + + sudo docker rm -v -f ${containers_to_kill} if [[ ! -z "$volumes_to_remove" ]]; then echo "Removing volumes... $volumes_to_remove" diff --git a/ci/build_rpm/build_rpms_docker.sh b/ci/build_rpm/build_rpms_docker.sh index caeb005b..b005a243 100755 --- a/ci/build_rpm/build_rpms_docker.sh +++ b/ci/build_rpm/build_rpms_docker.sh @@ -14,6 +14,7 @@ rpm_build_dir=/opt/daisy4nfv rpm_output_dir=$rpm_build_dir/build_output tmp_rpm_build_dir=/home/cache/daisy4nfv +DAISYCORE_REPO="https://git.openstack.org/openstack/daisycloud-core" DAISYCORE_TAG= if [[ -d $tmp_rpm_build_dir ]]; then @@ -36,12 +37,10 @@ do cnt=$[cnt + 1] echo -e "\n\n\n*** Starting build attempt # $cnt" - git clone https://git.openstack.org/openstack/daisycloud-core - if [[ ! -z "$DAISYCORE_TAG" ]]; then - pushd daisycloud-core - git checkout $DAISYCORE_TAG - popd + git clone $DAISYCORE_REPO --branch $DAISYCORE_TAG --depth 1 + else + git clone $DAISYCORE_REPO --depth 1 fi cp $rpm_build_dir/code/makefile_patch.sh daisycloud-core/tools/setup diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index be17dfa7..6c88dc5a 100755 --- a/ci/deploy/deploy.sh +++ b/ci/deploy/deploy.sh @@ -269,7 +269,10 @@ else virsh define $BMDEPLOY_DAISY_SERVER_VM virsh start daisy fi -sleep 20 +#wait for the daisy1 network start finished for execute trustme.sh +#here sleep 40 just needed in Dell blade server +#for E9000 blade server we only have to sleep 20 +sleep 40 echo "====== install daisy ======" $DEPLOY_PATH/trustme.sh $DAISY_IP $DAISY_PASSWD @@ -293,8 +296,6 @@ scp $WORKSPACE/known_hosts root@$DAISY_IP:/root/.ssh/ if [ $IS_BARE == 0 ];then echo "====== add relate config of kolla ======" - ssh $SSH_PARAS $DAISY_IP "mkdir -p /etc/kolla/config/nova" - ssh $SSH_PARAS $DAISY_IP "echo -e '[libvirt]\nvirt_type=qemu\ncpu_mode=none' >> /etc/kolla/config/nova/nova-compute.conf" ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/prepare.sh -n $NETWORK" fi |