Lile endings, Dev Container, notes

.devcontainer/Dockerfile

@@ -0,0 +1,11 @@
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.231.3/containers/ubuntu/.devcontainer/base.Dockerfile
+
+# [Choice] Ubuntu version (use hirsuite or bionic on local arm64/Apple Silicon): hirsute, focal, bionic
+ARG VARIANT="hirsute"
+FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
+
+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+
+

.devcontainer/devcontainer.json

@@ -0,0 +1,30 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.231.3/containers/ubuntu
+{
+	"name": "Ubuntu",
+	"build": {
+		"dockerfile": "Dockerfile",
+		// Update 'VARIANT' to pick an Ubuntu version: hirsute, focal, bionic
+		// Use hirsute or bionic on local arm64/Apple Silicon.
+		"args": { "VARIANT": "focal" }
+	},
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": {},
+
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [],
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "uname -a",
+
+	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode",
+	"features": {
+		"python": "latest"
+	}
+}

alice-ci/src/alice/runnerfactory.py

@@ -1,4 +1,3 @@
-import inspect
 from os import getcwd
 
 from alice.runners.pythonrunner import PythonRunner
@@ -44,9 +43,6 @@ class Factory():
                     "workdir": self.workdir,
                     "verbose": self.verbose
                 }
-                print(type(self.runnertypes[runnertype]))
-                print(inspect.signature(self.runnertypes[runnertype]))
-                print(inspect.getargspec(self.runnertypes[runnertype]))
                 self.runners[runnertype] = self.runnertypes[runnertype](params, self.globals)
             else:
                 raise ConfigException(f"Invalid runner type: {runnertype}")

alice-ci/src/alice/runners/pythonrunner.py

@@ -8,14 +8,12 @@ from alice.exceptions import NonZeroRetcode, RunnerError, ConfigException
 
 class PythonRunner():
     def __init__(self, params, user_defaults) -> None:
-        print("Python")
+        self.verbose = params["verbose"]
+        if self.verbose:
+            print("[PythonRunner] Initializing")
         self.workdir = params["workdir"]
         self.virtual_dir = os.path.abspath(os.path.join(self.workdir, "venv"))
         self.config = user_defaults
-        self.env_vars = os.environ.copy()
-        for env_var in user_defaults["env"]:
-            self.env_vars[env_var["name"]] = env_var["value"]
-        self.verbose = params["verbose"]
 
         self.__init_venv()
 
@@ -53,7 +51,7 @@ class PythonRunner():
                         raise(RunnerError(f"[PythonRunner] Could not install dependency: {dependency} ({p.returncode})"))
         if "env" in config:
             for env_var in config["env"]:
-                self.env_vars[env_var["name"]] = env_var["value"]
+                self.config["env"][env_var["name"]] = env_var["value"]
         if "workdir" in config and config["workdir"] is not None:
             self.workdir = os.path.join(self.workdir, config["workdir"])
 
@@ -90,7 +88,7 @@ class PythonRunner():
             pwd = os.path.abspath(os.path.join(self.workdir, job_spec["workdir"]))
         else:
             pwd = self.workdir
-        run_env = self.env_vars.copy()
+        run_env = self.config["env"].copy()
         if "env" in job_spec:
             for env_var in job_spec["env"]:
                 run_env[env_var["name"]] = env_var["value"]
@@ -100,7 +98,10 @@ class PythonRunner():
                 if self.verbose:
                     print(f"[PythonRunner] Raw command: {command}")
                 # TODO: only split if command is not an array
+                if "*" in command:
                     run_command = self.__ghetto_glob(shlex.split(command), pwd)
+                else:
+                    run_command = shlex.split(command)
                 if self.verbose:
                     print(f"[PythonRunner] Command to execute: {run_command}")
                     print(f"[PythonRunner] Workdir: {pwd}")

alice-ci/src/alice/utils.py

@@ -17,7 +17,9 @@ class ConfigParser:
         self.jobs = self.__get_jobs()
 
     # Initialize env and workdir if not present in global
-    def __gen_globals(self, env_vars):
+    def __gen_globals(self, cli_vars):
+        env_vars = os.environ.copy()
+        env_vars.update(cli_vars)
         globals = {
             "env": env_vars,
             "workdir": None
@@ -25,7 +27,8 @@ class ConfigParser:
         if "runners" in self.config:
             if "global" in self.config["runners"]:
                 if "env" in self.config["runners"]["global"]:
-                    globals["env"].update(self.config["runners"]["global"]["env"])
+                    for var in self.config["runners"]["global"]["env"]:
+                        globals["env"][var["name"]] = var["value"]                    
                 if "workdir" in self.config["runners"]["global"]:
                     globals["workdir"] = self.config["runners"]["global"]["workdir"]
         

docs/runners.md

@@ -17,5 +17,14 @@ Each runner has to support the following functions:
 
 ### Constructor(params, user_defaults)
 
-* params: dict of runtime variables regarding the program itself
-* user_defaults: raw data from the CI file's global dict, with 
+* params: dict of runtime variables for the program itself
+* user_defaults: raw data from the CI file's global dict, augmented with an "env" dict, which contains environment variables from the host sytem, the CLI params and the pipeline global config, and....?
+TODO: Clean up workdir as a concept, who should hold it, if any,and how shall it be passed to runners, if necessary. It is - workdir can be assigned at CI yaml level as global
+Order:
+    By default: os.cwd()
+    if overwritten in global
+    ------------------------------- Below this level is the runner's responsibility
+    if owerwritten in runner
+    if overwritten in job
+
+Runner shall receive the current working directory, unless stated otherwise in global config