gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: only run podman-runner test on x86_64-linux

Browse Source
This commit is contained in:
Gabriel Nützi
2025-11-29 21:11:20 +01:00
parent 6b3826779c
commit 9369697ded
6 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/continuous-integration/gitlab-runner/runner.md
+3 -3
View File
@@ -33,10 +33,10 @@ features:
- `local/ubuntu`: An image based on Ubuntu with a Nix installation
(variable `ubuntuImage`).
- `local/nix`: An image based on Nix which only comes with `nix`
installed(variable `nixImage`).
installed (variable `nixImage`).
**Images for VM Setup**:
- `local/nix-daemon-image`: An image with with a Nix daemon which is
- `local/nix-daemon-image`: An image with a Nix daemon which is
used to share the `/nix/store` across jobs (variable `nixDaemonImage`).
- `local/podman-daemon-image`: An image with a `podman` running as a daemon which is
used to run `podman` inside the above job containers images
@@ -70,7 +70,7 @@ features:
- The job containers do **not** mount the `podman` socket from the host (NixOS
VM) mounted for security reasons.
**Note:**: Building container images with `buildah` (stripped
**Note:** Building container images with `buildah` (stripped
`podman` for building images) inside a job which runs `alpineImage`
is still possible.
nixos/modules/services/misc/gitlab.md
+2 -2
View File
@@ -159,10 +159,10 @@ features:
- `local/ubuntu`: An image based on Ubuntu with a Nix installation
(variable `ubuntuImage`).
- `local/nix`: An image based on Nix which only comes with `nix`
installed(variable `nixImage`).
installed (variable `nixImage`).
**Images for VM Setup**:
- `local/nix-daemon-image`: An image with with a Nix daemon which is
- `local/nix-daemon-image`: An image with a Nix daemon which is
used to share the `/nix/store` across jobs (variable `nixDaemonImage`).
- `local/podman-daemon-image`: An image with a `podman` running as a daemon which is
used to run `podman` inside the above job containers images
nixos/tests/gitlab/runner.nix
+8 -4
View File
@@ -57,10 +57,14 @@ in
(import ./runner/shell-runner.nix {
runnerConfig = runnerConfigs.shell;
})
(import ./runner/podman-runner {
runnerConfig = runnerConfigs.shell;
})
];
]
# Only enable the podman runner on x86_64
# cause of built images.
++ (lib.optional pkgs.stdenv.buildPlatform.isx86_64 (
import ./runner/podman-runner {
runnerConfig = runnerConfigs.podman;
}
));
virtualisation = {
diskSize = 10000;
nixos/tests/gitlab/runner/podman-runner/default.nix
+1 -1
View File
@@ -39,7 +39,7 @@
# you can run `cd tools/nix/vm && just vm::status`
# to get some information about the
# running stuff.
# - You can clean all logs with `journalclt --vacuume-time=1s`
# - You can clean all logs with `journalctl --vacuum-time=1s`
# - Also you can run `btop` on the machine to inspect the performance.
#
# TODO: use `.execConfig` on `gitlab-runner.service` created
nixos/tests/gitlab/runner/podman-runner/scripts/prebuild.nix
+1 -1
View File
@@ -56,7 +56,7 @@ writeShellScriptBin "gitlab-runner-pre-build-script"
function setup_pipeline_scratch_dir() {
scratch_dir="/scratch/$CI_PIPELINE_ID"
echo "Create scrtach directory for pipeline: $scratch_dir"
echo "Create scratch directory for pipeline: $scratch_dir"
mkdir -p "$scratch_dir" || {
echo "Could not create scratch dir '$scratch_dir'." >&2
exit 1
nixos/tests/gitlab/runner_test.py
+1 -1
View File
@@ -101,7 +101,7 @@ def test_register_runner(name: str, tokenFile: str):
obj = json.loads(resp)
r.id = obj["id"]
r.token = obj["token"]
print("==> Registered runner '{r.id}' with token '{r.token}'.")
print(f"==> Registered runner '{r.id}' with token '{r.token}'.")
# Push the token to the runner machine.
print("==> Push runner token to machine.")