From 3f362f1c07e8583f53dc24f22a8e6db81e867fe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?=
 <theophane.hufschmitt@tweag.io>
Date: Fri, 31 Mar 2023 15:28:46 +0200
Subject: [PATCH] test: Make the installer work on old rhel versions

`scp -r` doesn't seem to behave properly there, so tarpipe ftw!
---
 tests/installer/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/installer/default.nix b/tests/installer/default.nix
index 76ee6530b..49cfd2bcc 100644
--- a/tests/installer/default.nix
+++ b/tests/installer/default.nix
@@ -33,9 +33,9 @@ let
   mockChannel = pkgs:
     pkgs.runCommandNoCC "mock-channel" {} ''
       mkdir nixexprs
-      mkdir $out
+      mkdir -p $out/channel
       echo -n 'someContent' > nixexprs/someFile
-      tar cvf - nixexprs | bzip2 > $out/nixexprs.tar.bz2
+      tar cvf - nixexprs | bzip2 > $out/channel/nixexprs.tar.bz2
     '';
 
   disableSELinux = "sudo setenforce 0";
@@ -198,7 +198,9 @@ let
         $ssh "set -eux; $installScript"
 
         echo "Copying the mock channel"
-        scp -r -P 20022 $ssh_opts ${mockChannel pkgs} vagrant@localhost:channel
+        # `scp -r` doesn't seem to work properly on some rhel instances, so let's
+        # use a plain tarpipe instead
+        tar -C ${mockChannel pkgs} -c channel | ssh -p 20022 $ssh_opts vagrant@localhost tar x -f-
 
         echo "Testing Nix installation..."
         $ssh <<EOF