Final changes

[bacula/bacula] / regress / scripts / bacula-dir-migration.conf.in

diff --git a/regress/scripts/bacula-dir-migration.conf.in b/regress/scripts/bacula-dir-migration.conf.in
index 088ad3e8dc8293c9608fcab9351601eb5ed15bd7..fb577c7666d9ae778af5538edae833721c048131 100644 (file)
--- a/regress/scripts/bacula-dir-migration.conf.in
+++ b/regress/scripts/bacula-dir-migration.conf.in
@@ -41,20 +41,66 @@ Job {
 }
 
 Job {
-  Name = "migrate"
+  Name = "migrate-job"
   Type = Migrate
   Level = Full
   Client=@hostname@-fd 
   FileSet="Full Set"
   Messages = Standard
   Storage = DiskChanger
-  Write Bootstrap = "@working_dir@/migrate.bsr"
+  Write Bootstrap = "@working_dir@/migratejob.bsr"
   Pool = Default
   Maximum Concurrent Jobs = 4
   Selection Type = Job 
   Selection Pattern = ".*Save"
 }
 
+Job {
+  Name = "migrate-volume"
+  Type = Migrate
+  Level = Full
+  Client=@hostname@-fd 
+  FileSet="Full Set"
+  Messages = Standard
+  Storage = DiskChanger
+  Write Bootstrap = "@working_dir@/migratevol.bsr"
+  Pool = Default
+  Maximum Concurrent Jobs = 4
+  Selection Type = Volume
+  Selection Pattern = "File*"
+}
+
+Job {
+  Name = "migrate-occupancy"
+  Type = Migrate
+  Level = Full
+  Client=@hostname@-fd 
+  FileSet="Full Set"
+  Messages = Standard
+  Storage = DiskChanger
+  Write Bootstrap = "@working_dir@/migratejob.bsr"
+  Pool = Default
+  Maximum Concurrent Jobs = 4
+  Selection Type = PoolOccupancy
+}
+
+Job {
+  Name = "migrate-time"
+  Type = Migrate
+  Level = Full
+  Client=@hostname@-fd 
+  FileSet="Full Set"
+  Messages = Standard
+  Storage = DiskChanger
+  Write Bootstrap = "@working_dir@/migratejob.bsr"
+  Pool = Default
+  Maximum Concurrent Jobs = 4
+  Selection Type = PoolTime
+}
+
+
+
+
 # Standard Restore template, to be changed by Console program
 Job {
   Name = "RestoreFiles"
@@ -135,8 +181,8 @@ Catalog {
 #  and to the console
 Messages {
   Name = Standard
-  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
+  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression Job %j\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
+  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression Job %j\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
   MailOnError = @job_email@ = all, !terminate
   operator = @job_email@ = mount
   console = all, !skipped, !terminate, !restored
@@ -168,6 +214,9 @@ Pool {
   Volume Retention = 365d             # one year
   NextPool = Full
   Storage = File
+  Migration High Bytes = 40M
+  Migration Low Bytes = 20M
+  Migration Time = 60
 }
 
 Pool {