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

OCPBUGS-19464: Use proxy settings from env #691

Merged
merged 1 commit into from
Oct 11, 2023

Conversation

jc-rh
Copy link
Member

@jc-rh jc-rh commented Oct 11, 2023

Also added the new infrastructure features annotation

@openshift-ci-robot
Copy link

@jc-rh: This pull request references Jira Issue OCPBUGS-19464, which is invalid:

  • expected the bug to target the "4.15.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to this:

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

@jc-rh: This pull request references Jira Issue OCPBUGS-19464, which is invalid:

  • expected the bug to target the "4.15.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Also added the new infrastructure features annotation

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.

@sakhoury
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 11, 2023
@jc-rh
Copy link
Member Author

jc-rh commented Oct 11, 2023

/jira refresh

@openshift-ci-robot
Copy link

@jc-rh: This pull request references Jira Issue OCPBUGS-19464, 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.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @yliu127

In response to this:

/jira refresh

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

openshift-ci bot commented Oct 11, 2023

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

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

In response to this:

@jc-rh: This pull request references Jira Issue OCPBUGS-19464, 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.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @yliu127

In response to this:

/jira refresh

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.

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.

@fontivan
Copy link
Contributor

/approve

@openshift-ci
Copy link

openshift-ci bot commented Oct 11, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fontivan

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 11, 2023
@jc-rh
Copy link
Member Author

jc-rh commented Oct 11, 2023

/cc @rauhersu

@openshift-ci openshift-ci bot requested a review from rauhersu October 11, 2023 13:57
@openshift-ci openshift-ci bot merged commit a8e5b89 into openshift-kni:main Oct 11, 2023
5 checks passed
@openshift-ci-robot
Copy link

@jc-rh: Jira Issue OCPBUGS-19464: All pull requests linked via external trackers have merged:

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

In response to this:

Also added the new infrastructure features annotation

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.

@jc-rh
Copy link
Member Author

jc-rh commented Oct 11, 2023

/cherrypick release-4.14

@openshift-cherrypick-robot

@jc-rh: #691 failed to apply on top of branch "release-4.14":

Applying: Use proxy settings from env
Using index info to reconstruct a base tree...
M	bundle/manifests/cluster-group-upgrades-operator.clusterserviceversion.yaml
M	config/manifests/bases/cluster-group-upgrades-operator.clusterserviceversion.yaml
Falling back to patching base and 3-way merge...
Auto-merging config/manifests/bases/cluster-group-upgrades-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in config/manifests/bases/cluster-group-upgrades-operator.clusterserviceversion.yaml
Auto-merging bundle/manifests/cluster-group-upgrades-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in bundle/manifests/cluster-group-upgrades-operator.clusterserviceversion.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use proxy settings from env
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:

/cherrypick release-4.14

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.

jc-rh added a commit to jc-rh/cluster-group-upgrades-operator that referenced this pull request Oct 11, 2023
jc-rh added a commit to jc-rh/cluster-group-upgrades-operator that referenced this pull request Oct 11, 2023
jc-rh added a commit to jc-rh/cluster-group-upgrades-operator that referenced this pull request Oct 11, 2023
openshift-ci bot pushed a commit that referenced this pull request Oct 11, 2023
openshift-ci bot pushed a commit that referenced this pull request Oct 11, 2023
openshift-ci bot pushed a commit that referenced this pull request Oct 11, 2023
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. 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

5 participants