Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add behaviour to remove older backups #4038

Merged
merged 5 commits into from
Apr 18, 2023
Merged

Add behaviour to remove older backups #4038

merged 5 commits into from
Apr 18, 2023

Conversation

eg-ayoub
Copy link
Contributor

@eg-ayoub eg-ayoub commented Apr 6, 2023

No description provided.

@eg-ayoub eg-ayoub requested a review from a team as a code owner April 6, 2023 09:00
@bert-e
Copy link
Contributor

bert-e commented Apr 6, 2023

Hello eg-ayoub,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Apr 6, 2023

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Apr 6, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@eg-ayoub eg-ayoub force-pushed the improvement/purge-older-backup-archives-1 branch from a673ca4 to 5c758c2 Compare April 6, 2023 09:01
@bert-e
Copy link
Contributor

bert-e commented Apr 6, 2023

History mismatch

Merge commit #a673ca4144a3770437adf77cefb02354e0e381e8 on the integration branch
w/125.0/improvement/purge-older-backup-archives-1 is merging a branch which is neither the current
branch improvement/purge-older-backup-archives-1 nor the development branch
development/125.0.

It is likely due to a rebase of the branch improvement/purge-older-backup-archives-1 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@eg-ayoub
Copy link
Contributor Author

eg-ayoub commented Apr 7, 2023

/reset

@bert-e
Copy link
Contributor

bert-e commented Apr 7, 2023

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Apr 7, 2023

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Apr 7, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@eg-ayoub eg-ayoub force-pushed the improvement/purge-older-backup-archives-1 branch from 5c758c2 to 9024149 Compare April 7, 2023 09:25
@bert-e
Copy link
Contributor

bert-e commented Apr 7, 2023

History mismatch

Merge commit #5c758c2c227a351556a5446f0e2bc910f1b67790 on the integration branch
w/125.0/improvement/purge-older-backup-archives-1 is merging a branch which is neither the current
branch improvement/purge-older-backup-archives-1 nor the development branch
development/125.0.

It is likely due to a rebase of the branch improvement/purge-older-backup-archives-1 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@eg-ayoub
Copy link
Contributor Author

eg-ayoub commented Apr 7, 2023

/reset

@bert-e
Copy link
Contributor

bert-e commented Apr 7, 2023

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Apr 7, 2023

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Apr 7, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@eg-ayoub eg-ayoub force-pushed the improvement/purge-older-backup-archives-1 branch from 9024149 to ed1f43f Compare April 7, 2023 09:32
@bert-e
Copy link
Contributor

bert-e commented Apr 7, 2023

History mismatch

Merge commit #9024149191d6ff1c7e5c60e7bbe7ad0951f71c4b on the integration branch
w/125.0/improvement/purge-older-backup-archives-1 is merging a branch which is neither the current
branch improvement/purge-older-backup-archives-1 nor the development branch
development/125.0.

It is likely due to a rebase of the branch improvement/purge-older-backup-archives-1 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@eg-ayoub
Copy link
Contributor Author

eg-ayoub commented Apr 7, 2023

/reset

@bert-e
Copy link
Contributor

bert-e commented Apr 7, 2023

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Apr 7, 2023

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Apr 7, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

TeddyAndrieux
TeddyAndrieux reviewed Apr 7, 2023
View reviewed changes
salt/metalk8s/orchestrate/backup/files/job.yaml.j2 Outdated Show resolved Hide resolved
tests/post/features/backup.feature Outdated Show resolved Hide resolved
tests/post/steps/test_backup.py Outdated Show resolved Hide resolved
tests/post/steps/test_backup.py Outdated Show resolved Hide resolved
tests/post/steps/test_backup.py Outdated Show resolved Hide resolved
@eg-ayoub eg-ayoub force-pushed the improvement/purge-older-backup-archives-1 branch from 6ea7783 to 3f019f9 Compare April 12, 2023 15:42
@eg-ayoub
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Apr 14, 2023

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Apr 14, 2023

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Apr 14, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

