fix(ci): minor fixes

fix utils communicate to use bytes instead of str. Move shell scripts to respective components

ci/dispatcher/dispatcher_handler.py

@@ -34,19 +34,16 @@ class DispatcherHandler(socketserver.BaseRequestHandler):
     command_re = re.compile(r"(\w+)(:.+)*")
     BUF_SIZE = 1024
 
-    def __init__(self):
-        super().__init__()
+    def handle(self):
+        self.data = self.request.recv(self.BUF_SIZE).strip()
+        self.command_groups = self.command_re.match(self.data)
         self.commands = {
             "status": self.check_status,
             "register": self.register,
             "dispatch": self.dispatch,
             "results": self.results,
         }
 
-    def handle(self):
-        self.data = self.request.recv(self.BUF_SIZE).strip()
-        self.command_groups = self.command_re.match(self.data)
-
         if not self.command_groups:
             self.invalid_command()
             return

ci/repo_observer/__init__.py

@@ -34,14 +34,14 @@ def observer(dispatcher_host, dispatcher_port, repo, poll, branch):
             # for changes. If there's a change, it will drop a .commit_id file
             # with the latest commit in the current working directory
             logger.info(f"cloning repo {repo}")
-            subprocess.check_output(["./scripts/update_repo.sh", repo, branch])
+            subprocess.check_output(["./update_repo.sh", repo, branch])
         except subprocess.CalledProcessError as e:
             logger.error(f"Failed to update & check repo {repo}, err: {e.output}")
             raise RepoObserverError(
                 f"Could not update & check repository. Err: {e.output}"
             )
 
-        if os.path.isfile("files/.commit_id"):
+        if os.path.isfile(".commit_id"):
             # great, we have a change! let's execute the tests
             # First, check the status of the dispatcher server to see
             # if we can send the tests
@@ -57,7 +57,7 @@ def observer(dispatcher_host, dispatcher_port, repo, poll, branch):
                 # Dispatcher is available
                 commit = ""
 
-                with open("files/.commit_id") as commit_file:
+                with open(".commit_id") as commit_file:
                     commit = commit_file.readline
 
                 response = communicate(

scripts/update_repo.sh → ci/repo_observer/update_repo.sh

@@ -1,9 +1,18 @@
 #!/bin/bash
 
-source ./scripts/run_or_fail.sh
+# helper method for providing error messages for a command
+run_or_fail() {
+  local explanation=$1
+  shift 1
+  "$@"
+  if [ $? != 0 ]; then
+    echo $explanation 1>&2
+    exit 1
+  fi
+}
 
 # delete previous id 
-rm -f files/.commit_id
+rm -f .commit_id
 
 # go to repo and update it to given commit
 run_or_fail "Repository folder not found!" pushd $1 1> /dev/null

ci/test_runner/__init__.py

@@ -55,7 +55,7 @@ def test_runner_server(host, port, repo, dispatcher_host, dispatcher_port):
 
     runner_host = host
     runner_port = None
-    tries = 100
+    tries = 0
 
     if not port:
         runner_port = range_start

ci/test_runner/test_runner_handler.py

@@ -13,13 +13,10 @@ class TestRunnerHandler(BaseRequestHandler):
 
     command_re = re.compile(r"(\w+)(:.+)*")
 
-    def __init__(self):
-        super().__init__()
-        self.commands = {"ping": self.health_check, "runtest": self.runtest}
-
     def handle(self):
         self.data = self.request.recv(1024).strip()
         self.command_groups = self.command_re.match(self.data)
+        self.commands = {"ping": self.health_check, "runtest": self.runtest}
         command = command_groups.group(1)
 
         # Handle commands, if none match, handle invalid command

ci/utils.py

@@ -19,7 +19,7 @@ def communicate(host, port, request):
     """
     s = socket()
     s.connect((host, port))
-    s.send(request)
+    s.send(bytes(request, "utf-8"))
     response = s.recv(1024)
     s.close()
     return response