xci: Add/update variables to tool, user, and flavors

Updates
- RAM allocations for the flavors mini and noha increased to 12GB.
- Distro variables introduced to tool as it will be used by the CI and
the developers.
- LOG_PATH and RUN_TEMPEST are now available in user variables.

Change-Id: I4a73d7b79761d81f605cdb3fa9771ca40e9f9f02
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

5 files changed, 18 insertions, 10 deletions

diff --git a/prototypes/xci/config/env-vars b/prototypes/xci/config/env-vars
index 106a17930..cebf7b423 100755
--- a/prototypes/xci/config/env-vars
+++ b/prototypes/xci/config/env-vars
@@ -1,5 +1,6 @@
 #-------------------------------------------------------------------------------
-# Do not change these settings if you are not developing for XCI Sandbox!
+# !!! Changing or overriding these will most likely break everything altogether !!!
+#    Please do not change these settings if you are not developing for XCI!
 #-------------------------------------------------------------------------------
 export OPNFV_RELENG_GIT_URL=https://gerrit.opnfv.org/gerrit/releng.git
 export OPENSTACK_BIFROST_GIT_URL=https://git.openstack.org/openstack/bifrost
@@ -7,6 +8,10 @@ export OPENSTACK_OSA_GIT_URL=https://git.openstack.org/openstack/openstack-ansib
 export OPENSTACK_OSA_ETC_PATH=/etc/openstack_deploy
 export CLEAN_DIB_IMAGES=false
 export XCI_IP=192.168.122.2
-export XCI_ANSIBLE_PLAYBOOKS_PATH=$OPNFV_RELENG_PATH/prototypes/xci/file/$XCI_FLAVOR/playbooks
-export XCI_ANSIBLE_VARS_PATH=$OPNFV_RELENG_PATH/prototypes/xci/file/$XCI_FLAVOR/var
+export XCI_FLAVOR_ANSIBLE_FILE_PATH=$OPNFV_RELENG_PATH/prototypes/xci/file/$XCI_FLAVOR
 export JOB_NAME=${JOB_NAME:-false}
+export ANSIBLE_HOST_KEY_CHECKING=False
+export DISTRO=${DISTRO:-ubuntu}
+export DIB_OS_RELEASE=${DIB_OS_RELEASE:-xenial}
+export DIB_OS_ELEMENT=${DIB_OS_ELEMENT:-ubuntu-minimal}
+export DIB_OS_PACKAGES=${DIB_OS_PACKAGES:-"vlan,vim,less,bridge-utils,sudo,language-pack-en,iputils-ping,rsyslog,curl,python,debootstrap,ifenslave,ifenslave-2.6,lsof,lvm2,tcpdump,nfs-kernel-server,chrony,iptables"}
diff --git a/prototypes/xci/config/mini-vars b/prototypes/xci/config/mini-vars
index 44b015d9f..4d720801f 100755
--- a/prototypes/xci/config/mini-vars
+++ b/prototypes/xci/config/mini-vars
@@ -14,5 +14,5 @@ export TEST_VM_NODE_NAMES="xci controller00 compute00"
 export VM_DOMAIN_TYPE=kvm
 export VM_CPU=8
 export VM_DISK=80
-export VM_MEMORY_SIZE=8192
+export VM_MEMORY_SIZE=12288
 export VM_DISK_CACHE=unsafe
diff --git a/prototypes/xci/config/noha-vars b/prototypes/xci/config/noha-vars
index 7f686e5e5..22c68feeb 100755
--- a/prototypes/xci/config/noha-vars
+++ b/prototypes/xci/config/noha-vars
@@ -14,5 +14,5 @@ export TEST_VM_NODE_NAMES="xci controller00 compute00 compute01"
 export VM_DOMAIN_TYPE=kvm
 export VM_CPU=8
 export VM_DISK=80
-export VM_MEMORY_SIZE=8192
+export VM_MEMORY_SIZE=12288
 export VM_DISK_CACHE=unsafe
diff --git a/prototypes/xci/config/pinned-versions b/prototypes/xci/config/pinned-versions
index 2fe9eee42..1cd33813c 100755
--- a/prototypes/xci/config/pinned-versions
+++ b/prototypes/xci/config/pinned-versions
@@ -3,7 +3,8 @@
 #-------------------------------------------------------------------------------
 # You are free to override these versions in user-vars to experiment with
 # different branches or with different commits but be aware that things might
-# not work as expected.
+# not work as expected. You can set the versions you want to use before running
+# the main script on your shell as shown on the examples below.
 #
 # It is important to be consistent between branches you use for OpenStack
 # projects OPNFV XCI uses.
@@ -20,7 +21,7 @@
 #-------------------------------------------------------------------------------
 # use releng from master until the development work with the sandbox is complete
 export OPNFV_RELENG_VERSION="master"
-# HEAD of "master" as of 27.03.2017 - verified by OPNFV CI
-export OPENSTACK_BIFROST_VERSION="7417ff36e4b5fc4e2a6ee7d9dddb7287be20c37d"
-# HEAD of "master" as of 27.03.2017 - verified by OPNFV CI
-export OPENSTACK_OSA_VERSION="baba7b317a5898cd73b4a11c4ce364c7e2d3d77f"
+# HEAD of "master" as of 28.03.2017
+export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"2600d546ed7116f5aad81972b0987a269f3c45b4"}
+# HEAD of "master" as of 26.03.2017
+export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"baba7b317a5898cd73b4a11c4ce364c7e2d3d77f"}
diff --git a/prototypes/xci/config/user-vars b/prototypes/xci/config/user-vars
index f29dda66f..b326f5ce7 100755
--- a/prototypes/xci/config/user-vars
+++ b/prototypes/xci/config/user-vars
@@ -42,3 +42,5 @@ export OPENSTACK_OSA_PATH=/opt/openstack-ansible
 # or
 #   ANSIBLE_VERBOSITY="-vvvv"
 export ANSIBLE_VERBOSITY=${ANSIBLE_VERBOSITY-""}
+export LOG_PATH=${LOG_PATH:-/opt/xci/logs}
+export RUN_TEMPEST=${RUN_TEMPEST:-false}