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.

Sign up for GitHub

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

Jump to bottom

build: Bump Kubernetes version to 1.16.15 #3140

Merged
merged 1 commit into from
Feb 20, 2021
Merged

build: Bump Kubernetes version to 1.16.15 #3140

merged 1 commit into from
Feb 20, 2021

Conversation

TeddyAndrieux
Copy link
Collaborator

Bump Kubernetes version to 1.16.15

@TeddyAndrieux TeddyAndrieux added kind:enhancement New feature or request complexity:easy Something that requires less than a day to fix labels Feb 19, 2021
@TeddyAndrieux TeddyAndrieux requested a review from a team February 19, 2021 14:27
@bert-e
Copy link
Contributor

bert-e commented Feb 19, 2021

Hello teddyandrieux,

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 19, 2021

Conflict

A conflict has been raised during the creation of
integration branch w/2.6/improvement/bump-k8s-11615 with contents from improvement/bump-k8s-11615
and development/2.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.6/improvement/bump-k8s-11615 origin/development/2.6
 $ git merge origin/improvement/bump-k8s-11615
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.6/improvement/bump-k8s-11615

gdemonet
gdemonet reviewed Feb 19, 2021
View reviewed changes
@bert-e
Copy link
Contributor

bert-e commented Feb 19, 2021

Integration data created

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

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4

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

@bert-e
Copy link
Contributor

bert-e commented Feb 19, 2021

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:

@TeddyAndrieux TeddyAndrieux force-pushed the improvement/bump-k8s-11615 branch from 6aba065 to 92049fe Compare February 19, 2021 14:30
@bert-e
Copy link
Contributor

bert-e commented Feb 19, 2021

History mismatch

Merge commit #6aba06537e859de8263763802a4c2b7fe57ab8f4 on the integration branch
w/2.6/improvement/bump-k8s-11615 is merging a branch which is neither the current
branch improvement/bump-k8s-11615 nor the development branch
development/2.6.

It is likely due to a rebase of the branch improvement/bump-k8s-11615 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.

@TeddyAndrieux
Copy link
Collaborator Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Feb 19, 2021

Reset complete

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

@bert-e
Copy link
Contributor

bert-e commented Feb 19, 2021

Conflict

A conflict has been raised during the creation of
integration branch w/2.6/improvement/bump-k8s-11615 with contents from improvement/bump-k8s-11615
and development/2.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.6/improvement/bump-k8s-11615 origin/development/2.6
 $ git merge origin/improvement/bump-k8s-11615
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.6/improvement/bump-k8s-11615

@bert-e
Copy link
Contributor

bert-e commented Feb 19, 2021

Integration data created

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

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4

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

@bert-e
Copy link
Contributor

bert-e commented Feb 19, 2021

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:

@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Feb 19, 2021

Build failed

The build for commit did not succeed in branch w/2.6/improvement/bump-k8s-11615.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Feb 19, 2021

Build failed

The build for commit did not succeed in branch w/2.8/improvement/bump-k8s-11615.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Feb 19, 2021

Build failed

The build for commit did not succeed in branch w/2.6/improvement/bump-k8s-11615.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Feb 19, 2021

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

  • ✔️ development/2.6

  • ✔️ development/2.7

  • ✔️ development/2.8

  • ✔️ development/2.9

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4

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 Feb 20, 2021

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

  • ✔️ development/2.5

  • ✔️ development/2.6

  • ✔️ development/2.7

  • ✔️ development/2.8

  • ✔️ development/2.9

The following branches have NOT changed:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 92049fe into development/2.5 Feb 20, 2021
@bert-e bert-e deleted the improvement/bump-k8s-11615 branch February 20, 2021 01:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gdemonet gdemonet gdemonet approved these changes

Assignees
No one assigned
Labels
complexity:easy Something that requires less than a day to fix kind:enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@TeddyAndrieux @bert-e @gdemonet