Improvement/zenko 4941 #2178

williamlardier · 2024-11-28T13:57:12Z

Complete tests of Quota feature in CTST.

-> custom images to be deleted

Another test to review starting the 2.8 branch:

development/2.8...w/2.8/improvement/ZENKO-4941#diff-0f9a8cc11d2560e9e9ea8668d53be732997ae7cecb4ec7201c836bc8367fc5c9R182

-> All tests are passing:

2024-11-29T09:56:42.1860871Z   @2.8.0 @PreMerge @Quotas @Restore @Dmf @ColdStorage @Only
2024-11-29T09:56:42.1861891Z   Scenario Outline: Restored object expiration updates quotas # features/quotas/Quotas.feature:182
2024-11-29T09:56:42.1880965Z     Given an action "RestoreObject"
2024-11-29T09:56:42.1883582Z     And a STORAGE_MANAGER type
2024-11-29T09:56:42.9398659Z     And a transition workflow to "e2e-cold" location
2024-11-29T09:56:47.9621673Z     And an upload size of 100 B for the object "obj-1"
2024-11-29T09:56:47.9946235Z     Then object "obj-1" should be "transitioned" and have the storage class "e2e-cold"
2024-11-29T09:56:57.1634848Z     Given a bucket quota set to 0 B
2024-11-29T09:56:57.1635502Z     And an account quota set to 0 B
2024-11-29T09:56:57.1638992Z     And a ACCOUNT type
2024-11-29T09:56:57.1639488Z     And an environment setup for the API
2024-11-29T09:56:57.1641680Z     And an "existing" IAM Policy that "applies" with "ALLOW" effect for the current API
2024-11-29T09:56:57.1654784Z     When i restore object "" for 5 days
2024-11-29T09:56:57.1823329Z     Then the API should "succeed" with ""
2024-11-29T09:56:57.1823860Z     And object "obj-1" should be "restored" and have the storage class "e2e-cold"
2024-11-29T09:57:04.2913305Z     Given a STORAGE_MANAGER type
2024-11-29T09:57:04.2913874Z     Then object "obj-1" should expire in 5 days
2024-11-29T09:57:04.3184634Z     When i wait for 5 days
2024-11-29T09:57:09.3217840Z     Then object "obj-1" should be "cold" and have the storage class "e2e-cold"
2024-11-29T09:57:21.6862371Z 
2024-11-29T09:57:21.6891444Z   @2.8.0 @PreMerge @Quotas @Restore @Dmf @ColdStorage @Only
2024-11-29T09:57:21.6892387Z   Scenario Outline: Restored object expiration updates quotas # features/quotas/Quotas.feature:182
2024-11-29T09:57:21.6903644Z     Given an action "RestoreObject"
2024-11-29T09:57:21.6915643Z     And a STORAGE_MANAGER type
2024-11-29T09:57:22.3246302Z     And a transition workflow to "e2e-cold" location
2024-11-29T09:57:27.3445935Z     And an upload size of 100 B for the object "obj-1"
2024-11-29T09:57:27.3756834Z     Then object "obj-1" should be "transitioned" and have the storage class "e2e-cold"
2024-11-29T09:57:37.5580469Z     Given a bucket quota set to 101 B
2024-11-29T09:57:37.5784356Z     And an account quota set to 101 B
2024-11-29T09:57:37.5973259Z     And a ACCOUNT type
2024-11-29T09:57:37.5973875Z     And an environment setup for the API
2024-11-29T09:57:37.5974634Z     And an "existing" IAM Policy that "applies" with "ALLOW" effect for the current API
2024-11-29T09:57:37.5978067Z     When i restore object "" for 5 days
2024-11-29T09:57:37.6263509Z     Then the API should "succeed" with ""
2024-11-29T09:57:37.6264026Z     And object "obj-1" should be "restored" and have the storage class "e2e-cold"
2024-11-29T09:57:44.7328078Z     Given a STORAGE_MANAGER type
2024-11-29T09:57:44.7329148Z     Then object "obj-1" should expire in 5 days
2024-11-29T09:57:44.7473779Z     When i wait for 5 days
2024-11-29T09:57:49.7499272Z     Then object "obj-1" should be "cold" and have the storage class "e2e-cold"

