search

openshift / jenkins

Apache License 2.0
260 stars 447 forks source link

OCPBUGS-14363: Update Jenkins to 2.401.1 LTS and bump plugins #1685

Closed coreydaley closed 1 year ago

openshift-ci-robot commented 1 year ago

@coreydaley: This pull request references Jira Issue OCPBUGS-14363, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.14.0) matches configured target version for branch (4.14.0) * bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact: /cc @coreydaley

The bug has been updated to refer to the pull request using the external bug tracker.

In response to [this](https://github.com/openshift/jenkins/pull/1685): > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
coreydaley commented 1 year ago

/assign @divyansh42 @mbharatk @apoorvajagtap for lgtm

openshift-ci[bot] commented 1 year ago

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: coreydaley.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to [this](https://github.com/openshift/jenkins/pull/1685#issuecomment-1570475948): >@coreydaley: This pull request references [Jira Issue OCPBUGS-14363](https://issues.redhat.com//browse/OCPBUGS-14363), which is valid. The bug has been moved to the POST state. > >
3 validation(s) were run on this bug > >* bug is open, matching expected state (open) >* bug target version (4.14.0) matches configured target version for branch (4.14.0) >* bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact: /cc @coreydaley

The bug has been updated to refer to the pull request using the external bug tracker.

In response to [this](https://github.com/openshift/jenkins/pull/1685): > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

mbharatk commented 1 year ago

/lgtm

openshift-ci[bot] commented 1 year ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: coreydaley, divyansh42, mbharatk

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/openshift/jenkins/blob/master/OWNERS)~~ [coreydaley,divyansh42,mbharatk] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
coreydaley commented 1 year ago

/cherry-pick release-4.13

openshift-cherrypick-robot commented 1 year ago

@coreydaley: once the present PR merges, I will cherry-pick it on top of release-4.13 in a new PR and assign it to you.

In response to [this](https://github.com/openshift/jenkins/pull/1685#issuecomment-1570607907): >/cherry-pick release-4.13 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
openshift-ci[bot] commented 1 year ago

@coreydaley: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
openshift-ci-robot commented 1 year ago

@coreydaley: Jira Issue OCPBUGS-14363: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-14363 has been moved to the MODIFIED state.

In response to [this](https://github.com/openshift/jenkins/pull/1685): > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
openshift-cherrypick-robot commented 1 year ago

@coreydaley: #1685 failed to apply on top of branch "release-4.13":

Applying: Bump Jenkins to 2.401.1 and bump plugin versions
Using index info to reconstruct a base tree...
M   2/contrib/openshift/base-plugins.txt
M   2/contrib/openshift/bundle-plugins.txt
Falling back to patching base and 3-way merge...
Auto-merging 2/contrib/openshift/bundle-plugins.txt
CONFLICT (content): Merge conflict in 2/contrib/openshift/bundle-plugins.txt
Auto-merging 2/contrib/openshift/base-plugins.txt
CONFLICT (content): Merge conflict in 2/contrib/openshift/base-plugins.txt
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump Jenkins to 2.401.1 and bump plugin versions
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/openshift/jenkins/pull/1685#issuecomment-1570607907): >/cherry-pick release-4.13 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.