X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fxci%2Fbifrost-verify.sh;h=e0c50907ae0053294deb76ef6343df33068a8021;hb=a88b258312d3c858b1b1167dfd03a09a6e28cacd;hp=4115ffcc436479deb7e8c635a7207412f0b146bb;hpb=6eff820d35e78a9d8ffb2d35cef50e5125179e36;p=releng.git diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh index 4115ffcc4..e0c50907a 100755 --- a/jjb/xci/bifrost-verify.sh +++ b/jjb/xci/bifrost-verify.sh @@ -95,14 +95,13 @@ if [[ ! "$DISTRO" =~ (trusty|centos7|suse) ]]; then fi # remove previously cloned repos -sudo /bin/rm -rf /opt/bifrost /opt/puppet-infracloud /opt/stack /opt/releng +sudo /bin/rm -rf /opt/bifrost /opt/stack /opt/releng # Fix up permissions fix_ownership # clone all the repos first and checkout the patch afterwards sudo git clone https://git.openstack.org/openstack/bifrost /opt/bifrost -sudo git clone https://git.openstack.org/openstack-infra/puppet-infracloud /opt/puppet-infracloud sudo git clone https://gerrit.opnfv.org/gerrit/releng /opt/releng # checkout the patch @@ -112,13 +111,6 @@ sudo git fetch $PROJECT_REPO $GERRIT_REFSPEC && sudo git checkout FETCH_HEAD # combine opnfv and upstream scripts/playbooks sudo /bin/cp -rf /opt/releng/prototypes/bifrost/* /opt/bifrost/ -# place bridge creation file on the right path -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 -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 sudo -E ./scripts/destroy-env.sh