X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fbifrost-verify.sh;h=b522b8969ec23c0e6bca303f809085fb76dac63a;hb=86fa506d9e6b37df0b79ac72fa2e78e1579430a2;hp=4115ffcc436479deb7e8c635a7207412f0b146bb;hpb=d3fc60f22dd0d7831f901568dc9eaa9b748b5215;p=releng.git

diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh
index 4115ffcc4..b522b8969 100755
--- a/jjb/xci/bifrost-verify.sh
+++ b/jjb/xci/bifrost-verify.sh
@@ -89,46 +89,38 @@ function cleanup_and_upload() {
 }
 
 # check distro to see if we support it
-if [[ ! "$DISTRO" =~ (trusty|centos7|suse) ]]; then
+if [[ ! "$DISTRO" =~ (xenial|centos7|suse) ]]; then
     echo "Distro $DISTRO is not supported!"
     exit 1
 fi
 
 # remove previously cloned repos
-sudo /bin/rm -rf /opt/bifrost /opt/puppet-infracloud /opt/stack /opt/releng
+/bin/rm -rf $WORKSPACE/bifrost $WORKSPACE/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
+git clone https://git.openstack.org/openstack/bifrost $WORKSPACE/bifrost
+git clone https://gerrit.opnfv.org/gerrit/releng $WORKSPACE/releng
 
 # checkout the patch
 cd $CLONE_LOCATION
-sudo git fetch $PROJECT_REPO $GERRIT_REFSPEC && sudo git checkout FETCH_HEAD
+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
+/bin/cp -rf $WORKSPACE/releng/prototypes/bifrost/* $WORKSPACE/bifrost/
 
 # cleanup remnants of previous deployment
-cd /opt/bifrost
-sudo -E ./scripts/destroy-env.sh
+cd $WORKSPACE/bifrost
+sudo -H -E ./scripts/destroy-env.sh
 
-# provision 3 VMs; jumphost, controller, and compute
-cd /opt/bifrost
-sudo -E ./scripts/test-bifrost-deployment.sh
+# provision 3 VMs; xcimaster, controller, and compute
+cd $WORKSPACE/bifrost
+./scripts/bifrost-provision.sh
 
 # list the provisioned VMs
-cd /opt/bifrost
+cd $WORKSPACE/bifrost
 source env-vars
 ironic node-list
-virsh list
+sudo -H -E virsh list