2024-11-29T09:51:13.8625920Z   @2.6.0 @PreMerge @Quotas @CronJob @DataDeletion @NonVersioned
2024-11-29T09:51:13.8627154Z   Scenario Outline: Quotas are affected by deletion operations between count items runs # features/quotas/Quotas.feature:107
2024-11-29T09:51:13.8628061Z     Given an action "DeleteObject"
2024-11-29T09:51:13.8628617Z     And a permission to perform the "PutObject" action
2024-11-29T09:51:13.8629197Z     And a STORAGE_MANAGER type
2024-11-29T09:51:14.2009069Z     And I PUT an object with size 100
2024-11-29T09:51:14.5443986Z     And a bucket quota set to 10000 B
2024-11-29T09:51:14.5599516Z     And an account quota set to 10000 B
2024-11-29T09:51:14.5727230Z     And an upload size of 1000 B for the object "obj-1"
2024-11-29T09:51:14.6027627Z     And a bucket quota set to 200 B
2024-11-29T09:51:14.6138121Z     And an account quota set to 200 B
2024-11-29T09:51:14.6227240Z     And a IAM_USER type
2024-11-29T09:51:14.6520382Z     And an environment setup for the API
2024-11-29T09:51:14.6521792Z     And an "existing" IAM Policy that "applies" with "ALLOW" effect for the current API
2024-11-29T09:51:14.6751194Z     When I wait 3 seconds
2024-11-29T09:51:14.8870100Z     When I wait 3 seconds
2024-11-29T09:51:14.9774911Z     Then the API should "fail" with "QuotaExceeded"
2024-11-29T09:51:14.9775549Z     When the "count-items" cronjobs completes without error
2024-11-29T09:51:15.1964713Z     When I wait 3 seconds
2024-11-29T09:51:17.6776293Z     And I PUT an object with size 100
2024-11-29T09:51:17.8890763Z     And i delete object "obj-1"
2024-11-29T09:51:17.9091224Z     And I wait 3 seconds
2024-11-29T09:51:18.1982800Z     And i delete object "obj-1"
2024-11-29T09:51:18.2191912Z     And I wait 3 seconds
2024-11-29T09:51:19.0025639Z     Then the API should "fail" with "QuotaExceeded"
2024-11-29T09:51:19.0026380Z     When the "count-items" cronjobs completes without error
2024-11-29T09:51:20.9103545Z     And I PUT an object with size 100
2024-11-29T09:51:20.9672979Z     Then the API should "succeed" with ""

bert-e · 2024-11-28T13:57:16Z

Hello williamlardier,

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.

Available options

name	description	privileged	authored
`/after_pull_request`	Wait for the given pull request id to be merged before continuing with the current one.
`/bypass_author_approval`	Bypass the pull request author's approval	⭐
`/bypass_build_status`	Bypass the build and test status	⭐
`/bypass_commit_size`	Bypass the check on the size of the changeset `TBA`	⭐
`/bypass_incompatible_branch`	Bypass the check on the source branch prefix	⭐
`/bypass_jira_check`	Bypass the Jira issue check	⭐
`/bypass_peer_approval`	Bypass the pull request peers' approval	⭐
`/bypass_leader_approval`	Bypass the pull request leaders' approval	⭐
`/approve`	Instruct Bert-E that the author has approved the pull request.		✍️
`/create_pull_requests`	Allow the creation of integration pull requests.
`/create_integration_branches`	Allow the creation of integration branches.
`/no_octopus`	Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
`/unanimity`	Change review acceptance criteria from `one reviewer at least` to `all reviewers`
`/wait`	Instruct Bert-E not to run until further notice.

Available commands

name	description	privileged
`/help`	Print Bert-E's manual in the pull request.
`/status`	Print Bert-E's current status in the pull request `TBA`
`/clear`	Remove all comments from Bert-E from the history `TBA`
`/retry`	Re-start a fresh build `TBA`
`/build`	Re-start a fresh build `TBA`
`/force_reset`	Delete integration branches & pull requests, and restart merge process from the beginning.
`/reset`	Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

bert-e · 2024-11-28T13:57:21Z

Incorrect fix version

The Fix Version/s in issue ZENKO-4941 contains:

None

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

2.10.10
2.6.72
2.7.68
2.8.48
2.9.27

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

williamlardier · 2024-11-28T14:01:32Z

/create_integration_branches

bert-e · 2024-11-28T14:16:52Z

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 · 2024-11-28T16:12:27Z

Reset complete

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

The following options are set: create_integration_branches

bert-e · 2024-11-28T16:13:38Z

Integration data created

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

this pull request will merge improvement/ZENKO-4941 into
development/2.6
w/2.7/improvement/ZENKO-4941 will be merged into development/2.7
w/2.8/improvement/ZENKO-4941 will be merged into development/2.8
w/2.9/improvement/ZENKO-4941 will be merged into development/2.9
w/2.10/improvement/ZENKO-4941 will be merged into development/2.10

