diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-09-28 07:43:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-28 07:43:34 +0000 |
| commit | a9ec5d588eaeece632ad9f0e5f27b7313a291d6a (patch) | |
| tree | 7ea1ee4e660e4e6227afe4321c057e9abead3593 /bifrost | |
| parent | 7056b91177bcfb2f745cbb3d4c6e55005c59b9c7 (diff) | |
| parent | 44cdd0b1462530977b3efae4ac9d17dcb6c4c12c (diff) | |
Merge changes from topic 'fix-vm-on-jenkins'
* changes:
xci: scripts: start-new-vm.sh: Fix paths for default XCI test
xci: Replace ANSIBLE_VERBOSITY with XCI_ANSIBLE_VERBOSITY
xci: scripts: start-new-vm.sh: Print dib output when running on CI
xci: scripts: start-new-vm.sh: Use 'unsafe' cache for the clean vm disk
xci: xci-deploy.sh: Make sure all local Ansible installations are gone
xci: scripts: start-new-vm.sh: Do not allow multiple build-dib-os processes
Diffstat (limited to 'bifrost')
| -rwxr-xr-x | bifrost/scripts/bifrost-provision.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bifrost/scripts/bifrost-provision.sh b/bifrost/scripts/bifrost-provision.sh index d4d1f96a..bd9493e6 100755 --- a/bifrost/scripts/bifrost-provision.sh +++ b/bifrost/scripts/bifrost-provision.sh @@ -91,10 +91,10 @@ cd $BIFROST_HOME/playbooks # Syntax check of dynamic inventory test path for task in syntax-check list-tasks; do - ${ANSIBLE} -i inventory/localhost \ + ${ANSIBLE} ${XCI_ANSIBLE_VERBOSITY} -i inventory/localhost \ test-bifrost-create-vm.yaml \ --${task} - ${ANSIBLE} -i inventory/localhost \ + ${ANSIBLE} ${XCI_ANSIBLE_VERBOSITY} -i inventory/localhost \ ${TEST_PLAYBOOK} \ --${task} \ -e testing_user=${TESTING_USER} @@ -111,7 +111,8 @@ if [[ -e /etc/centos-release ]]; then fi # Create the VMS -${ANSIBLE} -i inventory/localhost \ +${ANSIBLE} ${XCI_ANSIBLE_VERBOSITY} \ + -i inventory/localhost \ test-bifrost-create-vm.yaml \ -e test_vm_num_nodes=${TEST_VM_NUM_NODES} \ -e test_vm_memory_size=${VM_MEMORY_SIZE} \ @@ -120,7 +121,8 @@ ${ANSIBLE} -i inventory/localhost \ -e ${INVENTORY_FILE_FORMAT}=${BAREMETAL_DATA_FILE} # Execute the installation and VM startup test -${ANSIBLE} -i inventory/bifrost_inventory.py \ +${ANSIBLE} ${XCI_ANSIBLE_VERBOSITY} \ + -i inventory/bifrost_inventory.py \ ${TEST_PLAYBOOK} \ -e use_cirros=${USE_CIRROS} \ -e testing_user=${TESTING_USER} \ |