commit 2dd453b74b60f903933dd141475fd9dd89fa45a4 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       384
       384
        
         coturn = runTest ./coturn.nix;

     

       385
       385
        
         couchdb = runTest ./couchdb.nix;

     

       386
       386
        
         crabfit = runTest ./crabfit.nix;

     

       387
       387
       -
         cri-o = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./cri-o.nix { };

     

       387
       387
       +
         cri-o = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./cri-o.nix;

     

       388
       388
        
         cryptpad = runTest ./cryptpad.nix;

     

       389
       389
        
         cups-pdf = runTest ./cups-pdf.nix;

     

       390
       390
        
         curl-impersonate = runTest ./curl-impersonate.nix;

+15 -20

nixos/tests/cri-o.nix

···

       1
       1
       -
       # This test runs CRI-O and verifies via critest

     

       2
       2
       -
       import ./make-test-python.nix (

     

       3
       3
       -
         { pkgs, ... }:

     

       4
       4
       -
         {

     

       5
       5
       -
           name = "cri-o";

     

       6
       6
       -
           meta.maintainers = with pkgs.lib; teams.podman.members;

     

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "cri-o";

     

       4
       4
       +
         meta.maintainers = lib.teams.podman.members;

     

       7
       5
        
       

     

       8
       8
       -
           nodes = {

     

       9
       9
       -
             crio = {

     

       10
       10
       -
               virtualisation.cri-o.enable = true;

     

       11
       11
       -
             };

     

       12
       12
       -
           };

     

       6
       6
       +
         nodes.crio = {

     

       7
       7
       +
           virtualisation.cri-o.enable = true;

     

       8
       8
       +
         };

     

       13
       9
        
       

     

       14
       14
       -
           testScript = ''

     

       15
       15
       -
             start_all()

     

       16
       16
       -
             crio.wait_for_unit("crio.service")

     

       17
       17
       -
             crio.succeed(

     

       18
       18
       -
                 "critest --ginkgo.focus='Runtime info' --runtime-endpoint unix:///var/run/crio/crio.sock"

     

       19
       19
       -
             )

     

       20
       20
       -
           '';

     

       21
       21
       -
         }

     

       22
       22
       -
       )

     

       10
       10
       +
         testScript = ''

     

       11
       11
       +
           start_all()

     

       12
       12
       +
           crio.wait_for_unit("crio.service")

     

       13
       13
       +
           crio.succeed(

     

       14
       14
       +
               "critest --ginkgo.focus='Runtime info' --runtime-endpoint unix:///var/run/crio/crio.sock"

     

       15
       15
       +
           )

     

       16
       16
       +
         '';

     

       17
       17
       +
       }