Enforce sims download in the gate

There is no point to perform functional tests suites if the related sims
download previously failed because of connectivity issues.

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I85496f08e33351042ece16db66ff9f310d353f13

diff --git a/tests/install_honeynode.sh b/tests/install_honeynode.sh
index 76c652bb1e644f65483fabba54c5b4315d0841cf..c40d80eb8895896b177d6439a30a0025adf93178 100755 (executable)
--- a/tests/install_honeynode.sh
+++ b/tests/install_honeynode.sh
@@ -44,7 +44,7 @@ do
     #complete source code can be found at https://gitlab.com/Orange-OpenSource/lfn/odl/honeynode-simulator.git
 
     echo "Installing honeynode for $VERSION devices to $INSTALL_DIR directory "
-    curl --retry-delay 10 --retry 3 -sS --location --request GET $TARGET_URL -o $ARTIFACT_ZIPFILE
+    curl --retry-delay 10 --retry 3 -sS --location --request GET $TARGET_URL -o $ARTIFACT_ZIPFILE || exit 2
     unzip -q $ARTIFACT_ZIPFILE -d $TARGET_DIR
     rm -f $ARTIFACT_ZIPFILE
 

diff --git a/tox.ini b/tox.ini
index 5a969d2fce7a128faf1a085f73eb86fd69e1317d..b139ba6b2dacf4e48948406b6e8532797592f443 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -28,7 +28,6 @@ whitelist_externals = sh
 commands =
 #install maven and JDK11 on the Gate since they are not there by default
   sh -c "which mvn >/dev/null || ./installMavenCentOS.sh"
-#install honeynode 1.2.1 simulators
 #patch OLM constant to speed up tests, unnecessary for PCE tests
   sh -c "sed -i'_' 's@=.*//#FUNCTESTVAL=@=@g' ../olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java"
   sh -c 'if [ "$USE_LIGHTY" != "True" ]; then (cd ../; for suffix in 121 221 71; do rm -rf "karaf$suffix"; cp -r karaf "karaf$suffix";done) ; fi'
@@ -41,24 +40,24 @@ commands =
   sh -c 'if [ "$USE_LIGHTY" = "True" ]; then (cd ../lighty && ./build.sh); fi'
 
 [testenv:sims121]
-whitelist_externals = sh
+whitelist_externals = install_honeynode.sh
 depends = buildcontroller
 # sims profiles does not strictly depends on buildcontroller
 # but this dependency avoids race condition in the gate
 commands =
-  - sh -c "./install_honeynode.sh 1.2.1"
+  ./install_honeynode.sh 1.2.1
 
 [testenv:sims221]
-whitelist_externals = sh
+whitelist_externals = install_honeynode.sh
 depends = buildcontroller
 commands =
-  - sh -c "./install_honeynode.sh 2.2.1"
+  ./install_honeynode.sh 2.2.1
 
 [testenv:sims71]
-whitelist_externals = sh
+whitelist_externals = install_honeynode.sh
 depends = buildcontroller
 commands =
-  - sh -c "./install_honeynode.sh 7.1"
+  ./install_honeynode.sh 7.1
 
 [testenv:testsPCE]
 depends = buildcontroller