Code Review
/
releng.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (parent:
ad277ac
)
Revert "remove sourcing of opnfv-openrc.rc in releng script"
36/1336/1
author
Morgan Richomme
<morgan.richomme@orange.com>
Thu, 27 Aug 2015 08:51:52 +0000
(10:51 +0200)
committer
Morgan Richomme
<morgan.richomme@orange.com>
Thu, 27 Aug 2015 08:51:52 +0000
(10:51 +0200)
This reverts commit
dae21e80b2a8a9b8201abd2aeaa082be970eb6ca
.
jjb/functest/functest.yml
patch
|
blob
|
history
diff --git
a/jjb/functest/functest.yml
b/jjb/functest/functest.yml
index
7ea794a
..
bf824b6
100644
(file)
--- a/
jjb/functest/functest.yml
+++ b/
jjb/functest/functest.yml
@@
-70,6
+70,12
@@
echo "Functest: prepare Functest environment"
mkdir -p $HOME/functest/
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
# 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/
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
# 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/
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
# WORKSPACE is the root of the functest repo
# go into WORKSPACE where the functest repo is cloned