fredmnl commented 10 months ago

So this file was heavily refactored between 7.70 and 8.1. For simplicity, I backported a little bit of the refacto here so that the changes don't look drastically different in the two branches.

bert-e commented 10 months ago

Hello fredmnl,

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 commented 10 months ago

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically create the integration branches.

fredmnl commented 10 months ago

/create_integration_branches

bert-e commented 10 months ago

Conflict

A conflict has been raised during the creation of integration branch w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight with contents from bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight origin/development/8.1
 $ git merge origin/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight

The following options are set: create_integration_branches

bert-e commented 10 months ago

Waiting for approval

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

the author
2 peers

The following options are set: create_integration_branches

fredmnl commented 10 months ago

I've resolved the conflicts for the 8.1 version, view the changes here

bert-e commented 10 months ago

Conflict

A conflict has been raised during the creation of integration branch w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight with contents from bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight origin/development/8.1
 $ git merge origin/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight

The following options are set: create_integration_branches

bert-e commented 10 months ago

Waiting for approval

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

the author
2 peers

The following options are set: create_integration_branches

fredmnl commented 10 months ago

So I had to redo the PR since the previous one. The content is the same, with the following addition:

I spotted an issue with the regex, the decimal point after seconds (HH:mm:ss.xxx) was not escaped and thus treated as a wild card
I changed the subsecond part of the midnight regex so that only zeros are allowed

fredmnl commented 10 months ago

/approve

bert-e commented 10 months ago

Waiting for approval

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

the author
2 peers

The following options are set: approve, create_integration_branches

bert-e commented 10 months ago

Conflict

A conflict has been raised during the update of integration branch w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight with contents from bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight and development/8.1.

Please resolve the conflict on the integration branch (w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight
 $ git pull  # or "git reset --hard origin/w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight"
 $ git merge origin/development/8.1
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight

The following options are set: approve, create_integration_branches

fredmnl commented 10 months ago

LGTM, thanks for rebasing (feel free to add another commit before merging with a package.json version bump, if you need to release a new arsenal version right after, that will save you one round of reviews for another PR 🙂 )

Thanks! I mindlessly approved the PR while reading your comment then had to furiously send the commit before someone else approved!

nicolas2bert commented 10 months ago

Shouldn't we target development/7.10 since the fix version is needed for Fix versions 7.10.9 as well as 9.3.0.

ref: https://scality.atlassian.net/browse/S3C-8320?

bert-e commented 10 months ago

Incorrect fix version

The Fix Version/s in issue ARSN-383 contains:

7.10.54
7.70.19
8.1.119

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

7.70.19
8.1.119

Please check the Fix Version/s of ARSN-383, or the target branch of this pull request.

The following options are set: approve, create_integration_branches

bert-e commented 10 months ago

History mismatch

Merge commit #aabff11e99f3a1a2ec6ddc71a0395bcc928e3d65 on the integration branch w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight is merging a branch which is neither the current branch bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight nor the development branch development/8.1.

It is likely due to a rebase of the branch bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight 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.

The following options are set: approve, create_integration_branches

fredmnl commented 10 months ago

/reset

bert-e commented 10 months ago

Lossy reset warning

There seems to be manual commits on integration branches (e.g. conflict resolutions) that will be lost if you chose to reset.

You can use the force_reset command if you still want me to delete those branches.

The following options are set: approve, create_integration_branches

bert-e commented 10 months ago

History mismatch

Merge commit #aabff11e99f3a1a2ec6ddc71a0395bcc928e3d65 on the integration branch w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight is merging a branch which is neither the current branch bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight nor the development branch development/8.1.

It is likely due to a rebase of the branch bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight 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.

The following options are set: approve, create_integration_branches

fredmnl commented 10 months ago

/force_reset

bert-e commented 10 months ago

Reset complete

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

The following options are set: approve, create_integration_branches

bert-e commented 10 months ago

Conflict

A conflict has been raised during the creation of integration branch w/7.70/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight with contents from bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight and development/7.70.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/7.70/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight origin/development/7.70
 $ git merge origin/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight

The following options are set: approve, create_integration_branches

bert-e commented 10 months ago

Conflict

A conflict has been raised during the creation of integration branch w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight with contents from w/7.70/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight origin/development/8.1
 $ git merge origin/w/7.70/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight

The following options are set: approve, create_integration_branches

bert-e commented 10 months ago

Conflict

A conflict has been raised during the update of integration branch w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight with contents from w/7.70/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight and development/8.1.

Please resolve the conflict on the integration branch (w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight
 $ git pull  # or "git reset --hard origin/w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight"
 $ git merge origin/development/8.1
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/w/7.70/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/bugfix/ARSN-383-lifecycle-configuration-dates-must-be-set-to-midnight

The following options are set: approve, create_integration_branches

bert-e commented 10 months ago

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:

:heavy_check_mark: development/7.10
:heavy_check_mark: development/7.70
:heavy_check_mark: development/8.1

The following branches will NOT be impacted:

development/6.4
development/7.4

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, create_integration_branches

bert-e commented 10 months ago

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

:heavy_check_mark: development/7.10
:heavy_check_mark: development/7.70
:heavy_check_mark: development/8.1

The following branches have NOT changed:

development/6.4
development/7.4

Please check the status of the associated issue ARSN-383.

Goodbye fredmnl.

scality / Arsenal

ARSN-383: Dates must now be set to midnight for lifecycle configurations #2206

Hello fredmnl,

Request integration branches

Conflict

Waiting for approval

Conflict

Waiting for approval

Waiting for approval

Conflict

Incorrect fix version

History mismatch

Lossy reset warning

History mismatch

Reset complete

Conflict

Conflict

Conflict

In the queue