summaryrefslogtreecommitdiffstats
path: root/xci/config
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-09-28 07:43:34 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-28 07:43:34 +0000
commita9ec5d588eaeece632ad9f0e5f27b7313a291d6a (patch)
tree7ea1ee4e660e4e6227afe4321c057e9abead3593 /xci/config
parent7056b91177bcfb2f745cbb3d4c6e55005c59b9c7 (diff)
parent44cdd0b1462530977b3efae4ac9d17dcb6c4c12c (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 'xci/config')
-rwxr-xr-xxci/config/user-vars6
1 files changed, 3 insertions, 3 deletions
diff --git a/xci/config/user-vars b/xci/config/user-vars
index ecde6db9..7c99ee9d 100755
--- a/xci/config/user-vars
+++ b/xci/config/user-vars
@@ -49,10 +49,10 @@ export OPNFV_OSA_PLAYBOOK=${OPNFV_OSA_PLAYBOOK:-"$OPENSTACK_OSA_PATH/playbooks/s
# Set the verbosity for ansible
#
# Examples:
-# ANSIBLE_VERBOSITY="-v"
+# XCI_ANSIBLE_VERBOSITY="-v"
# or
-# ANSIBLE_VERBOSITY="-vvvv"
-export ANSIBLE_VERBOSITY=${ANSIBLE_VERBOSITY:-""}
+# XCI_ANSIBLE_VERBOSITY="-vvvv"
+export XCI_ANSIBLE_VERBOSITY=${XCI_ANSIBLE_VERBOSITY:-""}
export LOG_PATH=${LOG_PATH:-${XCI_DEVEL_ROOT}/opnfv/logs}
export RUN_TEMPEST=${RUN_TEMPEST:-false}
# Set this to to true to force XCI to re-create the target OS images