Revert to rclone 1.66 in jenkins controller

Using rclone 1.68.2 from nixos 24.11 results in 308 redirect error in pipelines when archiving target images. Most recent rclone can still be used in services/rclone-http Signed-off-by: Joonas Rautiola <[email protected]>
tiiuae · Dec 9, 2024 · 0255906 · 0255906
1 parent f5cfb8a
commit 0255906
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/hosts/azure/jenkins-controller/configuration.nix b/hosts/azure/jenkins-controller/configuration.nix
@@ -69,7 +69,12 @@ let
         s = client.get_secret(secret_name)
         print(s.value)
       '';
-  rclone = pkgs.callPackage ../../../pkgs/rclone { };
+
+  # nixos 24.05 pkgs is used for rclone and jenkins-job-builder
+  old-pkgs = (import inputs.nixpkgs-24-05 { inherit (pkgs) system; });
+
+  # rclone 1.68.2 breaks our pipelines, keep using the old 1.66 version
+  rclone = old-pkgs.callPackage ../../../pkgs/rclone { };
 in
 {
   imports = [
@@ -107,7 +112,7 @@ in
   # Needs to be an overlay so that it propagates to service.jenkins.jobBuilder
   nixpkgs.overlays = [
     (_: _: {
-      inherit ((import inputs.nixpkgs-24-05 { inherit (pkgs) system; })) jenkins-job-builder;
+      inherit (old-pkgs) jenkins-job-builder;
     })
   ];
 

diff --git a/services/rclone-http/default.nix b/services/rclone-http/default.nix
@@ -9,7 +9,6 @@
 with lib;
 let
   cfg = config.services.rclone-http;
-  rclone = pkgs.callPackage ../../pkgs/rclone { };
 in
 {
   options.services.rclone-http = {
@@ -56,7 +55,7 @@ in
         EnvironmentFile = "/var/lib/rclone-http/env";
         ExecStart = concatStringsSep " " (
           [
-            "${rclone}/bin/rclone"
+            "${pkgs.rclone}/bin/rclone"
             "serve"
             cfg.protocol
           ]