systemtests: add droplet config

bareos · Jul 20, 2020 · e016292 · e016292
1 parent 9eb3c9f
commit e016292
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/core/src/stored/backends/CMakeLists.txt b/core/src/stored/backends/CMakeLists.txt
@@ -46,6 +46,7 @@ if(${HAVE_DROPLET})
   add_library(bareossd-droplet MODULE droplet_device.cc)
   target_link_libraries(bareossd-droplet bareossd-chunked ${DROPLET_LIBRARIES})
   install(TARGETS bareossd-droplet DESTINATION ${backenddir})
+  message(STATUS "Binary Path == ${backenddir}")
 endif()
 
 add_library(bareossd-fifo MODULE unix_fifo_device.cc)

diff --git a/systemtests/tests/droplet-s3/etc/bareos/bareos-dir.d/storage/File.conf.in b/systemtests/tests/droplet-s3/etc/bareos/bareos-dir.d/storage/File.conf.in
@@ -1,7 +1,8 @@
 Storage {
   Name = File
-  Address = @hostname@
+  Address = localhost
   Password = "@sd_password@"
   Device = S3_ObjectStorage
   Media Type = S3_Object1
+  Port = "@sd_port@"
 }
diff --git a/systemtests/tests/droplet-s3/etc/bareos/bareos-sd.d/device/S3_ObjectStorage.conf b/systemtests/tests/droplet-s3/etc/bareos/bareos-sd.d/device/S3_ObjectStorage.conf
@@ -3,7 +3,7 @@ Device {
   Media Type = S3_Object1
   Archive Device = S3 Object Storage
   # Bucket needs to be host-indivdidual
-  Device Options = "profile=/etc/bareos/bareos-sd.d/device/droplet/droplet.profile,bucket="test",iothreads=2"
+  Device Options = "profile=@confdir@/bareos-sd.d/device/droplet/droplet.profile,bucket=backup,iothreads=2"
   Device Type = droplet
   LabelMedia = yes                    # lets Bareos label unlabeled media
   Random Access = yes
@@ -12,4 +12,5 @@ Device {
   AlwaysOpen = no
   Description = "S3 Object device. A connecting Director must have the same Name and MediaType."
   Maximum File Size = 20000000       # 20 MB (Allows for seeking to small portions of the Volume)
+  Maximum Concurrent Jobs = 1
 }
diff --git a/systemtests/tests/droplet-s3/etc/bareos/bareos-sd.d/device/droplet/droplet.profile b/systemtests/tests/droplet-s3/etc/bareos/bareos-sd.d/device/droplet/droplet.profile
@@ -0,0 +1,8 @@
+host = localhost:9000
+use_https = false
+access_key = minioadmin
+secret_key = minioadmin
+pricing_dir = ""
+backend = s3
+aws_auth_sign_version = 4       # Currently, AWS S3 uses version 4. The Ceph S3 gateway uses version 2.
+aws_region = eu-central-1
diff --git a/systemtests/tests/droplet-s3/etc/bareos/bconsole.conf.in b/systemtests/tests/droplet-s3/etc/bareos/bconsole.conf.in
@@ -5,6 +5,6 @@
 Director {
   Name = @basename@-dir
   DIRport = @dir_port@
-  address = @hostname@
+  address = localhost
   Password = "@dir_password@"
 }
diff --git a/systemtests/tests/droplet-s3/testrunner b/systemtests/tests/droplet-s3/testrunner
@@ -6,7 +6,7 @@
 TestName="$(basename "$(pwd)")"
 export TestName
 
-JobName=backup-bareos-fd
+JobName=backup-s3-fd
 
 #shellcheck source=../environment.in
 . ./environment
@@ -23,8 +23,6 @@ fi
 
 s3cmd --config=etc/s3cfg-local-minio mb S3://backup
 
-exit 0
-
 # Directory to backup.
 # This directory will be created by setup_data "$@"().
 BackupDirectory="${tmp}/data"
@@ -33,6 +31,8 @@ BackupDirectory="${tmp}/data"
 # Data will be placed at "${tmp}/data/".
 setup_data "$@"
 
+exit 0
+
 start_test
 
 cat <<END_OF_DATA >$tmp/bconcmds