Merge 7f2d732dee into 4ccd0b0d31

backup/pvc/VERSION.txt

@@ -1 +1 @@
-v0.4.3
+v0.4.4

backup/pvc/bin/backup.sh

@@ -41,11 +41,13 @@ trap '_trap' SIGQUIT SIGINT SIGTERM
 # config.xml in child directories is state that should. For example-
 # branches/myorg/branches/myrepo/branches/master/config.xml should be retained while
 # branches/myorg/config.xml should not
+ret=0
 tar --zstd -C "${JENKINS_HOME}" -cf "${BACKUP_TMP_DIR}/${BACKUP_NUMBER}.tar.zstd" \
-    --exclude jobs/*/workspace* \
+    --exclude 'jobs/*/workspace*' \
     --no-wildcards-match-slash --anchored \
     --ignore-failed-read \
-    --exclude jobs/*/config.xml -c jobs || ret=$?
+    --exclude-ignore=.jenkinsbackupignore \
+    --exclude 'jobs/*/config.xml' -c jobs || ret=$?
 
 if [[ "$ret" -eq 0 ]]; then
   _log "INFO" "[backup] backup ${BACKUP_NUMBER} was completed without warnings"

backup/pvc/e2e/backup_and_restore/jenkins_home/jobs/some-folder/.jenkinsbackupignore

@@ -0,0 +1 @@
+jobs/some-folder/jobs/*/config.xml

backup/pvc/e2e/backup_and_restore/jenkins_home/jobs/some-folder/jobs/some-job/builds/1/build.xml

@@ -0,0 +1 @@
+build.xml

backup/pvc/e2e/backup_and_restore/jenkins_home/jobs/some-folder/jobs/some-job/builds/1/log

@@ -0,0 +1 @@
+build logs

backup/pvc/e2e/backup_and_restore/jenkins_home/jobs/some-folder/jobs/some-job/nextBuildNumber

@@ -0,0 +1 @@
+2

backup/pvc/e2e/backup_and_restore/jenkins_home_after_restore/jobs/some-folder/.jenkinsbackupignore

@@ -0,0 +1 @@
+jobs/some-folder/jobs/*/config.xml

backup/pvc/e2e/backup_and_restore/jenkins_home_after_restore/jobs/some-folder/jobs/some-job/builds/1/build.xml

@@ -0,0 +1 @@
+build.xml

backup/pvc/e2e/backup_and_restore/jenkins_home_after_restore/jobs/some-folder/jobs/some-job/builds/1/log

@@ -0,0 +1 @@
+build logs

backup/pvc/e2e/backup_and_restore/jenkins_home_after_restore/jobs/some-folder/jobs/some-job/nextBuildNumber

@@ -0,0 +1 @@
+2