TeddyAndrieux
TeddyAndrieux reviewed Apr 14, 2023
View reviewed changes
salt/metalk8s/orchestrate/backup/files/job.yaml.j2 Outdated Show resolved Hide resolved
tests/post/steps/test_backup.py Outdated Show resolved Hide resolved
tests/post/steps/test_backup.py Outdated Show resolved Hide resolved
tests/post/steps/test_backup.py Outdated Show resolved Hide resolved
tests/post/steps/test_backup.py Outdated Show resolved Hide resolved
tests/post/steps/test_backup.py Outdated Show resolved Hide resolved
tests/post/steps/test_backup.py Outdated Show resolved Hide resolved
tests/post/steps/test_backup.py Outdated Show resolved Hide resolved
tests/post/features/backup.feature Outdated Show resolved Hide resolved
@eg-ayoub eg-ayoub force-pushed the improvement/purge-older-backup-archives-1 branch from 77d1194 to 0488f74 Compare April 17, 2023 09:10
@bert-e
Copy link
Contributor

bert-e commented Apr 17, 2023

History mismatch

Merge commit #77d119464661f240a8549595ec528d9121917719 on the integration branch
w/125.0/improvement/purge-older-backup-archives-1 is merging a branch which is neither the current
branch improvement/purge-older-backup-archives-1 nor the development branch
development/125.0.

It is likely due to a rebase of the branch improvement/purge-older-backup-archives-1 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@eg-ayoub eg-ayoub force-pushed the improvement/purge-older-backup-archives-1 branch 2 times, most recently from eed7d05 to 6b59822 Compare April 17, 2023 15:38
@eg-ayoub
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Apr 17, 2023

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Apr 17, 2023

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Apr 17, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

TeddyAndrieux
TeddyAndrieux reviewed Apr 18, 2023
View reviewed changes
Copy link
Collaborator

@TeddyAndrieux TeddyAndrieux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a last comment otherwise LGTM

tests/post/steps/test_backup.py Outdated Show resolved Hide resolved
@eg-ayoub eg-ayoub force-pushed the improvement/purge-older-backup-archives-1 branch from 6b59822 to be4b3c5 Compare April 18, 2023 09:12
@bert-e
Copy link
Contributor

bert-e commented Apr 18, 2023

History mismatch

Merge commit #6b59822ed97a1098f6f653ad40535f189b8ddc97 on the integration branch
w/125.0/improvement/purge-older-backup-archives-1 is merging a branch which is neither the current
branch improvement/purge-older-backup-archives-1 nor the development branch
development/125.0.

It is likely due to a rebase of the branch improvement/purge-older-backup-archives-1 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@eg-ayoub
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Apr 18, 2023

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Apr 18, 2023

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Apr 18, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

TeddyAndrieux
TeddyAndrieux approved these changes Apr 18, 2023
View reviewed changes
tests/conftest.py
Comment on lines +364 to +372
@when(parsers.parse("we wait {seconds} seconds for the {job} job to complete"))
def wait_for_job(host, seconds, job):
with host.sudo():
res = host.run(
"kubectl --kubeconfig=/etc/kubernetes/admin.conf "
f"wait --for=condition=complete --timeout={seconds}s "
f"job -l app.kubernetes.io/name={job} -A"
)
assert res.rc == 0, res.stdout
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool a generic one 👍

@eg-ayoub
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Apr 18, 2023

Build failed

The build for commit did not succeed in branch w/125.0/improvement/purge-older-backup-archives-1.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 18, 2023

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/124.1

  • ✔️ development/125.0

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 18, 2023

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/124.1

  • ✔️ development/125.0

The following branches have NOT changed:

  • development/123.0
  • development/124.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue None.

Goodbye eg-ayoub.

@bert-e bert-e merged commit fc078d7 into development/124.1 Apr 18, 2023
@bert-e bert-e deleted the improvement/purge-older-backup-archives-1 branch April 18, 2023 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TeddyAndrieux TeddyAndrieux TeddyAndrieux approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@eg-ayoub @bert-e @TeddyAndrieux