Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Updating FTC 100 series tests to support a1pms V3 image
[nonrtric.git]
/
test
/
jenkins
/
run_test.sh
diff --git
a/test/jenkins/run_test.sh
b/test/jenkins/run_test.sh
index
469288d
..
6ebb567
100755
(executable)
--- a/
test/jenkins/run_test.sh
+++ b/
test/jenkins/run_test.sh
@@
-22,21
+22,27
@@
echo "--> run_integration.sh"
# Install docker-compose
echo "--> run_integration.sh"
# Install docker-compose
-curl -L "https://github.com/docker/compose/releases/download/1.26.0/docker-compose-$(uname -s)-$(uname -m)" -o ./docker-compose
+DOCKER_C_VERSION=$(curl --silent https://api.github.com/repos/docker/compose/releases/latest | jq .name -r)
+curl -L "https://github.com/docker/compose/releases/download/${DOCKER_C_VERSION}/docker-compose-$(uname -s)-$(uname -m)" -o ./docker-compose
chmod +x docker-compose
export PATH=$PATH:`pwd`
chmod +x docker-compose
export PATH=$PATH:`pwd`
+clean_docker(){
+ docker stop $(docker ps -aq)
+ docker system prune -f
+}
# Run auto-test scripts
cd ../auto-test/
# Run auto-test scripts
cd ../auto-test/
-bash FTC10.sh remote auto-clean --use-local-image PA SDNC
+clean_docker
+bash FTC10.sh remote auto-clean --env-file ../common/test_env-oran-master.sh --use-local-image A1PMS SDNC
echo "--> run_integration.sh END"
FILE=.resultFTC10.txt
if [[ -f "$FILE" ]]; then
res=$(cat .resultFTC10.txt)
echo "--> run_integration.sh END"
FILE=.resultFTC10.txt
if [[ -f "$FILE" ]]; then
res=$(cat .resultFTC10.txt)
- docker system prune -f
+ clean_docker
exit $res
fi
exit $res
fi
-docker system prune -f
+clean_docker
exit 1
exit 1