From a5a7e0f1f133aa64c62f7f34cb4f972a20b9a6f8 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Sun, 2 Apr 2017 10:08:41 -0700 Subject: xci: Adjust and fix jobs and scripts This change - fixes GIT_BASE in jobs - adjusts build blockers - fixes where the flavor vars should be sourced from - sources flavor vars for bifrost periodic jobs - renames the xcimaster node to opnfv to be consistent - removes obsolete xci-provision.sh script - enable additional openstack services including tempest to ensure the deployment is sane Change-Id: Ifdce1da52d68a26c2b87e1bd3b1996ec119d8d90 Signed-off-by: Fatih Degirmenci --- jjb/xci/bifrost-provision.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'jjb/xci/bifrost-provision.sh') diff --git a/jjb/xci/bifrost-provision.sh b/jjb/xci/bifrost-provision.sh index d8e17c463..4724c2ee5 100755 --- a/jjb/xci/bifrost-provision.sh +++ b/jjb/xci/bifrost-provision.sh @@ -70,6 +70,9 @@ cd /opt/releng && 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" + # combine opnfv and upstream scripts/playbooks sudo /bin/cp -rf /opt/releng/prototypes/bifrost/* /opt/bifrost/ @@ -77,7 +80,7 @@ sudo /bin/cp -rf /opt/releng/prototypes/bifrost/* /opt/bifrost/ 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 @@ -87,7 +90,6 @@ source env-vars ironic node-list virsh list - echo "OpenStack nodes are provisioned!" # here we have to do something in order to capture what was the working sha1 # hardcoding stuff for the timebeing -- cgit 1.2.3-korg