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

[release-4.17] OCPBUGS-39090: use proxy settings when required #1860

Merged
merged 1 commit into from
Sep 11, 2024
Merged

[release-4.17] OCPBUGS-39090: use proxy settings when required #1860

merged 1 commit into from
Sep 11, 2024

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #1857

/assign suyog-bhat

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Aug 28, 2024
Merged
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-38990 has been cloned as Jira Issue OCPBUGS-39090. Will retitle bug to link to clone.
/retitle [release-4.17] OCPBUGS-39090: use proxy settings when required

In response to this:

This is an automated cherry-pick of #1857

/assign suyog-bhat

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot changed the title [release-4.17] OCPBUGS-38990: use proxy settings when required [release-4.17] OCPBUGS-39090: use proxy settings when required Aug 28, 2024
@openshift-ci-robot openshift-ci-robot added jira/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Aug 28, 2024
@openshift-ci-robot
Copy link

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

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.17.0) matches configured target version for branch (4.17.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-38990 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-38990 targets the "4.18.0" version, which is one of the valid target versions: 4.18.0
  • bug has dependents

Requesting review from QA contact:
/cc @mhanss

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

In response to this:

This is an automated cherry-pick of #1857

/assign suyog-bhat

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Aug 28, 2024
@suyog-bhat
Copy link

/retest-required

@andfasano
Copy link
Contributor

/approve

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 28, 2024
@suyog-bhat
Copy link

/assign @sadasu

@suyog-bhat
Copy link

/assign @gpei

@andfasano
Copy link
Contributor

/approve

@pawanpinjarkar
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 4, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Sep 4, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@suyog-bhat
Copy link

suyog-bhat commented Sep 5, 2024 •
edited
Loading

/assign @ingvagabund

@suyog-bhat
Copy link

/assign @evakhoni

@ingvagabund
Copy link
Member

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Sep 5, 2024
@evakhoni evakhoni removed their assignment Sep 5, 2024
@suyog-bhat
Copy link

/assign @mhanss

@suyog-bhat
Copy link

looking for cherry-pick-approved labels

@zhouying7780
Copy link
Contributor

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Sep 11, 2024
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-39090, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.17.0) matches configured target version for branch (4.17.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-38990 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-38990 targets the "4.18.0" version, which is one of the valid target versions: 4.18.0
  • bug has dependents

Requesting review from QA contact:
/cc @mhanss

In response to this:

This is an automated cherry-pick of #1857

/assign suyog-bhat

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 openshift-eng/jira-lifecycle-plugin repository.

@zhouying7780
Copy link
Contributor

/remove-label qe-approved

@openshift-ci openshift-ci bot removed the qe-approved Signifies that QE has signed off on this PR label Sep 11, 2024
@zhouying7780
Copy link
Contributor

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Sep 11, 2024
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 664e7de and 2 for PR HEAD e549e04 in total

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Sep 11, 2024

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit bc58b3a into openshift:release-4.17 Sep 11, 2024
14 checks passed
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-39090: All pull requests linked via external trackers have merged:

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

In response to this:

This is an automated cherry-pick of #1857

/assign suyog-bhat

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 openshift-eng/jira-lifecycle-plugin repository.

@suyog-bhat
Copy link

/cherry-pick release-4.16

@openshift-cherrypick-robot
Copy link
Author

@suyog-bhat: #1860 failed to apply on top of branch "release-4.16":

Applying: node-joiner: use proxy settings when required
Using index info to reconstruct a base tree...
A	pkg/cli/admin/nodeimage/create.go
A	pkg/cli/admin/nodeimage/create_test.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/cli/admin/nodeimage/create_test.go deleted in HEAD and modified in node-joiner: use proxy settings when required. Version node-joiner: use proxy settings when required of pkg/cli/admin/nodeimage/create_test.go left in tree.
CONFLICT (modify/delete): pkg/cli/admin/nodeimage/create.go deleted in HEAD and modified in node-joiner: use proxy settings when required. Version node-joiner: use proxy settings when required of pkg/cli/admin/nodeimage/create.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 node-joiner: use proxy settings when required
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.16

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-sigs/prow repository.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-cli
This PR has been included in build openshift-enterprise-cli-container-v4.17.0-202409111134.p0.gbc58b3a.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-tools
This PR has been included in build ose-tools-container-v4.17.0-202409111134.p0.gbc58b3a.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-deployer
This PR has been included in build openshift-enterprise-deployer-container-v4.17.0-202409111134.p0.gbc58b3a.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-cli-artifacts
This PR has been included in build ose-cli-artifacts-container-v4.17.0-202409111134.p0.gbc58b3a.assembly.stream.el9.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mhanss mhanss Awaiting requested review from mhanss

@andfasano andfasano Awaiting requested review from andfasano

@pawanpinjarkar pawanpinjarkar Awaiting requested review from pawanpinjarkar

Assignees

@gpei gpei

@sadasu sadasu

@kasturinarra kasturinarra

@ingvagabund ingvagabund

@zhouying7780 zhouying7780

@xingxingxia xingxingxia

@pawanpinjarkar pawanpinjarkar

@mhanss mhanss

@suyog-bhat suyog-bhat

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-low Referenced Jira bug's severity is low for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.