From d1fc5b5f59ac222039fce96e027151fa3ee0392a Mon Sep 17 00:00:00 2001
From: Joonas Rautiola <joonas.rautiola@unikie.com>
Date: Thu, 5 Dec 2024 15:08:55 +0200
Subject: [PATCH] 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.

Signed-off-by: Joonas Rautiola <joonas.rautiola@unikie.com>
---
 hosts/azure/jenkins-controller/configuration.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/hosts/azure/jenkins-controller/configuration.nix b/hosts/azure/jenkins-controller/configuration.nix
index 9512fd0c..f439b048 100644
--- 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;
     })
   ];