Try to deploy using deploy-rsopen-gfw-nix

4 files changed, 102 insertions, 6 deletions

diff --git a/ci/ios/test-router/app-team-ios-lab.nix b/ci/ios/test-router/app-team-ios-lab.nix
index 3946403480..8e328f1ff9 100644
--- a/ci/ios/test-router/app-team-ios-lab.nix
+++ b/ci/ios/test-router/app-team-ios-lab.nix
@@ -41,4 +41,3 @@
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
-
diff --git a/ci/ios/test-router/flake.lock b/ci/ios/test-router/flake.lock
index 6a449efb7e..c01652929b 100644
--- a/ci/ios/test-router/flake.lock
+++ b/ci/ios/test-router/flake.lock
@@ -1,7 +1,59 @@
 {
   "nodes": {
+    "deploy-rs": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": "nixpkgs",
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1749105467,
+        "narHash": "sha256-hXh76y/wDl15almBcqvjryB50B0BaiXJKk20f314RoE=",
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "rev": "6bc76b872374845ba9d645a2f012b764fecd765f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
+        "lastModified": 1743014863,
+        "narHash": "sha256-jAIUqsiN2r3hCuHji80U7NNEafpIMBXiwKlSrjWMlpg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "bd3bac8bfb542dbde7ffffb6987a1a1f9d41699f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
         "lastModified": 1742937945,
         "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=",
         "owner": "NixOS",
@@ -18,7 +70,41 @@
     },
     "root": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "deploy-rs": "deploy-rs",
+        "nixpkgs": "nixpkgs_2"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
       }
     }
   },
diff --git a/ci/ios/test-router/flake.nix b/ci/ios/test-router/flake.nix
index 0650830934..3c997579ce 100644
--- a/ci/ios/test-router/flake.nix
+++ b/ci/ios/test-router/flake.nix
@@ -1,9 +1,12 @@
 {
   description = "Config for our testing router";
 
-  inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; };
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    deploy-rs.url = "github:serokell/deploy-rs";
+  };
 
-  outputs = { self, nixpkgs }: {
+  outputs = { self, nixpkgs, deploy-rs }: {
     nixosConfigurations.app-team-ios-lab = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
@@ -25,6 +28,14 @@
       ];
     };
 
+    deploy.nodes.app-team-ios-lab = {
+            hostname = "app-test-ios-tests";
+            profiles.system = {
+              user = "root";
+              path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.app-team-ios-lab;
+            };
+        };
+
     nixosConfigurations.app-team-ios-lab-iso = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
diff --git a/ci/ios/test-router/raas.nix b/ci/ios/test-router/raas.nix
index 8af141332a..4362140fd7 100644
--- a/ci/ios/test-router/raas.nix
+++ b/ci/ios/test-router/raas.nix
@@ -1,6 +1,6 @@
-{ pkgs, rustPlatform, pkg-config, libmnl, libnftnl, libpcap, ... }:
+{  rustPlatform, pkg-config, libmnl, libnftnl, libpcap, ... }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
   pname = "raas";
   version = "0.0.1";