summaryrefslogtreecommitdiffstats
path: root/jjb/xci/bifrost-provision.sh
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-08-15 09:29:41 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-15 09:29:41 +0000
commit37db5256ba3ac296b367b0dc8fed91abd713d63f (patch)
tree9b602cf6600fdbc628e9ee44bc113851ff91ad6f /jjb/xci/bifrost-provision.sh
parentb12dc4669d4428632998caa3c6faa73884bb2dbd (diff)
parentcbd0c1403046acbf56e0f4226d260bbf786b9cf8 (diff)
Merge "Update repository with new location of XCI"
Diffstat (limited to 'jjb/xci/bifrost-provision.sh')
-rwxr-xr-xjjb/xci/bifrost-provision.sh10
1 files changed, 5 insertions, 5 deletions
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