From 7e176d3ce1a0b7e385d2dd79d39d33c69276136a Mon Sep 17 00:00:00 2001 From: ansgarz Date: Thu, 9 Dec 2021 15:01:10 +0100 Subject: [PATCH] [skip ci] remove further backups for fast execution --- infrastructure/docker-backup/image/resources/backup.sh | 3 ++- .../local-integration-test/setup-local-s3-on-k3d.sh | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/infrastructure/docker-backup/image/resources/backup.sh b/infrastructure/docker-backup/image/resources/backup.sh index 9a395fb..5cde81c 100755 --- a/infrastructure/docker-backup/image/resources/backup.sh +++ b/infrastructure/docker-backup/image/resources/backup.sh @@ -13,7 +13,8 @@ function main() { file_env POSTGRES_USER file_env RESTIC_DAYS_TO_KEEP 14 - backup-roles 'oc_' + #disable for faster testing + #backup-roles 'oc_' #backup-db-dump echo test-content > /var/backups/tmpfile backup-directory '/var/backups/' 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 f770273..797b71a 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 @@ -2,11 +2,6 @@ function main() { local bucket_name="${1:-mybucket}"; shift - # ./start-k3d.sh - - # source kubectl.sh - # kubectl config use-context k3d-nextcloud - kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.5.4/cert-manager.yaml kubectl apply -f localstack.yaml @@ -39,10 +34,15 @@ function main() echo POD=$(kubectl get pod -l app=backup-restore -o name) + kubectl wait $POD --for=condition=Ready --timeout=240s + kubectl exec -t $POD -- bash -c "echo \"$ENDPOINT k3stesthost cloudhost\" >> /etc/hosts" kubectl exec -t $POD -- /usr/local/bin/init.sh + + echo ================= BACKUP ================= kubectl exec -t $POD -- /usr/local/bin/backup.sh + echo ================= RESTORE ================= kubectl exec -t $POD -- /usr/local/bin/restore.sh }