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

Bug 1873043: Add rebase instructions #360

Merged
merged 1 commit into from Sep 21, 2020

Conversation

marun
Copy link

@marun marun commented Sep 18, 2020

Add rebase instructions updated to reflect the transition of hyperkube maintenance from origin to openshift/kubernetes. For releases 4.6 and above, this document supercedes the instructions in the the rebase enhancment. Putting this document in the repository to which it applies should simplify its maintenance as part of the regular rebase workflow and also allow it to be more easily discovered.

A related PR updates the rebase enhancement to reflect its relevance to only releases 4.5 and below: openshift/enhancements#481

Co-authored-by: Lukasz Szaszkiewicz <lukasz.szaszkiewicz@gmail.com>

REBASE.openshift.md Outdated Show resolved Hide resolved
REBASE.openshift.md Show resolved Hide resolved
Add rebase instructions updated to reflect the transition of hyperkube
maintenance from origin to openshift/kubernetes. For releases 4.6 and
above, this document supercedes the instructions in the the [rebase
enhancment](https://github.com/openshift/enhancements/blob/master/enhancements/rebase.md). Putting
this document in the repository to which it applies should simplify
its maintenance as part of the regular rebase workflow and also allow
it to be more easily discovered.

Co-authored-by: Lukasz Szaszkiewicz <lukasz.szaszkiewicz@gmail.com>
@sttts
Copy link

sttts commented Sep 21, 2020

/retest

@sttts
Copy link

sttts commented Sep 21, 2020

/retest
/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 21, 2020
@sttts
Copy link

sttts commented Sep 21, 2020

/override e2e-aws-serial

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 21, 2020
@sttts
Copy link

sttts commented Sep 21, 2020

/override ci/prow/e2e-aws-serial

@openshift-ci-robot
Copy link

@sttts: /override requires a failed status context to operate on.
The following unknown contexts were given:

  • e2e-aws-serial

Only the following contexts were expected:

  • ci/prow/artifacts
  • ci/prow/e2e-aws-csi
  • ci/prow/e2e-aws-fips
  • ci/prow/e2e-aws-serial
  • ci/prow/e2e-cmd
  • ci/prow/e2e-gcp
  • ci/prow/e2e-gcp-upgrade
  • ci/prow/images
  • ci/prow/integration
  • ci/prow/k8s-e2e-gcp
  • ci/prow/k8s-e2e-gcp-serial
  • ci/prow/unit
  • ci/prow/verify
  • ci/prow/verify-commits
  • tide

In response to this:

/override e2e-aws-serial

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

@sttts: Overrode contexts on behalf of sttts: ci/prow/e2e-aws-serial

In response to this:

/override ci/prow/e2e-aws-serial

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.

@marun marun changed the title Add rebase instructions Bug 1873043: Add rebase instructions Sep 21, 2020
@openshift-ci-robot
Copy link

@marun: An error was encountered adding this pull request to the external tracker bugs for bug 1873043 on the Bugzilla server at https://bugzilla.redhat.com:

JSONRPC error 32000: There was an error reported for a GitHub REST call. URL: https://api.github.com/repos/openshift/kubernetes/pulls/360 Error: 403 Forbidden at /loader/0x558945dcc880/Bugzilla/Extension/ExternalBugs/Type/GitHub.pm line 111. at /loader/0x558945dcc880/Bugzilla/Extension/ExternalBugs/Type/GitHub.pm line 111. eval {...} called at /loader/0x558945dcc880/Bugzilla/Extension/ExternalBugs/Type/GitHub.pm line 98 Bugzilla::Extension::ExternalBugs::Type::GitHub::_do_rest_call('Bugzilla::Extension::ExternalBugs::Type::GitHub=HASH(0x55894c...', 'https://api.github.com/repos/openshift/kubernetes/pulls/360', 'GET') called at /loader/0x558945dcc880/Bugzilla/Extension/ExternalBugs/Type/GitHub.pm line 62 Bugzilla::Extension::ExternalBugs::Type::GitHub::get_data('Bugzilla::Extension::ExternalBugs::Type::GitHub=HASH(0x55894c...', 'Bugzilla::Extension::ExternalBugs::Bug=HASH(0x55894c61f5e8)') called at /loader/0x558945dcc880/Bugzilla/Extension/ExternalBugs/Bug.pm line 302 eval {...} called at /loader/0x558945dcc880/Bugzilla/Extension/ExternalBugs/Bug.pm line 302 Bugzilla::Extension::ExternalBugs::Bug::update_ext_info('Bugzilla::Extension::ExternalBugs::Bug=HASH(0x55894c61f5e8)', 1) called at /loader/0x558945dcc880/Bugzilla/Extension/ExternalBugs/Bug.pm line 125 Bugzilla::Extension::ExternalBugs::Bug::create('Bugzilla::Extension::ExternalBugs::Bug', 'HASH(0x55894ca13808)') called at /var/www/html/bugzilla/extensions/ExternalBugs/Extension.pm line 877 Bugzilla::Extension::ExternalBugs::bug_start_of_update('Bugzilla::Extension::ExternalBugs=HASH(0x55894c11f590)', 'HASH(0x55894d823a40)') called at /var/www/html/bugzilla/Bugzilla/Hook.pm line 21 Bugzilla::Hook::process('bug_start_of_update', 'HASH(0x55894d823a40)') called at /var/www/html/bugzilla/Bugzilla/Bug.pm line 1170 Bugzilla::Bug::update('Bugzilla::Bug=HASH(0x55894bfbb5d0)') called at /loader/0x558945dcc880/Bugzilla/Extension/ExternalBugs/WebService.pm line 88 Bugzilla::Extension::ExternalBugs::WebService::add_external_bug('Bugzilla::WebService::Server::JSONRPC::Bugzilla::Extension::E...', 'HASH(0x55894c84d600)') called at (eval 2410) line 1 eval ' $procedure->{code}->($self, @params) ;' called at /usr/share/perl5/vendor_perl/JSON/RPC/Legacy/Server.pm line 220 JSON::RPC::Legacy::Server::_handle('Bugzilla::WebService::Server::JSONRPC::Bugzilla::Extension::E...', 'HASH(0x55894c993830)') called at /var/www/html/bugzilla/Bugzilla/WebService/Server/JSONRPC.pm line 295 Bugzilla::WebService::Server::JSONRPC::_handle('Bugzilla::WebService::Server::JSONRPC::Bugzilla::Extension::E...', 'HASH(0x55894c993830)') called at /usr/share/perl5/vendor_perl/JSON/RPC/Legacy/Server.pm line 126 JSON::RPC::Legacy::Server::handle('Bugzilla::WebService::Server::JSONRPC::Bugzilla::Extension::E...') called at /var/www/html/bugzilla/Bugzilla/WebService/Server/JSONRPC.pm line 70 Bugzilla::WebService::Server::JSONRPC::handle('Bugzilla::WebService::Server::JSONRPC::Bugzilla::Extension::E...') called at /var/www/html/bugzilla/jsonrpc.cgi line 31 ModPerl::ROOT::Bugzilla::ModPerl::ResponseHandler::var_www_html_bugzilla_jsonrpc_2ecgi::handler('Apache2::RequestRec=SCALAR(0x55894c9ca5a0)') called at /usr/lib64/perl5/vendor_perl/ModPerl/RegistryCooker.pm line 207 eval {...} called at /usr/lib64/perl5/vendor_perl/ModPerl/RegistryCooker.pm line 207 ModPerl::RegistryCooker::run('Bugzilla::ModPerl::ResponseHandler=HASH(0x55894c8f6598)') called at /usr/lib64/perl5/vendor_perl/ModPerl/RegistryCooker.pm line 173 ModPerl::RegistryCooker::default_handler('Bugzilla::ModPerl::ResponseHandler=HASH(0x55894c8f6598)') called at /usr/lib64/perl5/vendor_perl/ModPerl/Registry.pm line 32 ModPerl::Registry::handler('Bugzilla::ModPerl::ResponseHandler', 'Apache2::RequestRec=SCALAR(0x55894c9ca5a0)') called at /var/www/html/bugzilla/mod_perl.pl line 139 Bugzilla::ModPerl::ResponseHandler::handler('Bugzilla::ModPerl::ResponseHandler', 'Apache2::RequestRec=SCALAR(0x55894c9ca5a0)') called at (eval 2410) line 0 eval {...} called at (eval 2410) line 0
Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

In response to this:

Bug 1873043: Add rebase instructions

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.

@marun
Copy link
Author

marun commented Sep 21, 2020

/bugzilla refresh

@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 Sep 21, 2020
@openshift-ci-robot
Copy link

@marun: This pull request references Bugzilla bug 1873043, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

/bugzilla 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-bot
Copy link

/retest

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

@p0lyn0mial
Copy link

/lgtm

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: marun, p0lyn0mial, sttts

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-merge-robot openshift-merge-robot merged commit 7e8389f into openshift:master Sep 21, 2020
@openshift-ci-robot
Copy link

@marun: All pull requests linked via external trackers have merged:

Bugzilla bug 1873043 has been moved to the MODIFIED state.

In response to this:

Bug 1873043: Add rebase instructions

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

7 participants