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

Signed-off-by: Ahelenia Ziemiańska <[email protected]>
openzfs · Apr 29, 2021 · 12d0625 · 12d0625
1 parent 3b1cda1
commit 12d0625
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 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
@@ -56,7 +56,7 @@ log_must zfs create -o encryption=on -o keyformat=passphrase \
 
 [ -n "$net" ] && \
 log_must zfs create -o encryption=on -o keyformat=passphrase \
-	-o keylocation=https://raw.githubusercontent.com/openzfs/zfs/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
@@ -54,13 +54,13 @@ log_mustnot zfs create -o encryption=on -o keyformat=passphrase \
 	-o keylocation=https://github.com/openzfs/nonexistent-repository $TESTPOOL/$TESTFS1
 
 log_must zfs create -o encryption=on -o keyformat=passphrase \
-	-o keylocation=https://raw.githubusercontent.com/openzfs/zfs/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://raw.githubusercontent.com/openzfs/zfs/master/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/HEXKEY $TESTPOOL/$TESTFS2
+	-o keylocation=https://raw.githubusercontent.com/openzfs/zfs/774436db7a6b4a38e7f0f2a908331c529b8712cd/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/HEXKEY $TESTPOOL/$TESTFS2
 
 log_must zfs create -o encryption=on -o keyformat=raw \
-	-o keylocation=https://raw.githubusercontent.com/openzfs/zfs/master/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/RAWKEY $TESTPOOL/$TESTFS3
+	-o keylocation=https://raw.githubusercontent.com/openzfs/zfs/774436db7a6b4a38e7f0f2a908331c529b8712cd/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/RAWKEY $TESTPOOL/$TESTFS3
 
 for fs in "$TESTFS1" "$TESTFS2" "$TESTFS3"; do
 	log_must zfs unmount $TESTPOOL/$fs

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
@@ -72,7 +72,7 @@ log_must verify_keylocation $TESTPOOL/$TESTFS1 "file://$key_location"
 
 if has_network; then
 	log_must zfs unload-key $TESTPOOL/$TESTFS1
-	log_must zfs load-key -L https://raw.githubusercontent.com/openzfs/zfs/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"
 fi

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
@@ -56,7 +56,7 @@ log_must zfs create -o keyformat=passphrase \
 
 [ -n "$net" ] && \
 log_must zfs create -o keyformat=passphrase \
-	-o keylocation=https://raw.githubusercontent.com/openzfs/zfs/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
 [ -n "$net" ] && log_must zfs unload-key $TESTPOOL/$TESTFS1/child/child