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.

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

ARTESCA-11299: prevent create a new storage service and edition of the default #729

Conversation

ChengYanJin
Copy link
Contributor

No description provided.

@bert-e
Copy link
Contributor

bert-e commented Feb 7, 2024

Hello chengyanjin,

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 Feb 7, 2024

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:

@codecov-commenter
Copy link

Codecov Report

Attention: 120 lines in your changes are missing coverage. Please review.

Comparison is base (6b0349e) 60.35% compared to head (803d67c) 59.11%.
Report is 39 commits behind head on development/2.2.

Files Patch % Lines
src/js/S3Client.ts 0.00% 18 Missing ⚠️
src/react/workflow/useDeleteWorkflow.ts 64.58% 15 Missing and 2 partials ⚠️
src/react/actions/zenko.ts 0.00% 10 Missing ⚠️
src/react/ui-elements/FormLayout.tsx 0.00% 9 Missing ⚠️
src/react/workflow/ConfigurationTab.tsx 35.71% 9 Missing ⚠️
src/react/ui-elements/Veeam/VeeamTable.tsx 30.00% 7 Missing ⚠️
src/react/actions/account.ts 0.00% 6 Missing ⚠️
src/react/workflow/DeleteWorkflowButton.tsx 89.09% 6 Missing ⚠️
src/react/locations/LocationsList.tsx 0.00% 5 Missing ⚠️
src/react/ui-elements/Veeam/VeeamSkipModal.tsx 50.00% 5 Missing ⚠️
... and 19 more
Additional details and impacted files
@@                 Coverage Diff                 @@
##           development/2.2     #729      +/-   ##
===================================================
- Coverage            60.35%   59.11%   -1.25%     
===================================================
  Files                  222      239      +17     
  Lines                10703    11271     +568     
  Branches              3122     3242     +120     
===================================================
+ Hits                  6460     6663     +203     
- Misses                4224     4587     +363     
- Partials                19       21       +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ChengYanJin ChengYanJin force-pushed the bugfix/ARTESCA-11299-prevent-create-a-new-storage-service-and-edition-of-the-default branch from 803d67c to 77dd4d4 Compare May 14, 2024 16:16
@bert-e
Copy link
Contributor

bert-e commented May 14, 2024

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:

@ChengYanJin ChengYanJin marked this pull request as ready for review May 14, 2024 16:18
@bert-e
Copy link
Contributor

bert-e commented May 14, 2024

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:

@bert-e
Copy link
Contributor

bert-e commented Jul 1, 2024

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:

@ChengYanJin ChengYanJin force-pushed the bugfix/ARTESCA-11299-prevent-create-a-new-storage-service-and-edition-of-the-default branch 2 times, most recently from 06eb269 to 97f3326 Compare July 2, 2024 08:09
@bert-e
Copy link
Contributor

bert-e commented Jul 2, 2024

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.

@ChengYanJin ChengYanJin force-pushed the bugfix/ARTESCA-11299-prevent-create-a-new-storage-service-and-edition-of-the-default branch 2 times, most recently from 9d10696 to bf03275 Compare July 2, 2024 08:28
Copy link
Contributor

@JBWatenbergScality JBWatenbergScality left a comment

Choose a reason for hiding this comment

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

LGTM !

@ChengYanJin ChengYanJin force-pushed the bugfix/ARTESCA-11299-prevent-create-a-new-storage-service-and-edition-of-the-default branch from e95ffa1 to 3b053e3 Compare July 2, 2024 09:55
@ChengYanJin
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Jul 2, 2024

Integration data created

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

The following branches will NOT be impacted:

  • development/1.4
  • development/1.5
  • development/1.6
  • development/2.0
  • development/2.1

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: approve

@bert-e
Copy link
Contributor

bert-e commented Jul 2, 2024

Build failed

The build for commit did not succeed in branch w/3.0/bugfix/ARTESCA-11299-prevent-create-a-new-storage-service-and-edition-of-the-default.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jul 2, 2024

Build failed

The build for commit did not succeed in branch bugfix/ARTESCA-11299-prevent-create-a-new-storage-service-and-edition-of-the-default.

The following options are set: approve

@ChengYanJin ChengYanJin force-pushed the bugfix/ARTESCA-11299-prevent-create-a-new-storage-service-and-edition-of-the-default branch from 3b053e3 to 894e452 Compare July 2, 2024 12:47
@bert-e
Copy link
Contributor

bert-e commented Jul 2, 2024

History mismatch

Merge commit #3b053e367181aa9eacd0d86374d6061ccd9aa466 on the integration branch
w/3.0/bugfix/ARTESCA-11299-prevent-create-a-new-storage-service-and-edition-of-the-default is merging a branch which is neither the current
branch bugfix/ARTESCA-11299-prevent-create-a-new-storage-service-and-edition-of-the-default nor the development branch
development/3.0.

It is likely due to a rebase of the branch bugfix/ARTESCA-11299-prevent-create-a-new-storage-service-and-edition-of-the-default 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

@ChengYanJin
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Jul 2, 2024

Reset complete

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

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jul 2, 2024

Integration data created

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

The following branches will NOT be impacted:

  • development/1.4
  • development/1.5
  • development/1.6
  • development/2.0
  • development/2.1

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: approve

@bert-e
Copy link
Contributor

bert-e commented Jul 2, 2024

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

  • ✔️ development/3.0

The following branches will NOT be impacted:

  • development/1.4
  • development/1.5
  • development/1.6
  • development/2.0
  • development/2.1

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 Jul 2, 2024

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

  • ✔️ development/2.2

  • ✔️ development/3.0

The following branches have NOT changed:

  • development/1.4
  • development/1.5
  • development/1.6
  • development/2.0
  • development/2.1

Please check the status of the associated issue ARTESCA-11299.

Goodbye chengyanjin.

@bert-e bert-e merged commit d3d9aeb into development/2.2 Jul 2, 2024
9 checks passed
@bert-e bert-e deleted the bugfix/ARTESCA-11299-prevent-create-a-new-storage-service-and-edition-of-the-default branch July 2, 2024 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants