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

[release-4.6] Bug 1922139: Update Maven version to 3.6 in maven agent #1209

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #1195

/assign akram

@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Bugzilla bug 1899111 has been cloned as Bugzilla bug 1922139. Retitling PR to link against new bug.
/retitle [release-4.6] Bug 1922139: Update Maven version to 3.6 in maven agent

In response to this:

[release-4.6] Bug 1899111: Update Maven version to 3.6 in maven agent

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.

@openshift-ci-robot openshift-ci-robot changed the title [release-4.6] Bug 1899111: Update Maven version to 3.6 in maven agent [release-4.6] Bug 1922139: Update Maven version to 3.6 in maven agent Jan 29, 2021
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1922139, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.z) matches configured target release for branch (4.6.z)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1899111 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1899111 targets the "4.7.0" release, which is one of the valid target releases: 4.7.0
  • bug has dependents

In response to this:

[release-4.6] Bug 1922139: Update Maven version to 3.6 in maven agent

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.

@openshift-ci-robot openshift-ci-robot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Jan 29, 2021
@jkhelil
Copy link
Contributor

jkhelil commented Jan 29, 2021

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 29, 2021
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jkhelil, openshift-cherrypick-robot

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:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 29, 2021
@akram
Copy link
Contributor

akram commented Jan 29, 2021

/close

@openshift-ci-robot
Copy link
Contributor

@akram: Closed this PR.

In response to this:

/close

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.

@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1922139. The bug has been updated to no longer refer to the pull request using the external bug tracker. All external bug links have been closed. The bug has been moved to the NEW state.

In response to this:

[release-4.6] Bug 1922139: Update Maven version to 3.6 in maven agent

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.

@akram
Copy link
Contributor

akram commented Feb 2, 2021

/reopen

@openshift-ci-robot
Copy link
Contributor

@akram: Reopened this PR.

In response to this:

/reopen

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.

@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Bugzilla bug 1922139, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.z) matches configured target release for branch (4.6.z)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1899111 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1899111 targets the "4.7.0" release, which is one of the valid target releases: 4.7.0
  • bug has dependents

In response to this:

[release-4.6] Bug 1922139: Update Maven version to 3.6 in maven agent

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.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@knobunc knobunc added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Feb 4, 2021
@openshift-merge-robot openshift-merge-robot merged commit 4e80e6a into openshift:release-4.6 Feb 4, 2021
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged:

Bugzilla bug 1922139 has been moved to the MODIFIED state.

In response to this:

[release-4.6] Bug 1922139: Update Maven version to 3.6 in maven agent

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.

@waveywaves
Copy link
Contributor

/cherry-pick release-4.5

@openshift-cherrypick-robot
Copy link
Author

@waveywaves: #1209 failed to apply on top of branch "release-4.5":

Applying: Update Maven version to 3.6 in maven agent
.git/rebase-apply/patch:25: trailing whitespace.
    PATH="${M2_HOME}/bin:${PATH}" 
.git/rebase-apply/patch:45: trailing whitespace.
    
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	agent-maven-3.5/Dockerfile.localdev
M	agent-maven-3.5/Dockerfile.rhel7
A	agent-maven-3.5/Dockerfile.rhel8
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): agent-maven-3.5/Dockerfile.rhel8 deleted in HEAD and modified in Update Maven version to 3.6 in maven agent. Version Update Maven version to 3.6 in maven agent of agent-maven-3.5/Dockerfile.rhel8 left in tree.
Auto-merging agent-maven-3.5/Dockerfile.rhel7
Auto-merging agent-maven-3.5/Dockerfile.localdev
CONFLICT (content): Merge conflict in agent-maven-3.5/Dockerfile.localdev
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update Maven version to 3.6 in maven agent
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:

/cherry-pick release-4.5

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants