mirror of
https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git
synced 2024-12-27 11:40:32 +05:00
Remove the GitLab runner related code
This commit is contained in:
parent
b5263680a4
commit
b0647c95c9
@ -7,9 +7,6 @@
|
||||
# - intern.nixpkgs_20.03
|
||||
# - intern.nixpkgs_unstable
|
||||
|
||||
# Modify pkgs to run the tests on non KVM machines
|
||||
{ noKVM ? false }:
|
||||
|
||||
with builtins;
|
||||
|
||||
let
|
||||
@ -25,15 +22,10 @@ let
|
||||
genTest = testName: release:
|
||||
let
|
||||
pkgs = releases."${release}";
|
||||
noKVMPkgs = p: if noKVM
|
||||
then import ./lib/pkgs.nokvm.nix { pkgs = p; }
|
||||
else p;
|
||||
test = pkgs.callPackage (./. + "/${testName}.nix") { };
|
||||
in {
|
||||
"name"= builtins.replaceStrings ["." "-"] ["_" "_"] release;
|
||||
"value"= test {
|
||||
pkgs = (noKVMPkgs pkgs);
|
||||
};
|
||||
"value"= test { inherit pkgs; };
|
||||
};
|
||||
|
||||
releaseNames = [
|
||||
|
@ -1,11 +1,3 @@
|
||||
{
|
||||
security.dhparams.defaultBitSize = 1024; # minimum size required by dovecot
|
||||
|
||||
# For slow non-kvm tests.
|
||||
# nixos/modules/testing/test-instrumentation.nix also sets this. I don't know if there's a better way than etc to override theirs.
|
||||
environment.etc."systemd/system.conf.d/bigdefaulttimeout.conf".text = ''
|
||||
[Manager]
|
||||
# Allow extremely slow start (default for test-VMs is 5 minutes)
|
||||
DefaultTimeoutStartSec=15min
|
||||
'';
|
||||
}
|
||||
|
@ -1,32 +0,0 @@
|
||||
{ pkgs }:
|
||||
|
||||
let
|
||||
patchedMachinePM = pkgs.writeTextFile {
|
||||
name = "Machine.pm.patched-to-wait-longer-for-vm";
|
||||
text = builtins.replaceStrings ["alarm 600;"] ["alarm 1200;"] (builtins.readFile (<nixpkgs>+"/nixos/lib/test-driver/Machine.pm"));
|
||||
};
|
||||
in
|
||||
(pkgs // {
|
||||
qemu_test = with pkgs; stdenv.mkDerivation {
|
||||
name = "qemu_test_no_kvm";
|
||||
buildInputs = [ coreutils qemu_test ];
|
||||
inherit qemu_test;
|
||||
inherit coreutils;
|
||||
builder = builtins.toFile "builder.sh" ''
|
||||
PATH=$coreutils/bin:$PATH
|
||||
mkdir -p $out/bin
|
||||
cp $qemu_test/bin/* $out/bin/
|
||||
ln -sf $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} $out/bin/qemu-kvm
|
||||
'';
|
||||
};
|
||||
stdenv = pkgs.stdenv // {
|
||||
mkDerivation = args: (pkgs.stdenv.mkDerivation (args // (
|
||||
pkgs.lib.optionalAttrs (args.name == "nixos-test-driver") {
|
||||
installPhase = args.installPhase + ''
|
||||
rm $libDir/Machine.pm
|
||||
cp ${patchedMachinePM} $libDir/Machine.pm
|
||||
'';
|
||||
}
|
||||
)));
|
||||
};
|
||||
})
|
Loading…
Reference in New Issue
Block a user