X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fbifrost-provision.sh;h=4d646a676dd02d01ef2cd4ed647b10010c1dfab7;hb=22c2f607bcaff65bee79149f775dcabcfcf1a396;hp=d8e17c46365f41eb8d37fd88b7f38129f72473f7;hpb=908d962bedf027631bc0209c4d2c06830d6c8659;p=releng.git

diff --git a/jjb/xci/bifrost-provision.sh b/jjb/xci/bifrost-provision.sh
index d8e17c463..4d646a676 100755
--- a/jjb/xci/bifrost-provision.sh
+++ b/jjb/xci/bifrost-provision.sh
@@ -38,7 +38,7 @@ if [[ ! "$DISTRO" =~ (xenial|centos7|suse) ]]; then
 fi
 
 # remove previously cloned repos
-sudo /bin/rm -rf /opt/bifrost /opt/openstack-ansible /opt/releng /opt/functest
+sudo /bin/rm -rf /opt/bifrost /opt/openstack-ansible /opt/releng-xci /opt/functest
 
 # Fix up permissions
 fix_ownership
@@ -65,28 +65,30 @@ cd /opt/bifrost && sudo git checkout --quiet $OPENSTACK_BIFROST_VERSION
 echo "xci: using bifrost commit"
 git show --oneline -s --pretty=format:'%h - %s (%cr) <%an>'
 
-sudo git clone --quiet https://gerrit.opnfv.org/gerrit/releng /opt/releng
-cd /opt/releng && sudo git checkout --quiet $OPNFV_RELENG_VERSION
+sudo git clone --quiet https://gerrit.opnfv.org/gerrit/releng-xci /opt/releng-xci
+cd /opt/releng-xci && sudo git checkout --quiet $OPNFV_RELENG_VERSION
 echo "xci: using releng commit"
 git show --oneline -s --pretty=format:'%h - %s (%cr) <%an>'
 
+# source flavor vars
+source "$WORKSPACE/xci/config/${XCI_FLAVOR}-vars"
+
 # combine opnfv and upstream scripts/playbooks
-sudo /bin/cp -rf /opt/releng/prototypes/bifrost/* /opt/bifrost/
+sudo /bin/cp -rf /opt/releng-xci/bifrost/* /opt/bifrost/
 
 # cleanup remnants of previous deployment
 cd /opt/bifrost
 sudo -E ./scripts/destroy-env.sh
 
-# provision 6 VMs; xcimaster, controller00, controller01, controller02, compute00, and compute01
+# provision VMs for the flavor
 cd /opt/bifrost
-sudo -E ./scripts/bifrost-provision.sh
+./scripts/bifrost-provision.sh
 
 # list the provisioned VMs
 cd /opt/bifrost
 source env-vars
 ironic node-list
-virsh list
-
+sudo -H -E virsh list
 
 echo "OpenStack nodes are provisioned!"
 # here we have to do something in order to capture what was the working sha1