Merge pull request #789 from socallinuxexpo/rh/devserver-runners

[READY] - init devServer gitlab runner

CI.md

@@ -37,10 +37,3 @@ Wormhole code is: 8-amusement-drumbeat
 ```
 
 4. This will kickoff the flash and reply with a gitlab pipeline URL.
-
-## Gitlab CI
-
-See the pipelines defined: https://github.com/socallinuxexpo/scale-network/blob/master/.gitlab-ci.yml
-
-Our [autoflash process](./openwrt/docs/AUTOFLASH.md) leverages `gitlab-runners` to be able to interact with real hardware so that
-we can automate the flashing process to test our openwrt images.

README.md

@@ -11,7 +11,8 @@
 ## Table of Contents
 
 - [CONTRIBUTING](./CONTRIBUTING.md)
-- [CI](./CI.md)
+- [GitHub Actions CI](./CI.md)
+- [Gitlab CI](./docs/gitlab-ci.md)
 - [MAPS](./MAPS.md)
 - [SWITCH CONFIG](./switch-configuration/README.md)
 - [OPENWRT](./openwrt/README.md)

docs/gitlab-ci.md

@@ -0,0 +1,21 @@
+# Gitlab
+
+See the pipelines defined: https://github.com/socallinuxexpo/scale-network/blob/master/.gitlab-ci.yml
+
+Our [autoflash process](./openwrt/docs/AUTOFLASH.md) leverages `gitlab-runners` to be able to interact with real hardware so that
+we can automate the flashing process to test our openwrt images.
+
+## Generate token for runner
+
+1. Navigate to the [runner page](https://gitlab.com/groups/socallinuxexpo/-/runners)
+
+1. Click the `New Group Runner`
+
+1. Ensure that you have the right tags for the runner. These should match the `.gitlab-ci` jobs you expect to run.
+
+1. Add a description and set an appropriate timeout if different from the default.
+
+1. Take the token and place it on the runner.
+
+> NOTE: Runners cannot be configured with additional tags or config. These are encoded into the token. Should these
+> config need to change you'll need a new token.

flake.nix

@@ -11,7 +11,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.spectrum.follows = "";
     }; # Currently using this fork since the upstream seems to be causing an issue
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     treefmt-nix = {
       url = "github:numtide/treefmt-nix";

nix/machines/devServer/default.nix

@@ -3,6 +3,7 @@
 {
   imports = [
     ./libvirt.nix
+    ./gitlab.nix
   ];
   # remove the annoying experimental warnings
   nix.extraOptions = ''

nix/machines/devServer/gitlab.nix

@@ -0,0 +1,17 @@
+{ pkgs, ... }:
+{
+  services.gitlab-runner = {
+    enable = true;
+    gracefulTermination = true;
+    services = {
+      shell = {
+        # make sure this is a quote path so it doesnt end up in /nix/store
+        authenticationTokenConfigFile = "/persist/etc/gitlab/shellAuthToken.env";
+        executor = "shell";
+      };
+    };
+  };
+
+  # include for gl-runner cli
+  environment.systemPackages = [ pkgs.gitlab-runner ];
+}

nix/machines/flake-module.nix

@@ -40,7 +40,6 @@ in
         ./_common/users.nix
         ./devServer/default.nix
         ./devServer/hardware-configuration.nix
-        inputs.microvm.nixosModules.host
       ];
     };
     loghost = lib.nixosSystem {