From aace7a4f86920902e7581d152c819f4fad3d818f Mon Sep 17 00:00:00 2001 From: matthias Date: Fri, 8 May 2026 19:11:32 +0200 Subject: [PATCH] wrong storage location --- jenkins/default_backup.yml | 2 +- jenkins/other_location_backup.yml | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/jenkins/default_backup.yml b/jenkins/default_backup.yml index 5496167..cb1b3eb 100644 --- a/jenkins/default_backup.yml +++ b/jenkins/default_backup.yml @@ -28,7 +28,7 @@ pipeline { steps { script { withCredentials([string(credentialsId: 'cbce976a-0d98-4f35-8ea2-1f7818931bc3', variable: 'BORG_PASSPHRASE')]) { - sh "borg create --progress --stats --exclude-from excludelist ${backdirectory}::${java.time.LocalDateTime.now().format(java.time.format.DateTimeFormatter.ofPattern('dd-MM-yyyy_HH:mm'))} ${backdirectory}" + sh "borg create --progress --stats --exclude-from excludelist ${backdirectory}::${java.time.LocalDateTime.now().format(java.time.format.DateTimeFormatter.ofPattern('dd-MM-yyyy_HH:mm'))} ${env.storagelocation}/${directory}" sh "borg prune --list --keep-daily 31 --keep-weekly 48 ${backdirectory}" } } diff --git a/jenkins/other_location_backup.yml b/jenkins/other_location_backup.yml index 5496167..24bce1f 100644 --- a/jenkins/other_location_backup.yml +++ b/jenkins/other_location_backup.yml @@ -1,6 +1,5 @@ pipeline { parameters { - booleanParam(name: 'UseLocationPrefix', defaultValue: params.backuplocally ?: true, description: 'Use the environmental backup location') string(name: 'directory', defaultValue: params.directory ?: ' ', description: 'The directory that should be handled') string(name: 'agentname', defaultValue: params.agentname ?: 'julien', description: 'The agent to run this backup on') text(name: 'excludelist', defaultValue: params.excludelist ?: '**/cache/** ', description: 'Multiline string to exclude patterns from backup') @@ -14,13 +13,8 @@ pipeline { stages { stage('Run Preparation') { steps { - script { - if (params.UseLocationPrefix) { - backdirectory = env.borglocation + "/" + "${directory}" - } - echo "Backing up directory ${backdirectory}" - sh "echo '${params.excludelist}' >> excludelist" - } + echo "Backing up directory ${backdirectory}" + sh "echo '${params.excludelist}' >> excludelist" } }