Skip to content

fcos.upgrade.basic: support rebasing to different stream#1352

Merged
openshift-merge-robot merged 1 commit intocoreos:masterfrom
jlebon:pr/upgrade-testing-rebase
Apr 15, 2020
Merged

fcos.upgrade.basic: support rebasing to different stream#1352
openshift-merge-robot merged 1 commit intocoreos:masterfrom
jlebon:pr/upgrade-testing-rebase

Conversation

@jlebon
Copy link
Copy Markdown
Member

@jlebon jlebon commented Apr 15, 2020

We allow nodes to switch streams using rpm-ostree rebase. Let's make
our upgrade test reflect that. One cool thing to note is that the
upgrade-from-current test does still use Zincati, so this still does
some sanity-checking of Zincati on the new stream.

This goes together with the previous commit, in which we've added some
support for selecting a separate starting stream.

@jlebon
Copy link
Copy Markdown
Member Author

jlebon commented Apr 15, 2020

Requires: #1351

@jlebon
Copy link
Copy Markdown
Member Author

jlebon commented Apr 15, 2020

To be more clear about the goal here: this provides coverage for upgrading from testing-devel to next-devel and will enable coverage for end users to rebase from the other production streams to next once that's up.

@jlebon jlebon force-pushed the pr/upgrade-testing-rebase branch from a00390e to 659dc89 Compare April 15, 2020 16:53
@dustymabe
Copy link
Copy Markdown
Member

trivial review LGTM

/approve

@dustymabe
Copy link
Copy Markdown
Member

/lgtm

@dustymabe
Copy link
Copy Markdown
Member

/retest

We allow nodes to switch streams using `rpm-ostree rebase`. Let's make
our upgrade test reflect that. One cool thing to note is that the
`upgrade-from-current` test does still use Zincati, so this still does
some sanity-checking of Zincati on the new stream.

This goes together with the previous commit, in which we've added some
support for selecting a separate starting stream.
@jlebon jlebon force-pushed the pr/upgrade-testing-rebase branch from 09689c5 to 4f730e2 Compare April 15, 2020 20:02
@jlebon
Copy link
Copy Markdown
Member Author

jlebon commented Apr 15, 2020

OK, rebased this now and fixed a bug!

@dustymabe
Copy link
Copy Markdown
Member

/lgtm

@openshift-ci-robot
Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dustymabe, jlebon

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:

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 d1152f7 into coreos:master Apr 15, 2020
@jlebon jlebon deleted the pr/upgrade-testing-rebase branch July 6, 2020 20:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants