From: Morgan Richomme <morgan.richomme@orange.com>
Date: Thu, 27 Aug 2015 08:51:52 +0000 (+0200)
Subject: Revert "remove sourcing of opnfv-openrc.rc in releng script"
X-Git-Tag: arno.2015.2.0~78
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F36%2F1336%2F1;p=releng.git

Revert "remove sourcing of opnfv-openrc.rc in releng script"

This reverts commit dae21e80b2a8a9b8201abd2aeaa082be970eb6ca.
---

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 7ea794a12..bf824b642 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -70,6 +70,12 @@
 
             echo "Functest: prepare Functest environment"
             mkdir -p $HOME/functest/
+            # source openstack vars
+            if [[ ! -f $HOME/opnfv-openrc.sh ]]; then
+                echo "Unable to access file $HOME/opnfv-openrc.sh"
+                exit 1
+            fi
+            source $HOME/opnfv-openrc.sh
 
             # WORKSPACE is the root of the functest repo
             # go into WORKSPACE where the functest repo is cloned
@@ -130,6 +136,12 @@
 
             echo "Functest: prepare Functest environment"
             mkdir -p $HOME/functest/
+            # source openstack vars
+            if [[ ! -f $HOME/opnfv-openrc.sh ]]; then
+                echo "Unable to access file $HOME/opnfv-openrc.sh"
+                exit 1
+            fi
+            source $HOME/opnfv-openrc.sh
 
             # WORKSPACE is the root of the functest repo
             # go into WORKSPACE where the functest repo is cloned
@@ -564,6 +576,7 @@
 
             echo "Functest: prepare Functest environment"
             mkdir -p $HOME/functest/
+            source $HOME/functest/opnfv-openrc.sh
 
             # WORKSPACE is the root of the functest repo
             # go into WORKSPACE where the functest repo is cloned