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

ZENKO-4804 upload test result to trunk #2060

Merged

Conversation

tcarmet
Copy link
Contributor

@tcarmet tcarmet commented Apr 19, 2024

No description provided.

@bert-e
Copy link
Contributor

bert-e commented Apr 19, 2024

Hello tcarmet,

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
Copy link
Contributor

bert-e commented Apr 19, 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.

@tcarmet
Copy link
Contributor Author

tcarmet commented Apr 19, 2024

/create_integration_branches

@tcarmet tcarmet marked this pull request as ready for review April 19, 2024 16:21
@bert-e
Copy link
Contributor

bert-e commented Apr 19, 2024

Integration data created

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

The following branches will NOT be impacted:

  • development/2.5
  • development/2.6
  • development/2.7

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
Copy link
Contributor

bert-e commented Apr 19, 2024

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

@KillianG
Copy link
Collaborator

Can we see how it looks on Trunk.io ?

@tcarmet tcarmet force-pushed the feature/ZENKO-4804-upload-test-results-trunk branch from 3a5cb76 to 7dc9b12 Compare April 24, 2024 23:56
@bert-e
Copy link
Contributor

bert-e commented Apr 24, 2024

History mismatch

Merge commit #0660669fa6ee7a501ef35ee300fe1df2eeba5734 on the integration branch
w/2.9/feature/ZENKO-4804-upload-test-results-trunk is merging a branch which is neither the current
branch feature/ZENKO-4804-upload-test-results-trunk nor the development branch
development/2.9.

It is likely due to a rebase of the branch feature/ZENKO-4804-upload-test-results-trunk 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: create_integration_branches

Copy link
Contributor Author

tcarmet commented Apr 24, 2024

/reset

@bert-e
Copy link
Contributor

bert-e commented Apr 24, 2024

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

Copy link
Contributor Author

tcarmet commented Apr 24, 2024

/approve

@bert-e
Copy link
Contributor

bert-e commented Apr 24, 2024

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

@scality scality deleted a comment from bert-e Apr 29, 2024
@scality scality deleted a comment from bert-e Apr 29, 2024
@bert-e
Copy link
Contributor

bert-e commented Apr 29, 2024

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

@francoisferrand francoisferrand force-pushed the feature/ZENKO-4804-upload-test-results-trunk branch from b6f409a to 8c6d723 Compare May 2, 2024 06:15
@scality scality deleted a comment from bert-e May 2, 2024
@scality scality deleted a comment from bert-e May 2, 2024
@scality scality deleted a comment from bert-e May 2, 2024
@scality scality deleted a comment from bert-e May 2, 2024
@scality scality deleted a comment from bert-e May 2, 2024
@scality scality deleted a comment from bert-e May 2, 2024
@scality scality deleted a comment from bert-e May 2, 2024
@scality scality deleted a comment from bert-e May 2, 2024
@francoisferrand francoisferrand force-pushed the feature/ZENKO-4804-upload-test-results-trunk branch from fd79a8d to 8c6d723 Compare May 2, 2024 06:51
@scality scality deleted a comment from bert-e May 2, 2024
@scality scality deleted a comment from bert-e May 2, 2024
@scality scality deleted a comment from bert-e May 13, 2024
@scality scality deleted a comment from bert-e May 13, 2024
@scality scality deleted a comment from bert-e May 14, 2024
@scality scality deleted a comment from bert-e May 15, 2024
@scality scality deleted a comment from bert-e May 15, 2024
@scality scality deleted a comment from bert-e May 15, 2024
- Upgrade kubectl to 1.30.0 to support strategic overrides
- Bind /artifacts to the host to allow access to test reports
- Add a step to upload test reports to trunk.io
@francoisferrand francoisferrand force-pushed the feature/ZENKO-4804-upload-test-results-trunk branch from 8c6d723 to 839ac1c Compare May 16, 2024 10:14
@scality scality deleted a comment from bert-e May 16, 2024
@scality scality deleted a comment from bert-e May 16, 2024
@bert-e
Copy link
Contributor

bert-e commented May 16, 2024

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

The following branches have NOT changed:

  • development/2.5

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

Goodbye tcarmet.

The following options are set: approve, create_integration_branches

@bert-e bert-e merged commit 839ac1c into development/2.6 May 16, 2024
14 checks passed
@bert-e bert-e deleted the feature/ZENKO-4804-upload-test-results-trunk branch May 16, 2024 16:05
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.

None yet

4 participants