Do not require tests that enforce internet to be available in CI

Do not enforce tests that require the internet connection to be up.
This is the case for geoclue and weather.

We might be able to revert this in the future after
fixes to the systemd dependencies and lab setup.

Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Change-Id: I1f53e6bfda5be7c9f9613b485efb4f2e25839a63

diff --git a/common/scripts/application-lifecycle.sh b/common/scripts/application-lifecycle.sh
index 73bd9eb..403116e 100755 (executable)
--- a/common/scripts/application-lifecycle.sh
+++ b/common/scripts/application-lifecycle.sh
@@ -368,25 +368,7 @@ do
        if [ -e $WGTNAME.wgt ];then
                inspect_wgt $WGTNAME.wgt $WGTNAME
                do_release_test $WGTNAME $WGTNAME.wgt
-       else
-               echo "WARN: cannot find $WGTNAME.wgt"
-       fi
-       if [ -e $WGTNAME-test.wgt ];then
-               # wgt-test do not have the same permissions in the config.xml as the parent wgt
-               # so keep the value from last run
-               #inspect_wgt $WGTNAME-test.wgt
-               check_service_running $WGTNAME
-               if [ $? -eq 1 ];then
-                       do_afm_test $TOPDIR/$WGTNAME-test.wgt
-                       if [ $? -eq 0 ];then
-                               lava-test-case run-test-$WGTNAME --result pass
-                       else
-                               lava-test-case run-test-$WGTNAME --result fail
-                       fi
-               else
-                       echo "DEBUG: $WGTNAME is not running, skipping test"
-                       lava-test-case run-test-$WGTNAME --result skip
-               fi
+               pytest --show-capture=no --color=no -k "not hwrequired and not internet" /usr/lib/python?.?/site-packages/pyagl/tests/ -L
        else
                echo "WARN: cannot find $WGTNAME.wgt"
        fi
@@ -394,22 +376,5 @@ do
                inspect_wgt $WGTNAME-debug.wgt $WGTNAME
                do_release_test $WGTNAME $WGTNAME-debug.wgt
        fi
-       if [ -e $WGTNAME-coverage.wgt ];then
-               inspect_wgt $WGTNAME-coverage.wgt $WGTNAME
-               do_release_test $WGTNAME $WGTNAME-coverage.wgt
-               check_service_running $WGTNAME
-               if [ $? -eq 1 ];then
-                       afm-util install $TOPDIR/$WGTNAME-test.wgt
-                       do_afm_test $TOPDIR/$WGTNAME-test.wgt
-                       if [ $? -eq 0 ];then
-                               lava-test-case run-test-$WGTNAME --result pass
-                       else
-                               lava-test-case run-test-$WGTNAME --result fail
-                       fi
-               else
-                       echo "DEBUG: $WGTNAME is not running, skipping test"
-                       lava-test-case run-test-$WGTNAME --result skip
-               fi
-       fi
 done
 

diff --git a/common/scripts/pyagl-nohw-lava.sh b/common/scripts/pyagl-nohw-lava.sh
index 1b0c7f3..06dddb9 100755 (executable)
--- a/common/scripts/pyagl-nohw-lava.sh
+++ b/common/scripts/pyagl-nohw-lava.sh
@@ -2,6 +2,6 @@
 # for now play safe and only expect ethernet
 export AGL_AVAILABLE_INTERFACES="ethernet"
 
-pytest --color=no --show-capture=no -k "not hwrequired" /usr/lib/python?.?/site-packages/pyagl/tests/ -L
+pytest --color=no --show-capture=no -k "not hwrequired and not internet" /usr/lib/python?.?/site-packages/pyagl/tests/ -L