Skip to content

USHIFT-1390: Handle FDO scenario#1998

Merged
openshift-merge-robot merged 6 commits intoopenshift:mainfrom
pmtk:1390-fdo
Jul 13, 2023
Merged

USHIFT-1390: Handle FDO scenario#1998
openshift-merge-robot merged 6 commits intoopenshift:mainfrom
pmtk:1390-fdo

Conversation

@pmtk
Copy link
Copy Markdown
Member

@pmtk pmtk commented Jul 5, 2023 •
edited
Loading

No description provided.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 5, 2023
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jul 5, 2023 •
edited by openshift-ci Bot
Loading

@pmtk: This pull request references USHIFT-1390 which is a valid jira issue.

Details

In response to this:

Which issue(s) this PR addresses:

Closes #

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

openshift-ci-robot commented Jul 5, 2023 •
edited by openshift-ci Bot
Loading

@pmtk: This pull request references USHIFT-1390 which is a valid jira issue.

Details

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 openshift-ci Bot requested review from jerpeter1 and pliurh July 5, 2023 13:24
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 5, 2023
@pmtk pmtk force-pushed the 1390-fdo branch 2 times, most recently from 58bd9cb to 081c05a Compare July 5, 2023 14:45
dhellmann
dhellmann reviewed Jul 5, 2023
View reviewed changes
Comment thread pkg/admin/data/data_manager.go Outdated
Comment thread pkg/admin/prerun/prerun.go Outdated
Comment thread pkg/admin/prerun/prerun.go Outdated
Comment thread pkg/admin/prerun/prerun.go Outdated
Comment thread pkg/admin/prerun/prerun.go Outdated
Comment thread pkg/admin/prerun/prerun.go Outdated
@pmtk pmtk force-pushed the 1390-fdo branch 2 times, most recently from 6e394b1 to fb391dc Compare July 6, 2023 12:29
dhellmann
dhellmann reviewed Jul 6, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@dhellmann dhellmann left a comment

Choose a reason for hiding this comment

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

One question that we can address in a follow-up.

/lgtm

@jogeo @dhensel-rh do you want to test this before we merge it?

/hold

Comment thread test/suites-ostree/fdo.robot Outdated
@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 6, 2023
@openshift-ci openshift-ci Bot added lgtm Indicates that a PR is ready to be merged. and removed lgtm Indicates that a PR is ready to be merged. labels Jul 6, 2023
dhellmann
dhellmann reviewed Jul 7, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@dhellmann dhellmann 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 openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 7, 2023
@pmtk
Copy link
Copy Markdown
Member Author

pmtk commented Jul 11, 2023

/unhold

Unholding to allow to make progress with other dev tasks

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 11, 2023
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 11, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 11, 2023
@pmtk
Copy link
Copy Markdown
Member Author

pmtk commented Jul 11, 2023

/hold

Depends on #2037

@openshift-ci openshift-ci Bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed lgtm Indicates that a PR is ready to be merged. labels Jul 11, 2023
@pmtk pmtk mentioned this pull request Jul 11, 2023
Merged
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 12, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 13, 2023
@pmtk
Copy link
Copy Markdown
Member Author

pmtk commented Jul 13, 2023

/unhold

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 13, 2023
pmtk added 2 commits July 13, 2023 17:36
@pmtk
fdo.robot changes to make it shorter and more robust
e51829f
@pmtk
account for greenboot's rpm-ostree rollback
abf2103 
It happens when boot_counter falls down to "rollback value"
Then, grub just boots another boot entry.
After system start, greenboot notices boot_counter is -1,
and it executes `rpm-ostree rollback` to actually make
currently booted deployment first one on the list (default)
@eggfoobar
Copy link
Copy Markdown
Contributor

eggfoobar commented Jul 13, 2023

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 13, 2023
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 13, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dhellmann, eggfoobar, pmtk

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [dhellmann,eggfoobar,pmtk]

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 5d08776 into openshift:main Jul 13, 2023
@pmtk pmtk deleted the 1390-fdo branch November 6, 2023 09:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dhellmann dhellmann dhellmann left review comments

@jerpeter1 jerpeter1 Awaiting requested review from jerpeter1

@pliurh pliurh Awaiting requested review from pliurh

Assignees

@dhellmann dhellmann

@eggfoobar eggfoobar

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. 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.

5 participants

@pmtk @openshift-ci-robot @eggfoobar @dhellmann @openshift-merge-robot