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

build: bump calico to 3.28.0 #4363

Merged
merged 1 commit into from
Jul 17, 2024
Merged

Conversation

eg-ayoub
Copy link
Contributor

No description provided.

@eg-ayoub eg-ayoub requested a review from a team as a code owner July 10, 2024 09:53
@bert-e
Copy link
Contributor

bert-e commented Jul 10, 2024

Hello eg-ayoub,

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 Jul 10, 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.

@eg-ayoub eg-ayoub force-pushed the improvement/bump-calico-3.28 branch from 3c776ce to be8b732 Compare July 10, 2024 09:58
@eg-ayoub eg-ayoub force-pushed the improvement/bump-calico-3.28 branch 3 times, most recently from 66c7556 to 678752c Compare July 16, 2024 09:09
@bert-e
Copy link
Contributor

bert-e commented Jul 16, 2024

Conflict

A conflict has been raised during the creation of
integration branch w/128.0/improvement/bump-calico-3.28 with contents from improvement/bump-calico-3.28
and development/128.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/128.0/improvement/bump-calico-3.28 origin/development/128.0
 $ git merge origin/improvement/bump-calico-3.28
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/128.0/improvement/bump-calico-3.28

The following options are set: approve

@eg-ayoub
Copy link
Contributor Author

/create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Jul 17, 2024

Conflict

A conflict has been raised during the creation of
integration branch w/128.0/improvement/bump-calico-3.28 with contents from improvement/bump-calico-3.28
and development/128.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/128.0/improvement/bump-calico-3.28 origin/development/128.0
 $ git merge origin/improvement/bump-calico-3.28
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/128.0/improvement/bump-calico-3.28

The following options are set: approve, create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Jul 17, 2024

Integration data created

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

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Follow integration pull requests if you would like to be notified of
build statuses by email.

The following options are set: create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Jul 17, 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:

The following options are set: create_pull_requests

@eg-ayoub
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Jul 17, 2024

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

  • ✔️ development/127.0

  • ✔️ development/128.0

The following branches have NOT changed:

  • development/123.0
  • development/124.0
  • development/124.1
  • development/125.0
  • development/126.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue None.

Goodbye eg-ayoub.

The following options are set: approve, create_pull_requests

@bert-e bert-e merged commit 42091c6 into development/127.0 Jul 17, 2024
26 checks passed
@bert-e bert-e deleted the improvement/bump-calico-3.28 branch July 17, 2024 10:04
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.

3 participants