cloudserver icon indicating copy to clipboard operation
cloudserver copied to clipboard

CLDSRV-444: unit test with Id and arsenal version

Open benzekrimaha opened this issue 1 year ago • 6 comments

Description

Motivation and context

In this PR new unit tests were added to test the support of the Id definition and the arsenal version updated for that matter

Checklist

Add tests to cover the changes

New tests added

benzekrimaha avatar Sep 13 '23 06:09 benzekrimaha

Hello benzekrimaha,

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 Sep 13 '23 06:09 bert-e

Branches have diverged

This pull request's source branch bugfix/CLDSRV-444-id-on-resource-policy has diverged from development/8.7 by more than 50 commits.

To avoid any integration risks, please re-synchronize them using one of the following solutions:

  • Merge origin/development/8.7 into bugfix/CLDSRV-444-id-on-resource-policy
  • Rebase bugfix/CLDSRV-444-id-on-resource-policy onto origin/development/8.7

Note: If you choose to rebase, you may have to ask me to rebuild integration branches using the reset command.

bert-e avatar Sep 13 '23 06:09 bert-e

Incorrect fix version

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

  • None

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

  • 7.10.31

  • 7.70.25

  • 8.6.11

  • 8.7.29

  • 8.8.1

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

bert-e avatar Sep 13 '23 06:09 bert-e

ping

benzekrimaha avatar Sep 13 '23 06:09 benzekrimaha

ping

benzekrimaha avatar Sep 13 '23 06:09 benzekrimaha

Conflict

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

bert-e avatar Sep 13 '23 06:09 bert-e