The following branches will NOT be impacted:

development/2.5

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 · 2024-11-28T16:13:40Z

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

williamlardier · 2024-11-29T08:58:23Z

ping

tests/ctst/features/quotas/Quotas.feature

bert-e · 2024-12-04T16:26:07Z

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

- It may be prone to periodic instabilities - Not sopping won't change the result and make the step more close to what the sentence says Issue: ZENKO-4941

- We use 2s but the scuba frequency is 2s, so if we are unlucky, we may not be able to have it flushed, leading to flakies Issue: ZENKO-4941

tests/ctst/common/hooks.ts

tests/ctst/features/quotas/Quotas.feature

tests/ctst/steps/utils/kubernetes.ts

Won't change the test, but the sentences are now more meaningful. Issue: ZENKO-4941

tests/ctst/common/common.ts

Issue: ZENKO-4941

tests/ctst/common/hooks.ts

Previously we would ignore all errors, even the ones that are not expected, now, we will stop at any error that we are not expecting. Issue: ZENKO-4941

Issue: ZENKO-4941

Not needed since we are now locking the job Issue: ZENKO-4941

bert-e · 2025-01-09T16:08:23Z

Conflict

A conflict has been raised during the update of
integration branch w/2.8/improvement/ZENKO-4941 with contents from w/2.7/improvement/ZENKO-4941
and development/2.8.

Please resolve the conflict on the integration branch (w/2.8/improvement/ZENKO-4941).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/2.8/improvement/ZENKO-4941
 $ git pull  # or "git reset --hard origin/w/2.8/improvement/ZENKO-4941"
 $ git merge origin/development/2.8
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/w/2.7/improvement/ZENKO-4941
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.8/improvement/ZENKO-4941

The following options are set: create_integration_branches

williamlardier · 2025-01-09T16:16:28Z

ping

bert-e · 2025-01-09T16:16:42Z

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

williamlardier · 2025-01-09T16:20:03Z

/approve

bert-e · 2025-01-09T17:47:59Z

Build failed

The build for commit did not succeed in branch w/2.8/improvement/ZENKO-4941

The following options are set: approve, create_integration_branches

bert-e · 2025-01-09T21:27:05Z

Build failed

The build for commit did not succeed in branch w/2.10/improvement/ZENKO-4941

The following options are set: approve, create_integration_branches

bert-e · 2025-01-09T23:27:53Z

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/2.6
✔️ development/2.7
✔️ development/2.8
✔️ development/2.9
✔️ development/2.10

The following branches will NOT be impacted:

development/2.5

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 · 2025-01-09T23:32:49Z

Queue build failed

The corresponding build for the queue failed:

Checkout the status page.
Identify the failing build and review the logs.
If no issue is found, re-run the build.
If an issue is identified, checkout the steps below to remove
the pull request from the queue for further analysis and maybe rebase/merge.

Remove the pull request from the queue

Add a /wait comment on this pull request.
Click on login on the status page.
Go into the manage page.
Find the option called Rebuild the queue and click on it.
Bert-E will loop again on all pull requests to put the valid ones
in the queue again, while skipping the one with the /wait comment.
Wait for the new queue to merge, then merge/rebase your pull request
with the latest changes to then work on a proper fix.
Once the issue is fixed, delete the /wait comment and
follow the usual process to merge the pull request.

bert-e · 2025-01-10T13:44:21Z

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

✔️ development/2.6
✔️ development/2.7
✔️ development/2.8
✔️ development/2.9
✔️ development/2.10

The following branches have NOT changed:

development/2.5

Please check the status of the associated issue ZENKO-4941.

Goodbye williamlardier.

scality deleted a comment from bert-e Nov 28, 2024

williamlardier force-pushed the improvement/ZENKO-4941 branch 2 times, most recently from 5e9e1d6 to 6841f9b Compare November 28, 2024 14:08

scality deleted a comment from bert-e Nov 28, 2024

williamlardier force-pushed the improvement/ZENKO-4941 branch from 6841f9b to 2281c03 Compare November 28, 2024 14:58

scality deleted a comment from bert-e Nov 28, 2024

williamlardier force-pushed the improvement/ZENKO-4941 branch 2 times, most recently from 522a2b7 to 70d130c Compare November 28, 2024 16:06

scality deleted a comment from bert-e Nov 28, 2024

williamlardier commented Nov 29, 2024

View reviewed changes

tests/ctst/features/quotas/Quotas.feature Show resolved Hide resolved

williamlardier added 2 commits December 4, 2024 17:48

Do not stop on error during repeated api calls

