X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Finfra%2Fbifrost-verify.sh;h=9fbb1d0d96fa1d82f23ff1c2b2ecd25da7f516d4;hb=fd8eedf2222fef2fc4529aa5e6065741e36c5374;hp=a782904bed43a5520f15371448183426b6a81391;hpb=e953cd85b6f80cf2320e62113d95cab16296c959;p=releng.git diff --git a/jjb/infra/bifrost-verify.sh b/jjb/infra/bifrost-verify.sh index a782904be..9fbb1d0d9 100755 --- a/jjb/infra/bifrost-verify.sh +++ b/jjb/infra/bifrost-verify.sh @@ -17,6 +17,9 @@ function fix_ownership() { if [ -z "${JOB_URL+x}" ]; then echo "Not running as part of Jenkins. Handle the logs manually." else + # Make sure cache exists + [[ ! -d ${HOME}/.cache ]] && mkdir ${HOME}/.cache + sudo chown -R jenkins:jenkins $WORKSPACE sudo chown -R jenkins:jenkins ${HOME}/.cache fi @@ -47,11 +50,11 @@ sudo git fetch $PROJECT_REPO $GERRIT_REFSPEC && sudo git checkout FETCH_HEAD sudo /bin/cp -rf /opt/releng/prototypes/bifrost/* /opt/bifrost/ # place bridge creation file on the right path -mkdir -p /opt/puppet-infracloud/files/elements/infra-cloud-bridge/static/opt -cp /opt/puppet-infracloud/templates/bifrost/create_bridge.py.erb /opt/puppet-infracloud/files/elements/infra-cloud-bridge/static/opt/create_bridge.py +sudo mkdir -p /opt/puppet-infracloud/files/elements/infra-cloud-bridge/static/opt +sudo cp /opt/puppet-infracloud/templates/bifrost/create_bridge.py.erb /opt/puppet-infracloud/files/elements/infra-cloud-bridge/static/opt/create_bridge.py # replace bridge name -sed -i .bak s/<%= @bridge_name -%>/br_opnfv/g /opt/puppet-infracloud/files/elements/infra-cloud-bridge/static/opt/create_bridge.py +sudo sed -i s/"<%= @bridge_name -%>"/br_opnfv/g /opt/puppet-infracloud/files/elements/infra-cloud-bridge/static/opt/create_bridge.py # cleanup remnants of previous deployment cd /opt/bifrost