build: Bump Kubernetes version to 1.17.17 #3036

TeddyAndrieux · 2021-01-14T09:07:07Z

Bump Kubernetes version to 1.17.17

bert-e · 2021-01-14T09:07:09Z

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 · 2021-01-14T09:07:15Z

Conflict

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

I have not created the integration branch.

Here are the steps to resolve this conflict:

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

bert-e · 2021-01-14T09:10:50Z

Integration data created

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

this pull request will merge improvement/bump-k8s-11717 into
development/2.6
w/2.7/improvement/bump-k8s-11717 will be merged into development/2.7
w/2.8/improvement/bump-k8s-11717 will be merged into development/2.8

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

bert-e · 2021-01-14T09:10:51Z

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 · 2021-01-14T14:25:18Z

History mismatch

Merge commit #af578bfddcb28b9b56c67ab9c3e05fc656ea58bc on the integration branch
w/2.7/improvement/bump-k8s-11717 is merging a branch which is neither the current
branch improvement/bump-k8s-11717 nor the development branch
development/2.7.

It is likely due to a rebase of the branch improvement/bump-k8s-11717 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 · 2021-01-14T14:25:34Z

/reset

bert-e · 2021-01-14T14:25:42Z

Reset complete

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

bert-e · 2021-01-14T14:25:49Z

Conflict

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

I have not created the integration branch.

Here are the steps to resolve this conflict:

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

bert-e · 2021-01-14T14:29:31Z

Integration data created

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

this pull request will merge improvement/bump-k8s-11717 into
development/2.6
w/2.7/improvement/bump-k8s-11717 will be merged into development/2.7
w/2.8/improvement/bump-k8s-11717 will be merged into development/2.8

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

bert-e · 2021-01-14T14:29:33Z

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 · 2021-01-14T21:59:40Z

/approve

bert-e · 2021-01-14T21:59:51Z

Build failed

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

The following options are set: approve

bert-e · 2021-01-14T23:29:10Z

Conflict with a changeset in the queue

The changeset in this pull request conflicts with another changeset
already in the queue. Please wait for the current queue to merge into
the development branch. The conflict will then appear in this pull
request and can be sorted on the feature branch directly.

This changeset has not been added to the queue.

The following options are set: approve

bert-e · 2021-01-15T06:46:54Z

Conflict

A conflict has been raised during the update of
integration branch w/2.7/improvement/bump-k8s-11717 with contents from improvement/bump-k8s-11717
and development/2.7.

Please resolve the conflict on the integration branch (w/2.7/improvement/bump-k8s-11717).

Here are the steps to resolve this conflict:

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

The following options are set: approve

TeddyAndrieux · 2021-01-15T06:48:47Z

/force_reset

bert-e · 2021-01-15T06:48:55Z

Reset complete

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

The following options are set: approve

bert-e · 2021-01-15T06:49:02Z

Conflict

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

I have not created the integration branch.

Here are the steps to resolve this conflict:

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

The following options are set: approve

bert-e · 2021-01-15T06:55:15Z

Integration data created

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

this pull request will merge improvement/bump-k8s-11717 into
development/2.6
w/2.7/improvement/bump-k8s-11717 will be merged into development/2.7
w/2.8/improvement/bump-k8s-11717 will be merged into development/2.8

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

bert-e · 2021-01-15T06:55:16Z

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

bert-e · 2021-01-15T10:15:29Z

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

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

bert-e · 2021-01-15T11:42:33Z

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

✔️ development/2.6
✔️ development/2.7
✔️ development/2.8

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
development/2.5

Please check the status of the associated issue None.

Goodbye teddyandrieux.

TeddyAndrieux added the complexity:easy Something that requires less than a day to fix label Jan 14, 2021

TeddyAndrieux requested a review from a team January 14, 2021 09:07

TeddyAndrieux force-pushed the improvement/bump-k8s-11717 branch from af578bf to b6b57da Compare January 14, 2021 14:25

NicolasT previously approved these changes Jan 14, 2021

View reviewed changes

build: Bump Kubernetes version to 1.17.17

1dbd4f6

TeddyAndrieux dismissed NicolasT’s stale review via 1dbd4f6 January 15, 2021 06:53

TeddyAndrieux force-pushed the improvement/bump-k8s-11717 branch from b6b57da to 1dbd4f6 Compare January 15, 2021 06:53

NicolasT approved these changes Jan 15, 2021

View reviewed changes

bert-e merged commit 1dbd4f6 into development/2.6 Jan 15, 2021

bert-e deleted the improvement/bump-k8s-11717 branch January 15, 2021 11:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build: Bump Kubernetes version to 1.17.17 #3036

build: Bump Kubernetes version to 1.17.17 #3036

TeddyAndrieux commented Jan 14, 2021

bert-e commented Jan 14, 2021

bert-e commented Jan 14, 2021

bert-e commented Jan 14, 2021

bert-e commented Jan 14, 2021

bert-e commented Jan 14, 2021

TeddyAndrieux commented Jan 14, 2021

bert-e commented Jan 14, 2021

bert-e commented Jan 14, 2021

bert-e commented Jan 14, 2021

bert-e commented Jan 14, 2021

TeddyAndrieux commented Jan 14, 2021

bert-e commented Jan 14, 2021

bert-e commented Jan 14, 2021

bert-e commented Jan 15, 2021

TeddyAndrieux commented Jan 15, 2021

bert-e commented Jan 15, 2021

bert-e commented Jan 15, 2021

bert-e commented Jan 15, 2021

bert-e commented Jan 15, 2021

bert-e commented Jan 15, 2021

bert-e commented Jan 15, 2021

build: Bump Kubernetes version to 1.17.17 #3036

build: Bump Kubernetes version to 1.17.17 #3036

Conversation

TeddyAndrieux commented Jan 14, 2021

bert-e commented Jan 14, 2021

Hello teddyandrieux,

bert-e commented Jan 14, 2021

Conflict

bert-e commented Jan 14, 2021

Integration data created

bert-e commented Jan 14, 2021

Waiting for approval

bert-e commented Jan 14, 2021

History mismatch

TeddyAndrieux commented Jan 14, 2021

bert-e commented Jan 14, 2021

Reset complete

bert-e commented Jan 14, 2021

Conflict

bert-e commented Jan 14, 2021

Integration data created

bert-e commented Jan 14, 2021

Waiting for approval

TeddyAndrieux commented Jan 14, 2021

bert-e commented Jan 14, 2021

Build failed

bert-e commented Jan 14, 2021

Conflict with a changeset in the queue

bert-e commented Jan 15, 2021

Conflict

TeddyAndrieux commented Jan 15, 2021

bert-e commented Jan 15, 2021

Reset complete

bert-e commented Jan 15, 2021

Conflict

bert-e commented Jan 15, 2021

Integration data created

bert-e commented Jan 15, 2021

Waiting for approval

bert-e commented Jan 15, 2021

In the queue

bert-e commented Jan 15, 2021