commit 6dfab1853d3a01aa6c51fffc5f70b1124fcffde6 · pyrox.dev/nixpkgs

+11 -4

nixos/lib/build-vms.nix

···

       68
       68
        
                             prefixLength = 24;

     

       69
       69
        
                         } ];

     

       70
       70
        
                       });

     

       71
       71
       -
                   in

     

       72
       72
       -
                   { key = "ip-address";

     

       73
       73
       -
                     config =

     

       71
       71
       +
       

     

       72
       72
       +
                     networkConfig =

     

       74
       73
        
                       { networking.hostName = mkDefault m.fst;

     

       75
       74
        
       

     

       76
       75
        
                         networking.interfaces = listToAttrs interfaces;

     
···

       96
       95
        
                           in flip concatMap interfacesNumbered

     

       97
       96
        
                             ({ fst, snd }: qemu-common.qemuNICFlags snd fst m.snd);

     

       98
       97
        
                       };

     

       99
       99
       -
                   }

     

       98
       98
       +
       

     

       99
       99
       +
                     in

     

       100
       100
       +
                       { key = "ip-address";

     

       101
       101
       +
                         config = networkConfig // {

     

       102
       102
       +
                           # Expose the networkConfig items for tests like nixops

     

       103
       103
       +
                           # that need to recreate the network config.

     

       104
       104
       +
                           system.build.networkConfig = networkConfig;

     

       105
       105
       +
                         };

     

       106
       106
       +
                       }

     

       100
       107
        
                 )

     

       101
       108
        
                 (getAttr m.fst nodes)

     

       102
       109
        
               ] );

+1 -1

nixos/maintainers/scripts/azure-new/examples/basic/image.nix

