libzfs: drop on merge! or come up with something better

Signed-off-by: Ahelenia Ziemiańska <[email protected]>
openzfs · Apr 28, 2021 · 5e64ad0 · 5e64ad0
1 parent 40ebabc
commit 5e64ad0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_all.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_all.ksh
@@ -53,7 +53,7 @@ log_must zfs create -o encryption=on -o keyformat=passphrase \
 	-o keylocation=file:///$TESTPOOL/pkey $TESTPOOL/$TESTFS1
 
 log_must zfs create -o encryption=on -o keyformat=passphrase \
-	-o keylocation=https://github.com/openzfs/zfs/raw/master/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS2
+	-o keylocation=https://raw.githubusercontent.com/openzfs/zfs/774436db7a6b4a38e7f0f2a908331c529b8712cd/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS2
 
 log_must zfs create -V 64M -o encryption=on -o keyformat=passphrase \
 	-o keylocation=file:///$TESTPOOL/pkey $TESTPOOL/zvol

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_https.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_https.ksh
@@ -43,7 +43,7 @@ log_onexit cleanup
 log_assert "'zfs load-key' should load a key from a file"
 
 log_must zfs create -o encryption=on -o keyformat=passphrase \
-	-o keylocation=https://github.com/openzfs/zfs/raw/master/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS1
+	-o keylocation=https://raw.githubusercontent.com/openzfs/zfs/774436db7a6b4a38e7f0f2a908331c529b8712cd/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS1
 
 log_must zfs create -o encryption=on -o keyformat=hex \
 	-o keylocation=https://github.com/openzfs/zfs/raw/master/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/HEXKEY $TESTPOOL/$TESTFS2

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_location.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_location.ksh
@@ -71,7 +71,7 @@ log_must key_available $TESTPOOL/$TESTFS1
 log_must verify_keylocation $TESTPOOL/$TESTFS1 "file://$key_location"
 
 log_must zfs unload-key $TESTPOOL/$TESTFS1
-log_must zfs load-key -L https://github.com/openzfs/zfs/raw/master/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS1
+log_must zfs load-key -L https://raw.githubusercontent.com/openzfs/zfs/774436db7a6b4a38e7f0f2a908331c529b8712cd/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS1
 log_must key_available $TESTPOOL/$TESTFS1
 log_must verify_keylocation $TESTPOOL/$TESTFS1 "file://$key_location"
 

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_recursive.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_recursive.ksh
@@ -53,7 +53,7 @@ log_must zfs create -o keyformat=passphrase \
 	-o keylocation=file:///$TESTPOOL/pkey $TESTPOOL/$TESTFS1/child
 
 log_must zfs create -o keyformat=passphrase \
-	-o keylocation=https://github.com/openzfs/zfs/raw/master/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS1/child/child
+	-o keylocation=https://raw.githubusercontent.com/openzfs/zfs/774436db7a6b4a38e7f0f2a908331c529b8712cd/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE $TESTPOOL/$TESTFS1/child/child
 
 log_must zfs unmount $TESTPOOL/$TESTFS1
 log_must zfs unload-key $TESTPOOL/$TESTFS1/child/child