tests/default-network-behavior-change: Adapt to RHCOS 4.11#1511
tests/default-network-behavior-change: Adapt to RHCOS 4.11#1511cgwalters merged 1 commit intocoreos:testing-develfrom
Conversation
And to repeat myself again (from e.g. #1405 (comment) ) - we'll soon have "RHCOS9" - and if these conditionals are testing the RHEL version or the sub-component (NM) version, they will Just Work. |
|
LGTM but I think we should discard all the version selection logic now that everybody is using the same config. |
|
Yeah true, in general since we fork this repo per RHCOS, there's not a lot of value in having the new code support older versions. |
I'd prefer to leave the logic in place for when things change in the future. |
|
We need to update the comments above the definitions of the variables at the top of the script. |
63b6634 to
77cc1f9
Compare
Yeah. There is some gray area here. In this case I decided up front that I wanted to know anytime the networking configuration changed in a stream (i.e. 4.9, etc). When the failure occurs we can then decide if that change is OK mid stream or not. |
OK.
Done |
|
|
||
| # EXPECTED_INITRD_NETWORK_CFG1 | ||
| # - used on FCOS 35+ releases | ||
| # - used on Fedora 35+ and RHEL 8.5+ releases |
There was a problem hiding this comment.
OK, though the comments are duplicating the conditionals; I think it's better to have a single source of truth. i.e. I'd lean towards deleting the comments instead. But for now, updated that line too
IOW - this PR is us deciding that this change is safe for 4.11. If any work needed to be done in other areas we would do it now. |
We're going to rebase RHCOS 4.11, which picks up a new NM,
and the new case is actually the same.
BTW, minor rant here: We really need to stop defaulting to writing conditionals
that do `if is_fcos() {} else if is_rhcos() {}` because about 70%
of the time, this is actually trying to test "RHEL 8" versus "Fedora".
And in this case, what we want to dispatch on is the RHEL8 minor
version. Or even the NetworkManager version.
Anyways for now, because we haven't updated the `redhat-release-coreos`
package because doing so is painful, dispatch on the OCP version.
77cc1f9 to
5a211a7
Compare
|
Unrelated CI failure, I tested this locally with FCOS and rhcos. |
Specifically to pull in coreos/fedora-coreos-config#1511 ``` Colin Walters (1): tests/default-network-behavior-change: Adapt to RHCOS 4.11 CoreOS Bot (1): lockfiles: bump to latest Dusty Mabe (2): denylist: snooze ext.config.chrony.dhcp-propagation in rawhide denylist: apply snoozes to the branched stream as well Huijing Hei (1): denylist: enable coreos.boot-mirror.luks test ```
We're going to rebase RHCOS 4.11, which picks up a new NM,
and the new case is actually the same.
BTW, minor rant here: We really need to stop defaulting to writing conditionals
that do
if is_fcos() {} else if is_rhcos() {}because about 70%of the time, this is actually trying to test "RHEL 8" versus "Fedora".
And in this case, what we want to dispatch on is the RHEL8 minor
version. Or even the NetworkManager version.
Anyways for now, because we haven't updated the
redhat-release-coreospackage because doing so is painful, dispatch on the OCP version.