···

       
1
       
1
       
-
       
args@{ mkNode, ... }:

     

       
1
       
1
       
+
       
args@{ mkNode, ver, ... }:

     

       
2
       
2
       
 
       
(import ../make-test-python.nix ({ pkgs, ...} : {

     

       
3
       
3
       
 
       
  name = "garage-basic";

     

       
4
       
4
       
 
       
  meta = {

     
···

       
52
       
52
       
 
       
       machine.succeed(f"garage layout apply --version {version}")

     

       
53
       
53
       
 
       


     

       
54
       
54
       
 
       
    def create_api_key(machine: Machine, key_name: str) -> S3Key:

     

       
55
       
55
       
-
       
       output = machine.succeed(f"garage key new --name {key_name}")

     

       
55
       
55
       
+
       
       output = machine.succeed(f"garage key ${if ver == "0_8" then "new --name" else "create"} {key_name}")

     

       
56
       
56
       
 
       
       m = key_creation_regex.match(output)

     

       
57
       
57
       
 
       
       if not m or not m.group('key_id') or not m.group('secret_key'):

     

       
58
       
58
       
 
       
          raise ValueError('Cannot parse API key data')

     
···

       
90
       
90
       
 
       
      single_node.wait_for_open_port(3900)

     

       
91
       
91
       
 
       
      # Now Garage is initialized.

     

       
92
       
92
       
 
       
      single_node_id = get_node_id(single_node)

     

       
93
       
93
       
-
       
      apply_garage_layout(single_node, [f'-z qemutest -c 1 "{single_node_id}"'])

     

       
93
       
93
       
+
       
      apply_garage_layout(single_node, [f'-z qemutest -c ${if ver == "0_8" then "1" else "1G"} "{single_node_id}"'])

     

       
94
       
94
       
 
       
      # Now Garage is operational.

     

       
95
       
95
       
 
       
      test_bucket_writes(single_node)

     

       
96
       
96
       
 
       
      test_bucket_over_http(single_node)

     

···

       
44
       
44
       
 
       
in

     

       
45
       
45
       
 
       
  foldl

     

       
46
       
46
       
 
       
  (matrix: ver: matrix // {

     

       
47
       
47
       
-
       
    "basic${toString ver}" = import ./basic.nix { inherit system pkgs; mkNode = mkNode pkgs."garage_${ver}"; };

     

       
48
       
48
       
-
       
    "with-3node-replication${toString ver}" = import ./with-3node-replication.nix { inherit system pkgs; mkNode = mkNode pkgs."garage_${ver}"; };

     

       
47
       
47
       
+
       
    "basic${toString ver}" = import ./basic.nix { inherit system pkgs ver; mkNode = mkNode pkgs."garage_${ver}"; };

     

       
48
       
48
       
+
       
    "with-3node-replication${toString ver}" = import ./with-3node-replication.nix { inherit system pkgs ver; mkNode = mkNode pkgs."garage_${ver}"; };

     

       
49
       
49
       
 
       
  })

     

       
50
       
50
       
 
       
  {}

     

       
51
       
51
       
 
       
  [

     

···

       
1
       
1
       
-
       
args@{ mkNode, ... }:

     

       
1
       
1
       
+
       
args@{ mkNode, ver, ... }:

     

       
2
       
2
       
 
       
(import ../make-test-python.nix ({ pkgs, ...} :

     

       
3
       
3
       
 
       
{

     

       
4
       
4
       
 
       
  name = "garage-3node-replication";

     
···

       
55
       
55
       
 
       
       machine.succeed(f"garage layout apply --version {version}")

     

       
56
       
56
       
 
       


     

       
57
       
57
       
 
       
    def create_api_key(machine: Machine, key_name: str) -> S3Key:

     

       
58
       
58
       
-
       
       output = machine.succeed(f"garage key new --name {key_name}")

     

       
58
       
58
       
+
       
       output = machine.succeed(f"garage key ${if ver == "0_8" then "new --name" else "create"} {key_name}")

     

       
59
       
59
       
 
       
       m = key_creation_regex.match(output)

     

       
60
       
60
       
 
       
       if not m or not m.group('key_id') or not m.group('secret_key'):

     

       
61
       
61
       
 
       
          raise ValueError('Cannot parse API key data')

     
···

       
110
       
110
       
 
       
      zones = ["nixcon", "nixcon", "paris_meetup", "fosdem"]

     

       
111
       
111
       
 
       
      apply_garage_layout(node1,

     

       
112
       
112
       
 
       
      [

     

       
113
       
113
       
-
       
        f'{ndata.node_id} -z {zones[index]} -c 1'

     

       
113
       
113
       
+
       
        f'{ndata.node_id} -z {zones[index]} -c ${if ver == "0_8" then "1" else "1G"}'

     

       
114
       
114
       
 
       
        for index, ndata in enumerate(node_ids.values())

     

       
115
       
115
       
 
       
      ])

     

       
116
       
116
       
 
       
      # Now Garage is operational.