Minor cleanups in CI setup (secdev#3565)

* Add Gitlab-ci.yml

* cleanup

* remove gitlab-ci.yml file

Author: polybassa

.config/ci/install.sh

@@ -28,7 +28,7 @@ if [ "$OSTYPE" = "linux-gnu" ] || [ "$TRAVIS_OS_NAME" = "linux" ]
 then
   sudo apt-get update
   sudo apt-get -qy install tshark net-tools || exit 1
-  sudo apt-get -qy install can-utils build-essential linux-headers-$(uname -r) linux-modules-extra-$(uname -r) || exit 1
+  sudo apt-get -qy install can-utils || exit 1
 
   # Make sure libpcap is installed
   if [ ! -z $SCAPY_USE_LIBPCAP ]

test/contrib/automotive/interface_mockup.py

@@ -57,10 +57,13 @@ def test_and_setup_socket_can(iface_name):
 
 
 if LINUX and _root and _not_pypy:
-    test_and_setup_socket_can(iface0)
-    test_and_setup_socket_can(iface1)
-    log_runtime.debug("CAN should work now")
-    _socket_can_support = True
+    try:
+        test_and_setup_socket_can(iface0)
+        test_and_setup_socket_can(iface1)
+        log_runtime.debug("CAN should work now")
+        _socket_can_support = True
+    except Exception as e:
+        sys.__stderr__.write("ERROR %s!\n" % e)
 
 
 sys.__stderr__.write("SocketCAN support: %s\n" % _socket_can_support)
@@ -113,7 +116,7 @@ def cleanup_interfaces():
 
     :return: True on success
     """
-    if LINUX and _not_pypy and _root:
+    if _socket_can_support:
         if 0 != subprocess.call(["ip", "link", "delete", iface0]):
             raise Exception("%s could not be deleted" % iface0)
         if 0 != subprocess.call(["ip", "link", "delete", iface1]):
@@ -168,7 +171,7 @@ def exit_if_no_isotp_module():
 # ############################################################################
 # """ Evaluate if ISOTP kernel module is installed and available """
 # ############################################################################
-if LINUX and _root and six.PY3:
+if LINUX and _root and six.PY3 and _socket_can_support:
     p1 = subprocess.Popen(['lsmod'], stdout=subprocess.PIPE)
     p2 = subprocess.Popen(['grep', '^can_isotp'],
                           stdout=subprocess.PIPE, stdin=p1.stdout)

test/contrib/isotp_packet.uts

@@ -407,6 +407,8 @@ except Scapy_Exception:
 assert ex
 
 = Fragment exception
+~ not_pypy
+
 ex = False
 try:
     fragments = ISOTP(b"a" * (1 << 32)).fragment()

tox.ini

@@ -51,6 +51,7 @@ whitelist_externals = sudo
 passenv = PATH PWD PROGRAMFILES WINDIR SYSTEMROOT
 deps = {[testenv]deps}
 commands =
+  sudo apt-get -qy install build-essential linux-headers-$(uname -r) linux-modules-extra-$(uname -r)
   sudo -E modprobe can
   git clone --depth=1 https://github.com/linux-can/can-utils.git /tmp/can-utils
   bash -c "cd /tmp/can-utils; ./autogen.sh; ./configure; make; sudo make install"