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

updated expected kernel version test value to 4.14.186 #582

Merged
merged 1 commit into from
Jul 7, 2020

Conversation

zenmonkeykstop
Copy link
Contributor

Status

Ready for review

Description of Changes

Towards #546 .

Updates buster kernel version in tests from 4.14.169 to 4.14.186

Testing

  • Install workstation using this branch
  • make test tests fail due to version mismatch
  • Update kernel to 4.14.186 in securedrop-workstation-buster using packages from added 4.14.182 workstation kernel packages securedrop-apt-test#42
  • run make clean and make all to rebuild workstation
  • make test tests that check kernel version now pass

Checklist

If you have made code changes

  • Linter (make flake8) passes in the development environment (this box may
    be left unchecked, as flake8 also runs in CI)

If you have made changes to the provisioning logic

  • All tests (make test) pass in dom0 of a Qubes install

  • This PR adds/removes files, and includes required updates to the packaging
    logic in MANIFEST.in and rpm-build/SPECS/securedrop-workstation-dom0-config.spec

@emkll
Copy link
Contributor

emkll commented Jul 6, 2020

Packages are now live on apt-test, so this should be good for final review

@eloquence
Copy link
Member

eloquence commented Jul 6, 2020

I updated my staging environment just after the kernel packages landed, and make test is currently failing for me as a result due to expected kernel version mismatch. Will quickly make clone this branch to see if that resolves.

@eloquence
Copy link
Member

Yep, this PR resolves the kernel version check failures for me. I get other test failures, mainly it seems because make test is not clever(?) enough to look in /usr/share/securedrop-workstation-dom0-config for config that was provisioned via securedrop-admin.

@eloquence
Copy link
Member

eloquence commented Jul 6, 2020

And, after copying config.json and sd-journalist.sec into place where it's looking for them, I only get two unrelated test failures, test_log_dirs_properly_named and test_do_not_open_here. The first of these appears to be due to the existence of a host dir in sd-log; the second is due to black formatter changes in master relative to my staging env.

@conorsch
Copy link
Contributor

conorsch commented Jul 6, 2020

The first of these appears to be due to the existence of a host dir in sd-log

Sounds like we have a flaky test, see similar report in #563 (comment) .

@@ -5,7 +5,7 @@
from base import WANTED_VMS


EXPECTED_KERNEL_VERSION = "4.14.169-grsec-workstation"
EXPECTED_KERNEL_VERSION = "4.14.186-grsec-workstation"
Copy link
Contributor

Choose a reason for hiding this comment

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

lgtm

  • Install workstation using this branch
  • make test tests fail due to version mismatch

I saw assert kernel_version == EXPECTED_KERNEL_VERSION fail

- [ ] Update kernel to 4.14.186 in securedrop-workstation-buster using packages from freedomofpress/securedrop-apt-test#42

This step was done for me since by the time I got to this step the lfs pr was merged with the new kernel package

  • make test tests that check kernel version now pass

I saw assert kernel_version == EXPECTED_KERNEL_VERSION no longer fail

@conorsch conorsch self-requested a review July 7, 2020 01:08
Copy link
Contributor

@conorsch conorsch left a comment

Choose a reason for hiding this comment

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

Test plan checks out. I did encounter one failing test, as described in #583, unrelated to the changes here.

@conorsch conorsch merged commit 88b9a5c into master Jul 7, 2020
@legoktm legoktm deleted the workstation-kernel-20200630 branch May 28, 2024 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants