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 1835112: ensure s390/ppc64le platforms bootstrap as removed following upgrade #277

Merged

Conversation

gabemontero
Copy link
Contributor

/hold

until @dbenoit17 and I verify these changes via a 4.3 based branch he is testing on s390 for me

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 26, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 26, 2020
@gabemontero gabemontero changed the title 1835112: force nonX86 to removed to facilitate upgrade, normalize current sample approach for nonX86 Bug 1835112: force nonX86 to removed to facilitate upgrade, normalize current sample approach for nonX86 May 26, 2020
@openshift-ci-robot
Copy link
Contributor

@gabemontero: An error was encountered updating to the POST state for bug 1835112 on the Bugzilla server at https://bugzilla.redhat.com:

code 32000: Red Hat Bugzilla's database reported a query serialization error. Most likely this occurred because another user or process attempted to change the same data that you were attempting to change. Please press Back and retry the transaction.

 UPDATE bugs SET bug_status = ? WHERE bug_id = ? at /var/www/html/bugzilla/Bugzilla/Object.pm line 544. Bugzilla::Object::update('Bugzilla::Bug=HASH(0x564443a9f5d8)') called at /var/www/html/bugzilla/Bugzilla/Bug.pm line 1168 Bugzilla::Bug::update('Bugzilla::Bug=HASH(0x564443a9f5d8)') called at /var/www/html/bugzilla/Bugzilla/WebService/Bug.pm line 851 Bugzilla::WebService::Bug::update('Bugzilla::WebService::Server::REST::Bugzilla::WebService::Bug...', 'HASH(0x564446943128)') called at (eval 4808) line 1 eval ' $procedure->{code}->($self, $params) ;' called at /usr/share/perl5/vendor_perl/JSON/RPC/Legacy/Server.pm line 208 JSON::RPC::Legacy::Server::_handle('Bugzilla::WebService::Server::REST::Bugzilla::WebService::Bug...', 'HASH(0x5644459d9740)') called at /var/www/html/bugzilla/Bugzilla/WebService/Server/JSONRPC.pm line 295 Bugzilla::WebService::Server::JSONRPC::_handle('Bugzilla::WebService::Server::REST::Bugzilla::WebService::Bug...', 'HASH(0x5644459d9740)') called at /var/www/html/bugzilla/Bugzilla/WebService/Server/REST.pm line 98 Bugzilla::WebService::Server::REST::handle('Bugzilla::WebService::Server::REST::Bugzilla::WebService::Bug...') called at /var/www/html/bugzilla/rest.cgi line 30 ModPerl::ROOT::Bugzilla::ModPerl::ResponseHandler::var_www_html_bugzilla_rest_2ecgi::handler('Apache2::RequestRec=SCALAR(0x56444a4afa20)') 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(0x5644430f8f58)') called at /usr/lib64/perl5/vendor_perl/ModPerl/RegistryCooker.pm line 173 ModPerl::RegistryCooker::default_handler('Bugzilla::ModPerl::ResponseHandler=HASH(0x5644430f8f58)') called at /usr/lib64/perl5/vendor_perl/ModPerl/Registry.pm line 32 ModPerl::Registry::handler('Bugzilla::ModPerl::ResponseHandler', 'Apache2::RequestRec=SCALAR(0x56444a4afa20)') called at /var/www/html/bugzilla/mod_perl.pl line 139 Bugzilla::ModPerl::ResponseHandler::handler('Bugzilla::ModPerl::ResponseHandler', 'Apache2::RequestRec=SCALAR(0x56444a4afa20)') called at (eval 4808) line 0 eval {...} called at (eval 4808) line 0 

Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

In response to this:

Bug 1835112: force nonX86 to removed to facilitate upgrade, normalize current sample approach for nonX86

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 the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label May 26, 2020
@openshift-ci-robot
Copy link
Contributor

@gabemontero: This pull request references Bugzilla bug 1835112, 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.

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

In response to this:

Bug 1835112: force nonX86 to removed to facilitate upgrade, normalize current sample approach for nonX86

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 the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label May 26, 2020
Copy link
Contributor

@adambkaplan adambkaplan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So to clarify:

  1. We want to ensure that the samples operator bootstraps as Removed on 4.2, 4.3, 4.4, and now 4.5 for Power and Z
  2. In 4.6 we will alter this behavior if we have samples for non-x86 platforms (Power seems likely, Z may make it, too).

If so, please update the title and description of this PR so that it is clear what our intentions are with this fix. We should also keep this bug on the blocker list so we ensure upgrades work properly on Power and Z (backports will also be needed).

@gabemontero gabemontero changed the title Bug 1835112: force nonX86 to removed to facilitate upgrade, normalize current sample approach for nonX86 Bug 1835112: ensure s390/ppc64le platforms bootstrap as removed following upgrade May 26, 2020
@gabemontero
Copy link
Contributor Author

/hold cancel

@dbenoit17 and I have verified these changes in s390x with a 4.2 -> 4.3 upgrde

@adambkaplan - commit msg / PR title updated as well

your clarification on the intent was correct

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 26, 2020
@gabemontero
Copy link
Contributor Author

also note, until some form of openshift/origin#25018 merges image-eco will not pass @adambkaplan

Copy link
Contributor

@adambkaplan adambkaplan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adambkaplan, gabemontero

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 [adambkaplan,gabemontero]

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 lgtm Indicates that a PR is ready to be merged. label May 27, 2020
@openshift-bot
Copy link
Contributor

/retest

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

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

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

@gabemontero
Copy link
Contributor Author

/hold

this also will need openshift/origin#25018 to merge for image-eco to pass

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 27, 2020
@gabemontero
Copy link
Contributor Author

/hold cancel

/retest

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 28, 2020
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit 3938fa8 into openshift:master May 28, 2020
@openshift-ci-robot
Copy link
Contributor

@gabemontero: All pull requests linked via external trackers have merged: openshift/cluster-samples-operator#277, openshift/cluster-samples-operator#271. Bugzilla bug 1835112 has been moved to the MODIFIED state.

In response to this:

Bug 1835112: ensure s390/ppc64le platforms bootstrap as removed following upgrade

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.

1 similar comment
@openshift-ci-robot
Copy link
Contributor

@gabemontero: All pull requests linked via external trackers have merged: openshift/cluster-samples-operator#277, openshift/cluster-samples-operator#271. Bugzilla bug 1835112 has been moved to the MODIFIED state.

In response to this:

Bug 1835112: ensure s390/ppc64le platforms bootstrap as removed following upgrade

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.

@gabemontero gabemontero deleted the s390-42-43-upgrade-45fix branch May 28, 2020 15:03
@gabemontero
Copy link
Contributor Author

/cherrypick release-4.4

@openshift-cherrypick-robot

@gabemontero: #277 failed to apply on top of branch "release-4.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/stub/config.go
M	pkg/stub/handler.go
M	pkg/stub/imagestreams.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/stub/imagestreams.go
Auto-merging pkg/stub/handler.go
CONFLICT (content): Merge conflict in pkg/stub/handler.go
Auto-merging pkg/stub/config.go
Patch failed at 0001 ensure s390/ppc64le platforms bootstrap as removed following upgrade

In response to this:

/cherrypick release-4.4

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.

1 similar comment
@openshift-cherrypick-robot

@gabemontero: #277 failed to apply on top of branch "release-4.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/stub/config.go
M	pkg/stub/handler.go
M	pkg/stub/imagestreams.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/stub/imagestreams.go
Auto-merging pkg/stub/handler.go
CONFLICT (content): Merge conflict in pkg/stub/handler.go
Auto-merging pkg/stub/config.go
Patch failed at 0001 ensure s390/ppc64le platforms bootstrap as removed following upgrade

In response to this:

/cherrypick release-4.4

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

6 participants