4b8c555

- It may be prone to periodic instabilities - Not sopping won't change the result and make the step more close to what the sentence says Issue: ZENKO-4941

Increase test waiting time

6eb3ac9

- We use 2s but the scuba frequency is 2s, so if we are unlucky, we may not be able to have it flushed, leading to flakies Issue: ZENKO-4941

francoisferrand reviewed Dec 11, 2024

View reviewed changes

tests/ctst/common/hooks.ts Show resolved Hide resolved

francoisferrand reviewed Dec 11, 2024

View reviewed changes

tests/ctst/features/quotas/Quotas.feature Outdated Show resolved Hide resolved

francoisferrand reviewed Dec 11, 2024

View reviewed changes

tests/ctst/features/quotas/Quotas.feature Outdated Show resolved Hide resolved

francoisferrand reviewed Dec 11, 2024

View reviewed changes

tests/ctst/steps/utils/kubernetes.ts Show resolved Hide resolved

Permute the values in the quota scenario

fbc5e59

Won't change the test, but the sentences are now more meaningful. Issue: ZENKO-4941

francoisferrand reviewed Dec 13, 2024

View reviewed changes

tests/ctst/common/common.ts Outdated Show resolved Hide resolved

Bump CTST to v1.2.4

3083021

Issue: ZENKO-4941

williamlardier requested a review from francoisferrand December 23, 2024 13:42

KillianG reviewed Dec 23, 2024

View reviewed changes

tests/ctst/common/hooks.ts Outdated Show resolved Hide resolved

williamlardier added 3 commits December 23, 2024 17:56

When doing multiple actions in a step, continue if retryable

dcd2c8a

Previously we would ignore all errors, even the ones that are not expected, now, we will stop at any error that we are not expecting. Issue: ZENKO-4941

Use a file with wx flag to control concurrency

46f9b56

Issue: ZENKO-4941

Remove the atMost flag for utilization

87ea053

Not needed since we are now locking the job Issue: ZENKO-4941

williamlardier force-pushed the improvement/ZENKO-4941 branch from c413001 to 87ea053 Compare December 23, 2024 16:56

KillianG approved these changes Jan 6, 2025

View reviewed changes

Kerkesni approved these changes Jan 9, 2025

View reviewed changes

scality deleted a comment from bert-e Jan 9, 2025

bert-e merged commit 96358c4 into development/2.6 Jan 10, 2025
14 checks passed

bert-e deleted the improvement/ZENKO-4941 branch January 10, 2025 13:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improvement/zenko 4941 #2178

Improvement/zenko 4941 #2178

williamlardier commented Nov 28, 2024 •

edited

Loading

bert-e commented Nov 28, 2024

bert-e commented Nov 28, 2024

williamlardier commented Nov 28, 2024

bert-e commented Nov 28, 2024

bert-e commented Nov 28, 2024

bert-e commented Nov 28, 2024

bert-e commented Nov 28, 2024

williamlardier commented Nov 29, 2024

bert-e commented Dec 4, 2024

bert-e commented Jan 9, 2025

williamlardier commented Jan 9, 2025

bert-e commented Jan 9, 2025

williamlardier commented Jan 9, 2025

bert-e commented Jan 9, 2025

bert-e commented Jan 9, 2025

bert-e commented Jan 9, 2025

bert-e commented Jan 9, 2025

bert-e commented Jan 10, 2025

Improvement/zenko 4941 #2178

Improvement/zenko 4941 #2178

Conversation

williamlardier commented Nov 28, 2024 • edited Loading

Another test to review starting the 2.8 branch:

bert-e commented Nov 28, 2024

Hello williamlardier,

bert-e commented Nov 28, 2024

Incorrect fix version

williamlardier commented Nov 28, 2024

bert-e commented Nov 28, 2024

Waiting for approval

bert-e commented Nov 28, 2024

Reset complete

bert-e commented Nov 28, 2024

Integration data created

bert-e commented Nov 28, 2024

Waiting for approval

williamlardier commented Nov 29, 2024

bert-e commented Dec 4, 2024

Waiting for approval

bert-e commented Jan 9, 2025

Conflict

williamlardier commented Jan 9, 2025

bert-e commented Jan 9, 2025

Waiting for approval

williamlardier commented Jan 9, 2025

bert-e commented Jan 9, 2025

Build failed

bert-e commented Jan 9, 2025

Build failed

bert-e commented Jan 9, 2025

In the queue

bert-e commented Jan 9, 2025

Queue build failed

bert-e commented Jan 10, 2025

williamlardier commented Nov 28, 2024 •

edited

Loading