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

system: Add CPU security mitigations dialog #11875

Merged
merged 13 commits into from
May 22, 2019

Conversation

martinpitt
Copy link
Member

Cherry-picked from master commits 16c7c8e, 2e82a20, and de2dc4f.

https://bugzilla.redhat.com/show_bug.cgi?id=1678956
(FIXME: use bug clone for 8.0.1)

@martinpitt martinpitt added the backport apply a commit from master to a stable branch label May 20, 2019
This isn't supported by newer QEMU versions any more (as in Fedora 29).

`check-networking-bridge TestNetworking.testBridge` was the only user of
that. But as the second `add_iface()` call does not specify an existing
VirtNetwork, this creates a new network anyway, and thus it's already
an independent network.

Cherry-picked from master commit 2615655.
This will allow us to use newer API such as `g_strv_contains()`. The
oldest glib that we support is 2.56 (RHEL/CentOS 7), so this should be
fine to bump.

Drop g_type_init() calls, as they have been deprecated since glib 2.36.

Cherry-picked from master commit 4cad596, so that the following
cherry-pick works.
Most recent glib changes the hash table data structures, which changes
iteration order. Stop making any assumptions about it, and instead
compare items piecewise.

https://bugzilla.redhat.com/show_bug.cgi?id=1666289

Cherry-picked from master commit 4d20f07.
@martinpitt
Copy link
Member Author

Hmm, I did two backports to attempt to fix unit tests, but this will require a lot more to be able to build on Fedora 30. As we are not really interested in that for RHEL 8.0, I'm leaning towards ignoring the avocado/selenium tests here, and re-drop the glib bump and strv fix. I'll wait until the rhel-8-0 test finishes, though.

croissanne and others added 5 commits May 20, 2019 18:51
Fix /http-stream/tls/authority-bad to supply a client certificate.
Otherwise, glib-networking 2.59 (commit f72f792be8) would give an error
"Server required TLS certificate" instead of "Unacceptable TLS
certificate". The previous behaviour was arguably an error, as there was
no client-side certificate in the first place.

Cherry-picked from master commit 235715f.
`check-multi-machine TestMultiMachine.testTroubleshooting` and
`check-login TestLogin.testExpired` both test disabled/broken logins,
and thus can legitimately produce this message:

    polkit-agent-helper-1: pam_authenticate failed: Authentication failure

Ignore these for these two tests.

Backported from master commit dcf5f7f.
…sible role

Candlepin certificates are not located in /home/admin which is specified
with candlepin_checkout variable in the ansible-role-candlepin.

Cherry-picked from master commit dc0e9d2.
`TestAutoUpdates.testInstall` creates a fake dnf-automatic package that
ships dnf-automatic-install.timer without a corresponding .service. This
causes an unexpected journal message:

    Job for dnf-automatic-install.timer failed.

To avoid that, let the timer start `-.mount` instead, which is always
present (and running, thus harmless).

Cherry-picked from master commit 605b837.
@martinpitt
Copy link
Member Author

Some more backporteria, and I think I fixed the unit tests on Fedora 30 now.

In latest Fedora 29, dbus.service got renamed to dbus-daemon.service. To
keep the test running between RHEL/CentOS 7 and Fedora 29, move to
dbus.service instead.

Cherry-picked from master commit b6b5061.
@martinpitt
Copy link
Member Author

Yet another backport to fully fix selenium.

@marusak
Copy link
Member

marusak commented May 20, 2019

semaphore fail looks suspicious:

test/verify/check-system-info:45:1: E302 expected 2 blank lines, found 1
test/verify/check-system-info:537:1: E302 expected 2 blank lines, found 1
PASS: tools/test-static-code 1 pyflakes bots pkg tools
PASS: tools/test-static-code 2 pyflakes test
PASS: tools/test-static-code 3 js-translatable-strings
PASS: tools/test-static-code 4 unsafe-security-policy
PASS: tools/test-static-code 5 patternfly-font-paths
PASS: tools/test-static-code 6 json-verify
FAIL: tools/test-static-code 7 pep8 test
ERROR: tools/test-static-code process failed: 1

avocado and rhel-8-0 both failed, but for both I am getting 404, which is weird. Avocado is most likely related to ee31728674e .

@martinpitt
Copy link
Member Author

@marusak: You can get the logs by moving from /log.html to /log. The HTML is a literal file with "404 not found", which is indeed confusing. The html wrapper doesn't work for backbranches just as it doesn't work for external projects -- yet another little thing to fix.

I'll fix pyflakes/pep8 and avocado. I'll look at the testNegotiate failure, but I'll limit the time that I spend on it. testKdump is just a flake, it worked in a previous test run.

When avocado starts its own browser it never closes it.

Since avocado tests spawn this process and it does not get cleaned up, the main
process holds stdout/err "busy" and therefore the test hangs
indefinitely.

Possibly related https://bugzilla.mindrot.org/show_bug.cgi?id=2071

Closes cockpit-project#11829
martinpitt and others added 3 commits May 21, 2019 11:25
Seen in TestConnection.testBasic:

    error shutting down io stream: Unable to shutdown socket: Transport endpoint is not connected

Closes cockpit-project#11725
Backported from upstream master.
Copy link
Contributor

@larskarlitski larskarlitski left a comment

Choose a reason for hiding this comment

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

These make sense to me. Thanks!

@martinpitt martinpitt merged commit 40591e5 into cockpit-project:rhel-8.0 May 22, 2019
@martinpitt martinpitt deleted the smt80 branch May 22, 2019 17:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport apply a commit from master to a stable branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants