From: Fatih Degirmenci <fdegir@gmail.com>
Date: Tue, 19 Dec 2017 10:08:57 +0000 (+0100)
Subject: Update osa version files for master branch as well
X-Git-Tag: 6.0.0~201
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F75%2F49275%2F1;p=releng-xci.git

Update osa version files for master branch as well

This is needed in order to update the files before we attempt to
run osa-periodic job.

Change-Id: Ied5a53c294fd753039a6f79fa0ebce24b515cdba
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
---

diff --git a/xci/nfvi/osa/nfvi-deploy.sh b/xci/nfvi/osa/nfvi-deploy.sh
index f1d1af32..94e331fa 100755
--- a/xci/nfvi/osa/nfvi-deploy.sh
+++ b/xci/nfvi/osa/nfvi-deploy.sh
@@ -8,12 +8,12 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-if [[ ${OPENSTACK_OSA_VERSION} =~ "stable/" ]]; then
+if [[ ${OPENSTACK_OSA_VERSION} =~ (stable/|master) ]]; then
     echo ""
     echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-    echo "WARNING: We have detected that you are trying to use a stable OpenStack-Ansible."
+    echo "WARNING: We have detected that you are trying to OpenStack-Ansible from stable or master branch."
     echo "This will likely not work because, unless you know what you are doing, you are going"
-    echo "to be mixing roles and services from the master branch with a stable OpenStack-Ansible."
+    echo "to be trying something that has not been verified by XCI or upstream fully."
     echo "This is _NOT_ supported in any way but we can try to make it work for you."
     echo "Either way you are on your own so please do not report bugs as they will be considered invalid."
     echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"