aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2022-09-15 14:51:10 +0200
committerEelco Dolstra <edolstra@gmail.com>2022-09-15 14:51:10 +0200
commita96ad2ab25ea054b9d1c473ce2f692bd1f83402b (patch)
treeca93b37cab1e958df1b349e2021b8634af61a795 /tests
parent503f31e2a0de3192ccc572cc17a6dd02863ebec8 (diff)
Add RHEL 7/8
Diffstat (limited to 'tests')
-rw-r--r--tests/installer/default.nix34
1 files changed, 33 insertions, 1 deletions
diff --git a/tests/installer/default.nix b/tests/installer/default.nix
index 39e3c8d26..d31e2a949 100644
--- a/tests/installer/default.nix
+++ b/tests/installer/default.nix
@@ -71,6 +71,38 @@ let
postBoot = disableSELinux;
};
+ # Currently fails with 'error while loading shared libraries:
+ # libsodium.so.23: cannot stat shared object: Invalid argument'.
+ /*
+ "rhel-6" = {
+ image = import <nix/fetchurl.nix> {
+ url = https://app.vagrantup.com/generic/boxes/rhel6/versions/4.1.12/providers/libvirt.box;
+ hash = "sha256-QwzbvRoRRGqUCQptM7X/InRWFSP2sqwRt2HaaO6zBGM=";
+ };
+ rootDisk = "box.img";
+ system = "x86_64-linux";
+ };
+ */
+
+ "rhel-7" = {
+ image = import <nix/fetchurl.nix> {
+ url = https://app.vagrantup.com/generic/boxes/rhel7/versions/4.1.12/providers/libvirt.box;
+ hash = "sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U=";
+ };
+ rootDisk = "box.img";
+ system = "x86_64-linux";
+ };
+
+ "rhel-8" = {
+ image = import <nix/fetchurl.nix> {
+ url = https://app.vagrantup.com/generic/boxes/rhel8/versions/4.1.12/providers/libvirt.box;
+ hash = "sha256-zFOPjSputy1dPgrQRixBXmlyN88cAKjJ21VvjSWUCUY=";
+ };
+ rootDisk = "box.img";
+ system = "x86_64-linux";
+ postBoot = disableSELinux;
+ };
+
};
makeTest = imageName: testName:
@@ -116,7 +148,7 @@ let
chmod 0400 ./vagrant_insecure_key
- ssh_opts="-o StrictHostKeyChecking=no -o PubkeyAcceptedKeyTypes=+ssh-rsa -i ./vagrant_insecure_key"
+ ssh_opts="-o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa -i ./vagrant_insecure_key"
ssh="ssh -p 20022 -q $ssh_opts vagrant@localhost"
echo "Waiting for SSH..."