Skip to content
Snippets Groups Projects

Check which folders and archives should be packed before passing to tar command.

Merged Check which folders and archives should be packed before passing to tar command.
check_if_it_should_be_archived_in_backup into master
Merged Marin Jankovski requested to merge check_if_it_should_be_archived_in_backup into master

If user uses backup task with SKIP and skips one of the archives listed(uploads, builds, artifacts) backup create will give an error: Cannot stat: No such file or directory.

This MR fixes that by checking for skipped items. Additionally, compact everything to avoid TypeError: no implicit conversion of nil into String errors.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Kamil Trzcińśki
    Kamil Trzcińśki @ayufan started a thread on the diff
    • spec/tasks/gitlab/backup_rake_spec.rb
    149 149 # Redirect STDOUT and run the rake task
    150 150 orig_stdout = $stdout
    151 151 $stdout = StringIO.new
    152 ENV["SKIP"] = "repositories"
    152 ENV["SKIP"] = "repositories,uploads"
  • Kamil Trzcińśki
    Kamil Trzcińśki @ayufan ·
    Maintainer

    Thanks @marin 👍

  • username-removed-444
    username-removed-444 @dzaporozhets ·
    Owner

    @marin check @ayufan comments please and ping when ready to merge

  • Marin Jankovski Added 1 commit:

    Added 1 commit:

  • Marin Jankovski
    Marin Jankovski @marin ·
    Author Maintainer

    Ping @dzaporozhets

  • Kamil Trzcińśki
    Kamil Trzcińśki @ayufan ·
    Maintainer

    LGTM 👍

    Edited by Kamil Trzcińśki
  • username-removed-444 Status changed to merged

    Status changed to merged

  • username-removed-444 mentioned in commit 5b302854

    mentioned in commit 5b302854

  • username-removed-444
    username-removed-444 @dzaporozhets ·
    Owner

    @marin merged. If want in 8.2 make sure to mention @rspeicher

  • Marin Jankovski
    Marin Jankovski @marin ·
    Author Maintainer

    @dzaporozhets Thanks, did so in the release issue.

  • Robert Speicher
    Robert Speicher @rspeicher ·
    Owner

    Picked into 8-2-stable.

  • username-removed-444 mentioned in commit 61c6e969

    mentioned in commit 61c6e969

    • Please register or sign in to reply