diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2017-03-21 10:28:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-21 10:28:54 +0000 |
| commit | 1686df597be23ac2924cc90a821930a22a1d02d5 (patch) | |
| tree | 3f1945c0dc4b15464e501733de61a377b545a1b1 /jjb/xci/bifrost-verify.sh | |
| parent | 3690af3dbfb90a7e073b10c6fece26ed2dd3af44 (diff) | |
| parent | a88b258312d3c858b1b1167dfd03a09a6e28cacd (diff) | |
Merge "xci: Enable VM provisioning using bifrost for daily runs"
Diffstat (limited to 'jjb/xci/bifrost-verify.sh')
| -rwxr-xr-x | jjb/xci/bifrost-verify.sh | 10 |
1 files changed, 1 insertions, 9 deletions
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 |