diff --git a/infrastructure/docker-backup/image/resources/backup.sh b/infrastructure/docker-backup/image/resources/backup.sh index ba81889..99e1e05 100755 --- a/infrastructure/docker-backup/image/resources/backup.sh +++ b/infrastructure/docker-backup/image/resources/backup.sh @@ -13,11 +13,12 @@ function main() { file_env POSTGRES_USER file_env RESTIC_DAYS_TO_KEEP 14 +echo re-add lines !!! #disable for faster testing #backup-roles 'oc_' #backup-db-dump ls -l /var/backups/ - backup-directory '/var/backups/' +# backup-directory '/var/backups/' end-maintenance.sh } diff --git a/infrastructure/docker-backup/image/resources/restore.sh b/infrastructure/docker-backup/image/resources/restore.sh index eb5923b..61d1d07 100755 --- a/infrastructure/docker-backup/image/resources/restore.sh +++ b/infrastructure/docker-backup/image/resources/restore.sh @@ -4,7 +4,7 @@ set -Eeox pipefail function main() { - start-maintenance.sh +# start-maintenance.sh file_env AWS_ACCESS_KEY_ID file_env AWS_SECRET_ACCESS_KEY @@ -13,17 +13,19 @@ function main() { file_env POSTGRES_PASSWORD file_env POSTGRES_USER - drop-create-db +echo re-add lines !!! +# drop-create-db #skip for fast testing #restore-roles #restore-db - restore-directory '/var/backups/' +# restore-directory '/var/backups/' } source /usr/local/lib/functions.sh source /usr/local/lib/pg-functions.sh source /usr/local/lib/file-functions.sh + main diff --git a/src/test/resources/local-integration-test/setup-local-s3-on-k3d.sh b/src/test/resources/local-integration-test/setup-local-s3-on-k3d.sh index 39a8946..59f7944 100755 --- a/src/test/resources/local-integration-test/setup-local-s3-on-k3d.sh +++ b/src/test/resources/local-integration-test/setup-local-s3-on-k3d.sh @@ -1,3 +1,7 @@ +#!/bin/bash + +set -x + function main() { date @@ -56,4 +60,4 @@ function main() kubectl exec -t $POD -- /usr/local/bin/restore.sh } -main $@ +main "$@"