···

       1
       1
        
       let

     

       2
       2
        
         pkgs = (import ../../../../../../default.nix {});

     

       3
       3
       -
         machine = import "${pkgs.path}/nixos/lib/eval-config.nix" {

     

       3
       3
       +
         machine = import (pkgs.path + "/nixos/lib/eval-config.nix") {

     

       4
       4
        
           system = "x86_64-linux";

     

       5
       5
        
           modules = [

     

       6
       6
        
             ({config, ...}: { imports = [ ./system.nix ]; })

nixos/tests/all-tests.nix

···

       311
       311
        
         nitter = handleTest ./nitter.nix {};

     

       312
       312
        
         nix-serve = handleTest ./nix-ssh-serve.nix {};

     

       313
       313
        
         nix-ssh-serve = handleTest ./nix-ssh-serve.nix {};

     

       314
       314
       +
         nixops = handleTest ./nixops/default.nix {};

     

       314
       315
        
         nixos-generate-config = handleTest ./nixos-generate-config.nix {};

     

       315
       316
        
         node-red = handleTest ./node-red.nix {};

     

       316
       317
        
         nomad = handleTest ./nomad.nix {};

+115

nixos/tests/nixops/default.nix

···

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         inherit (pkgs) lib;

     

       4
       4
       +
       

     

       5
       5
       +
         tests = {

     

       6
       6
       +
           # TODO: uncomment stable

     

       7
       7
       +
           #  - Blocked on https://github.com/NixOS/nixpkgs/issues/138584 which has a

     

       8
       8
       +
           #    PR in staging: https://github.com/NixOS/nixpkgs/pull/139986

     

       9
       9
       +
           #  - Alternatively, blocked on a NixOps 2 release

     

       10
       10
       +
           #    https://github.com/NixOS/nixops/issues/1242

     

       11
       11
       +
           # stable = testsLegacyNetwork { nixopsPkg = pkgs.nixops; };

     

       12
       12
       +
           unstable = testsForPackage { nixopsPkg = pkgs.nixopsUnstable; };

     

       13
       13
       +
       

     

       14
       14
       +
           # inherit testsForPackage;

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         testsForPackage = lib.makeOverridable (args: lib.recurseIntoAttrs {

     

       18
       18
       +
           legacyNetwork = testLegacyNetwork args;

     

       19
       19
       +
         });

     

       20
       20
       +
       

     

       21
       21
       +
         testLegacyNetwork = { nixopsPkg }: pkgs.nixosTest ({

     

       22
       22
       +
           nodes = {

     

       23
       23
       +
             deployer = { config, lib, nodes, pkgs, ... }: {

     

       24
       24
       +
               imports = [ ../../modules/installer/cd-dvd/channel.nix ];

     

       25
       25
       +
               environment.systemPackages = [ nixopsPkg ];

     

       26
       26
       +
               nix.binaryCaches = lib.mkForce [ ];

     

       27
       27
       +
               users.users.person.isNormalUser = true;

     

       28
       28
       +
               virtualisation.writableStore = true;

     

       29
       29
       +
               virtualisation.memorySize = 1024 /*MiB*/;

     

       30
       30
       +
               virtualisation.pathsInNixDB = [

     

       31
       31
       +
                 pkgs.hello

     

       32
       32
       +
                 pkgs.figlet

     

       33
       33
       +
       

     

       34
       34
       +
                 # This includes build dependencies all the way down. Not efficient,

     

       35
       35
       +
                 # but we do need build deps to an *arbitrary* depth, which is hard to

     

       36
       36
       +
                 # determine.

     

       37
       37
       +
                 (allDrvOutputs nodes.server.config.system.build.toplevel)

     

       38
       38
       +
               ];

     

       39
       39
       +
             };

     

       40
       40
       +
             server = { lib, ... }: {

     

       41
       41
       +
               imports = [ ./legacy/base-configuration.nix ];

     

       42
       42
       +
             };

     

       43
       43
       +
           };

     

       44
       44
       +
       

     

       45
       45
       +
           testScript = { nodes }:

     

       46
       46
       +
             let

     

       47
       47
       +
               deployerSetup = pkgs.writeScript "deployerSetup" ''

     

       48
       48
       +
                 #!${pkgs.runtimeShell}

     

       49
       49
       +
                 set -eux -o pipefail

     

       50
       50
       +
                 cp --no-preserve=mode -r ${./legacy} unicorn

     

       51
       51
       +
                 cp --no-preserve=mode ${../ssh-keys.nix} unicorn/ssh-keys.nix

     

       52
       52
       +
                 mkdir -p ~/.ssh

     

       53
       53
       +
                 cp ${snakeOilPrivateKey} ~/.ssh/id_ed25519

     

       54
       54
       +
                 chmod 0400 ~/.ssh/id_ed25519

     

       55
       55
       +
               '';

     

       56
       56
       +
               serverNetworkJSON = pkgs.writeText "server-network.json"

     

       57
       57
       +
                 (builtins.toJSON nodes.server.config.system.build.networkConfig);

     

       58
       58
       +
             in

     

       59
       59
       +
             ''

     

       60
       60
       +
               import shlex

     

       61
       61
       +
       

     

       62
       62
       +
               def deployer_do(cmd):

     

       63
       63
       +
                   cmd = shlex.quote(cmd)

     

       64
       64
       +
                   return deployer.succeed(f"su person -l -c {cmd} &>/dev/console")

     

       65
       65
       +
       

     

       66
       66
       +
               start_all()

     

       67
       67
       +
       

     

       68
       68
       +
               deployer_do("cat /etc/hosts")

     

       69
       69
       +
       

     

       70
       70
       +
               deployer_do("${deployerSetup}")

     

       71
       71
       +
               deployer_do("cp ${serverNetworkJSON} unicorn/server-network.json")

     

       72
       72
       +
       

     

       73
       73
       +
               # Establish that ssh works, regardless of nixops

     

       74
       74
       +
               # Easy way to accept the server host key too.

     

       75
       75
       +
               server.wait_for_open_port(22)

     

       76
       76
       +
               deployer.wait_for_unit("network.target")

     

       77
       77
       +
       

     

       78
       78
       +
               # Put newlines on console, to flush the console reader's line buffer

     

       79
       79
       +
               # in case nixops' last output did not end in a newline, as is the case

     

       80
       80
       +
               # with a status line (if implemented?)

     

       81
       81
       +
               deployer.succeed("while sleep 60s; do echo [60s passed] >/dev/console; done &")

     

       82
       82
       +
       

     

       83
       83
       +
               deployer_do("cd ~/unicorn; ssh -oStrictHostKeyChecking=accept-new root@server echo hi")

     

       84
       84
       +
       

     

       85
       85
       +
               # Create and deploy

     

       86
       86
       +
               deployer_do("cd ~/unicorn; nixops create")

     

       87
       87
       +
       

     

       88
       88
       +
               deployer_do("cd ~/unicorn; nixops deploy --confirm")

     

       89
       89
       +
       

     

       90
       90
       +
               deployer_do("cd ~/unicorn; nixops ssh server 'hello | figlet'")

     

       91
       91
       +
             '';

     

       92
       92
       +
         });

     

       93
       93
       +
       

     

       94
       94
       +
         inherit (import ../ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;

     

       95
       95
       +
       

     

       96
       96
       +
         /*

     

       97
       97
       +
           Return a store path with a closure containing everything including

     

       98
       98
       +
           derivations and all build dependency outputs, all the way down.

     

       99
       99
       +
         */

     

       100
       100
       +
         allDrvOutputs = pkg:

     

       101
       101
       +
           let name = lib.strings.sanitizeDerivationName "allDrvOutputs-${pkg.pname or pkg.name or "unknown"}";

     

       102
       102
       +
           in

     

       103
       103
       +
           pkgs.runCommand name { refs = pkgs.writeReferencesToFile pkg.drvPath; } ''

     

       104
       104
       +
             touch $out

     

       105
       105
       +
             while read ref; do

     

       106
       106
       +
               case $ref in

     

       107
       107
       +
                 *.drv)

     

       108
       108
       +
                   cat $ref >>$out

     

       109
       109
       +
                   ;;

     

       110
       110
       +
               esac

     

       111
       111
       +
             done <$refs

     

       112
       112
       +
           '';

     

       113
       113
       +
       

     

       114
       114
       +
       in

     

       115
       115
       +
       tests

+31

nixos/tests/nixops/legacy/base-configuration.nix

···

       1
       1
       +
       { lib, modulesPath, pkgs, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         ssh-keys =

     

       4
       4
       +
           if builtins.pathExists ../../ssh-keys.nix

     

       5
       5
       +
           then # Outside sandbox

     

       6
       6
       +
             ../../ssh-keys.nix

     

       7
       7
       +
           else # In sandbox

     

       8
       8
       +
             ./ssh-keys.nix;

     

       9
       9
       +
       

     

       10
       10
       +
         inherit (import ssh-keys pkgs)

     

       11
       11
       +
           snakeOilPrivateKey snakeOilPublicKey;

     

       12
       12
       +
       in

     

       13
       13
       +
       {

     

       14
       14
       +
         imports = [

     

       15
       15
       +
           (modulesPath + "/virtualisation/qemu-vm.nix")

     

       16
       16
       +
           (modulesPath + "/testing/test-instrumentation.nix")

     

       17
       17
       +
         ];

     

       18
       18
       +
         virtualisation.writableStore = true;

     

       19
       19
       +
         nix.binaryCaches = lib.mkForce [ ];

     

       20
       20
       +
         virtualisation.graphics = false;

     

       21
       21
       +
         documentation.enable = false;

     

       22
       22
       +
         services.qemuGuest.enable = true;

     

       23
       23
       +
         boot.loader.grub.enable = false;

     

       24
       24
       +
       

     

       25
       25
       +
         services.openssh.enable = true;

     

       26
       26
       +
         users.users.root.openssh.authorizedKeys.keys = [

     

       27
       27
       +
           snakeOilPublicKey

     

       28
       28
       +
         ];

     

       29
       29
       +
         security.pam.services.sshd.limits =

     

       30
       30
       +
           [{ domain = "*"; item = "memlock"; type = "-"; value = 1024; }];

     

       31
       31
       +
       }

+15

nixos/tests/nixops/legacy/nixops.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         network = {

     

       3
       3
       +
           description = "Legacy Network using <nixpkgs> and legacy state.";

     

       4
       4
       +
           # NB this is not really what makes it a legacy network; lack of flakes is.

     

       5
       5
       +
           storage.legacy = { };

     

       6
       6
       +
         };

     

       7
       7
       +
         server = { lib, pkgs, ... }: {

     

       8
       8
       +
           deployment.targetEnv = "none";

     

       9
       9
       +
           imports = [

     

       10
       10
       +
             ./base-configuration.nix

     

       11
       11
       +
             (lib.modules.importJSON ./server-network.json)

     

       12
       12
       +
           ];

     

       13
       13
       +
           environment.systemPackages = [ pkgs.hello pkgs.figlet ];

     

       14
       14
       +
         };

     

       15
       15
       +
       }

+16 -8

pkgs/applications/networking/cluster/nixops/default.nix

···

       1
       1
       -
       { pkgs

     

       1
       1
       +
       { nixosTests

     

       2
       2
       +
       , pkgs

     

       2
       3
        
       , poetry2nix

     

       3
       4
        
       , lib

     

       4
       5
        
       , overrides ? (self: super: {})

     
···

       59
       60
        
           }

     

       60
       61
        
         ).python;

     

       61
       62
        
       

     

       62
       62
       -
       in interpreter.pkgs.nixops.withPlugins(ps: [

     

       63
       63
       -
         ps.nixops-encrypted-links

     

       64
       64
       -
         ps.nixops-virtd

     

       65
       65
       -
         ps.nixops-aws

     

       66
       66
       -
         ps.nixops-gcp

     

       67
       67
       -
         ps.nixopsvbox

     

       68
       68
       -
       ])

     

       63
       63
       +
         pkg = interpreter.pkgs.nixops.withPlugins(ps: [

     

       64
       64
       +
           ps.nixops-encrypted-links

     

       65
       65
       +
           ps.nixops-virtd

     

       66
       66
       +
           ps.nixops-aws

     

       67
       67
       +
           ps.nixops-gcp

     

       68
       68
       +
           ps.nixopsvbox

     

       69
       69
       +
         ]) // rec {

     

       70
       70
       +
           # Workaround for https://github.com/NixOS/nixpkgs/issues/119407

     

       71
       71
       +
           # TODO after #1199407: Use .overrideAttrs(pkg: old: { passthru.tests = .....; })

     

       72
       72
       +
           tests = nixosTests.nixops.unstable.override { nixopsPkg = pkg; };

     

       73
       73
       +
           # Not strictly necessary, but probably expected somewhere; part of the workaround:

     

       74
       74
       +
           passthru.tests = tests;

     

       75
       75
       +
         };

     

       76
       76
       +
       in pkg