X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fxci%2Fbifrost-provision.sh;h=4d646a676dd02d01ef2cd4ed647b10010c1dfab7;hb=730d6bab4e9f349aa61c3e915098f15dc283473b;hp=b37da9059a6a0ca06b9e839e7212023ae35f4eaf;hpb=60291ea30d941559e3d380d435a495502b3c80b9;p=releng.git diff --git a/jjb/xci/bifrost-provision.sh b/jjb/xci/bifrost-provision.sh index b37da9059..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,16 +65,16 @@ 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/prototypes/xci/config/${XCI_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