Code Review
/
nonrtric.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
(from parent 1:
6d39590
)
Merge "Fix docker-compose version check in tests"
author
John Keeney
<john.keeney@est.tech>
Thu, 7 Sep 2023 11:21:02 +0000
(11:21 +0000)
committer
Gerrit Code Review
<gerrit@o-ran-sc.org>
Thu, 7 Sep 2023 11:21:02 +0000
(11:21 +0000)
test/common/testcase_common.sh
patch
|
blob
|
history
diff --git
a/test/common/testcase_common.sh
b/test/common/testcase_common.sh
index
a36d031
..
3f5970c
100755
(executable)
--- a/
test/common/testcase_common.sh
+++ b/
test/common/testcase_common.sh
@@
-1199,7
+1199,7
@@
if [ $RUNMODE == "DOCKER" ]; then
echo -e $RED"docker-compose (v.2+) is required to run the test environment, pls install"$ERED
exit 1
else
- tmp=$(docker-compose
version
)
+ tmp=$(docker-compose
-v
)
echo " docker-compose installed and using version $tmp"
if [[ "$tmp" == *'v2'* ]]; then
DOCKER_COMPOSE_VERSION="V2"