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

nixos/release-combined.nix: make test set consistent with release-small.nix #40131

Merged
merged 1 commit into from May 10, 2018

Conversation

xeji
Copy link
Contributor

@xeji xeji commented May 7, 2018

Motivation for this change

Tests for the "small" NixOS channel should be a subset of tests for the full "release" channel so these channels advance consistently. Currently, the small channel can be blocked while the full channel advances, which does not make much sense.

Fix this by adding some tests to release-combined.nix that previously were only in release-small.nix.

(Eventually the common "small" subset of tests should be factored out to force consistency but I'll save that for another time.)

cc @srhb @vcunat


... with release-small.nix
Tests for small channel should be a subset of tests for full channel.
@matthewbauer
Copy link
Member

👍 looks good!

One thing I’m intereated in is if we can just concat the small releases jobs in combined? That would automate this process for us.

@xeji
Copy link
Contributor Author

xeji commented May 7, 2018

One thing I’m intereated in is if we can just concat the small releases jobs in combined? That would automate this process for us.

Should be possible with a little refactoring. release-combined.nix maps tests over supportedSystems like this: (all nixos.tests.firewall), release-small.nix doesn't. I think the easiest solution is to import a common list of tests from a separate file.

@srhb
Copy link
Contributor

srhb commented May 8, 2018

Importing a common list for a separate file sounds sane. :)

Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

I've seen this really happen, some time ago, with some of the container tests.

Let's take something like this now, and then we can think of how to best refactor the test-sets.

@vcunat vcunat added the 9.needs: port to stable A PR needs a backport to the stable release. label May 8, 2018
@xeji xeji merged commit f8d047d into NixOS:master May 10, 2018
@xeji xeji deleted the add-missing-tests branch May 10, 2018 17:37
xeji added a commit that referenced this pull request May 10, 2018
... with release-small.nix
Tests for small channel should be a subset of tests for full channel.

(cherry picked from commit f8d047d)
@xeji
Copy link
Contributor Author

xeji commented May 10, 2018

backported to 18.03 in e5be49a

@samueldr samueldr removed the 9.needs: port to stable A PR needs a backport to the stable release. label Apr 17, 2019
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.

None yet

6 participants