cloudserver icon indicating copy to clipboard operation
cloudserver copied to clipboard

CLDSRV-501 PutMetadata should write metadata on top of a null version

Open nicolas2bert opened this issue 1 year ago • 2 comments

NOTE: only the tests will be forwarded to development/7.70 because the null key behavior has changed in development/7.70.

The options.isNull parameter indicates support for the new null keys logic (S3C-7352). However, in development/7.10, the new null keys logic is not available.

This PR functionally tests: https://github.com/scality/Arsenal/pull/2215

nicolas2bert avatar Feb 14 '24 14:02 nicolas2bert

Hello nicolas2bert,

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 avatar Feb 21 '24 14:02 bert-e

Incorrect fix version

The Fix Version/s in issue CLDSRV-501 contains:

  • None

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

  • 7.10.46

  • 7.70.46

  • 8.6.27

  • 8.7.47

  • 8.8.20

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

bert-e avatar Feb 21 '24 14:02 bert-e

Incorrect fix version

The Fix Version/s in issue CLDSRV-501 contains:

  • None

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

  • 7.10.46

  • 7.70.46

  • 8.6.27

  • 8.7.48

  • 8.8.21

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

bert-e avatar Feb 27 '24 13:02 bert-e

ping

nicolas2bert avatar Feb 27 '24 13:02 nicolas2bert

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.

bert-e avatar Feb 27 '24 13:02 bert-e

/create_integration_branches

nicolas2bert avatar Feb 27 '24 13:02 nicolas2bert

Conflict

A conflict has been raised during the creation of integration branch w/7.70/bugfix/CLDSRV-501/putmetadata with contents from bugfix/CLDSRV-501/putmetadata 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/CLDSRV-501/putmetadata origin/development/7.70
 $ git merge origin/bugfix/CLDSRV-501/putmetadata
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/bugfix/CLDSRV-501/putmetadata

The following options are set: create_integration_branches

bert-e avatar Feb 27 '24 13:02 bert-e

Conflict

A conflict has been raised during the creation of integration branch w/8.6/bugfix/CLDSRV-501/putmetadata with contents from w/7.70/bugfix/CLDSRV-501/putmetadata and development/8.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.6/bugfix/CLDSRV-501/putmetadata origin/development/8.6
 $ git merge origin/w/7.70/bugfix/CLDSRV-501/putmetadata
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/bugfix/CLDSRV-501/putmetadata

The following options are set: create_integration_branches

bert-e avatar Feb 28 '24 13:02 bert-e

Integration data created

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

The following branches will NOT be impacted:

  • development/7.4

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

The following options are set: create_integration_branches

bert-e avatar Feb 29 '24 10:02 bert-e

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

bert-e avatar Feb 29 '24 10:02 bert-e

Conflict

A conflict has been raised during the update of integration branch w/7.70/bugfix/CLDSRV-501/putmetadata with contents from bugfix/CLDSRV-501/putmetadata and development/7.70.

Please resolve the conflict on the integration branch (w/7.70/bugfix/CLDSRV-501/putmetadata).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/7.70/bugfix/CLDSRV-501/putmetadata
 $ git pull  # or "git reset --hard origin/w/7.70/bugfix/CLDSRV-501/putmetadata"
 $ git merge origin/development/7.70
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/bugfix/CLDSRV-501/putmetadata
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/bugfix/CLDSRV-501/putmetadata

The following options are set: create_integration_branches

bert-e avatar Mar 07 '24 09:03 bert-e

Conflict

A conflict has been raised during the update of integration branch w/8.6/bugfix/CLDSRV-501/putmetadata with contents from w/7.70/bugfix/CLDSRV-501/putmetadata and development/8.6.

Please resolve the conflict on the integration branch (w/8.6/bugfix/CLDSRV-501/putmetadata).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/8.6/bugfix/CLDSRV-501/putmetadata
 $ git pull  # or "git reset --hard origin/w/8.6/bugfix/CLDSRV-501/putmetadata"
 $ git merge origin/development/8.6
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/w/7.70/bugfix/CLDSRV-501/putmetadata
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/bugfix/CLDSRV-501/putmetadata

The following options are set: create_integration_branches

bert-e avatar Mar 07 '24 09:03 bert-e

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

bert-e avatar Mar 07 '24 10:03 bert-e

@bert-e approve

nicolas2bert avatar Mar 07 '24 10:03 nicolas2bert

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.6

  • :heavy_check_mark: development/8.7

  • :heavy_check_mark: development/8.8

The following branches will NOT be impacted:

  • 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 avatar Mar 07 '24 10:03 bert-e

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.6

  • :heavy_check_mark: development/8.7

  • :heavy_check_mark: development/8.8

The following branches have NOT changed:

  • development/7.4

Please check the status of the associated issue CLDSRV-501.

Goodbye nicolas2bert.

bert-e avatar Mar 07 '24 10:03 bert-e