diff --git a/backup/pvc/VERSION.txt b/backup/pvc/VERSION.txt index f87d474c..79b0815e 100644 --- a/backup/pvc/VERSION.txt +++ b/backup/pvc/VERSION.txt @@ -1 +1 @@ -v0.4.3 +v0.4.4 diff --git a/backup/pvc/bin/backup.sh b/backup/pvc/bin/backup.sh index 40c9f8dd..e88b6928 100755 --- a/backup/pvc/bin/backup.sh +++ b/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" diff --git a/backup/pvc/e2e/backup_and_restore/jenkins_home/jobs/some-folder/.jenkinsbackupignore b/backup/pvc/e2e/backup_and_restore/jenkins_home/jobs/some-folder/.jenkinsbackupignore new file mode 100644 index 00000000..ea20bb49 --- /dev/null +++ b/backup/pvc/e2e/backup_and_restore/jenkins_home/jobs/some-folder/.jenkinsbackupignore @@ -0,0 +1 @@ +jobs/some-folder/jobs/*/config.xml diff --git a/backup/pvc/e2e/backup_and_restore/jenkins_home/jobs/some-folder/config.xml b/backup/pvc/e2e/backup_and_restore/jenkins_home/jobs/some-folder/config.xml new file mode 100644 index 00000000..e69de29b diff --git a/backup/pvc/e2e/backup_and_restore/jenkins_home/jobs/some-folder/jobs/some-job/builds/1/build.xml b/backup/pvc/e2e/backup_and_restore/jenkins_home/jobs/some-folder/jobs/some-job/builds/1/build.xml new file mode 100644 index 00000000..5d0bb326 --- /dev/null +++ b/backup/pvc/e2e/backup_and_restore/jenkins_home/jobs/some-folder/jobs/some-job/builds/1/build.xml @@ -0,0 +1 @@ +build.xml \ No newline at end of file diff --git a/backup/pvc/e2e/backup_and_restore/jenkins_home/jobs/some-folder/jobs/some-job/builds/1/log b/backup/pvc/e2e/backup_and_restore/jenkins_home/jobs/some-folder/jobs/some-job/builds/1/log new file mode 100644 index 00000000..7f236fe6 --- /dev/null +++ b/backup/pvc/e2e/backup_and_restore/jenkins_home/jobs/some-folder/jobs/some-job/builds/1/log @@ -0,0 +1 @@ +build logs \ No newline at end of file diff --git a/backup/pvc/e2e/backup_and_restore/jenkins_home/jobs/some-folder/jobs/some-job/config.xml b/backup/pvc/e2e/backup_and_restore/jenkins_home/jobs/some-folder/jobs/some-job/config.xml new file mode 100644 index 00000000..e69de29b diff --git a/backup/pvc/e2e/backup_and_restore/jenkins_home/jobs/some-folder/jobs/some-job/nextBuildNumber b/backup/pvc/e2e/backup_and_restore/jenkins_home/jobs/some-folder/jobs/some-job/nextBuildNumber new file mode 100644 index 00000000..d8263ee9 --- /dev/null +++ b/backup/pvc/e2e/backup_and_restore/jenkins_home/jobs/some-folder/jobs/some-job/nextBuildNumber @@ -0,0 +1 @@ +2 \ No newline at end of file diff --git a/backup/pvc/e2e/backup_and_restore/jenkins_home_after_restore/jobs/some-folder/.jenkinsbackupignore b/backup/pvc/e2e/backup_and_restore/jenkins_home_after_restore/jobs/some-folder/.jenkinsbackupignore new file mode 100644 index 00000000..ea20bb49 --- /dev/null +++ b/backup/pvc/e2e/backup_and_restore/jenkins_home_after_restore/jobs/some-folder/.jenkinsbackupignore @@ -0,0 +1 @@ +jobs/some-folder/jobs/*/config.xml diff --git a/backup/pvc/e2e/backup_and_restore/jenkins_home_after_restore/jobs/some-folder/jobs/some-job/builds/1/build.xml b/backup/pvc/e2e/backup_and_restore/jenkins_home_after_restore/jobs/some-folder/jobs/some-job/builds/1/build.xml new file mode 100644 index 00000000..5d0bb326 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/backup/pvc/e2e/backup_and_restore/jenkins_home_after_restore/jobs/some-folder/jobs/some-job/builds/1/log b/backup/pvc/e2e/backup_and_restore/jenkins_home_after_restore/jobs/some-folder/jobs/some-job/builds/1/log new file mode 100644 index 00000000..7f236fe6 --- /dev/null +++ b/backup/pvc/e2e/backup_and_restore/jenkins_home_after_restore/jobs/some-folder/jobs/some-job/builds/1/log @@ -0,0 +1 @@ +build logs \ No newline at end of file diff --git a/backup/pvc/e2e/backup_and_restore/jenkins_home_after_restore/jobs/some-folder/jobs/some-job/nextBuildNumber b/backup/pvc/e2e/backup_and_restore/jenkins_home_after_restore/jobs/some-folder/jobs/some-job/nextBuildNumber new file mode 100644 index 00000000..d8263ee9 --- /dev/null +++ b/backup/pvc/e2e/backup_and_restore/jenkins_home_after_restore/jobs/some-folder/jobs/some-job/nextBuildNumber @@ -0,0 +1 @@ +2 \ No newline at end of file