regress: rename BlockEncrytion into VolumeEncryption

diff --git a/regress/prototype.conf b/regress/prototype.conf
index be113d32a25c73ceaea3ae4575b3608b3378337a..0c904b50c68d510b6cc5b8313309a2e35d0e07fb 100644 (file)
--- a/regress/prototype.conf
+++ b/regress/prototype.conf
@@ -9,6 +9,16 @@ USE_VTAPE=yes
 #FORCE_ALIGNED=yes
 #FORCE_DEDUP=yes
 #FORCE_SDCALLS=yes
+#FORCE_CLOUD=yes
+#FORCE_VOLENC=yes
+
+#CLOUD_NAME=AWSCloud
+#CLOUD_NAME=FakeS3Cloud
+#CLOUD_NAME=AzureCloud
+#CLOUD_NAME=AzuriteCloud
+#CLOUD_NAME=GoogleCloud
+#CLOUD_NAME=OracleCloud
+#CLOUD_NAME=RegressCloud
 
 #BAT="--enable-bat"
 BAT=

diff --git a/regress/scripts/functions b/regress/scripts/functions
index 777d1fd659b5445527425aceebbf56b3b63efc2b..8154a3ea20fe72f51ff70e5d52782554497ed360 100755 (executable)
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -213,8 +213,8 @@ EOF
       $bperl -e 'add_attribute("$conf/bacula-dir.conf", "SD Calls Client", "yes", "Client")'
       variant_name="${variant_name} SDcall"
    fi
-   if [ x$FORCE_SDENC = xyes ]; then
-      SDENC_COMMAND="\"$bin/key-manager-cmd.sh\""
+   if [ x$FORCE_VOLENC = xyes ]; then
+      ENC_COMMAND="\"$bin/key-manager-cmd.sh\""
       cat > $bin/key-manager-cmd.sh <<EOF
 # --key-dir "$working/keydir"
 # --log "$working/key-manager.log"
@@ -224,9 +224,9 @@ OPTION=-m
 exec $bin/key-manager.py getkey \$VERBOSE \$OPTION --cipher AES_128_XTS
 EOF
       chmod a+x $bin/key-manager-cmd.sh
-      $bperl -e "add_attribute('$conf/bacula-sd.conf', 'EncryptionCommand', '$SDENC_COMMAND', 'Storage')"
-      $bperl -e "add_attribute('$conf/bacula-sd.conf', 'BlockEncryption', 'enable', 'Device')"
-      variant_name="${variant_name} SDEnc"
+      $bperl -e "add_attribute('$conf/bacula-sd.conf', 'EncryptionCommand', '$ENC_COMMAND', 'Storage')"
+      $bperl -e "add_attribute('$conf/bacula-sd.conf', 'VolumeEncryption', 'enable', 'Device')"
+      variant_name="${variant_name} VolEnc"
 
 #      $bperl -e "add_attribute('$conf/bacula-dir.conf', 'SpoolData', 'no', 'Job')"