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

hydra-unstable: 2020-09-02 -> 2020-10-20 #98973

Merged
merged 2 commits into from Oct 22, 2020
Merged

hydra-unstable: 2020-09-02 -> 2020-10-20 #98973

merged 2 commits into from Oct 22, 2020

Conversation

@Ma27
Copy link
Member

@Ma27 Ma27 commented Sep 27, 2020

Motivation for this change
  • Updates nixUnstable and hydra-unstable to their latest revisions:

    hydra-unstable would require at least NixOS/hydra#815 to fix declarative jobsets. Also applying NixOS/hydra#818 to get it working with the very latest nixUnstable (instead of just the one in hydra's flake.lock)

  • Removed the upgrade path from older Hydra versions due to a schema change:

    Originally implemented in #83600 this was used to guide users of Hydra through the DB migration that was necessary after some changes back in February.

    (Note: this should NOT be backported to 20.09!)

Note: I didn't add support for LDAP authentication for Hydra yet, if someone wants to help out, that would be great :)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@Ma27
Copy link
Member Author

@Ma27 Ma27 commented Oct 2, 2020

@worldofpeace @jonringer FYI while this PR itself doesn't have to land in 20.09, I'd like to point out that at least NixOS/hydra#815 should be applied on top of current hydra-unstable to fix declarative jobsets.

@jonringer
Copy link
Contributor

@jonringer jonringer commented Oct 2, 2020

@GrahamcOfBorg test hydra

@Ma27
Copy link
Member Author

@Ma27 Ma27 commented Oct 2, 2020

Oh and btw before merging this, one should take a look at NixOS/hydra#818 which is applied on top :D

@Ma27
Copy link
Member Author

@Ma27 Ma27 commented Oct 20, 2020

Now that NixOS/hydra#815 is merged, this should be good to go :)

@Ma27 Ma27 changed the title hydra-unstable: 2020-09-02 -> 2020-09-15, nixUnstable: 3.0pre20200829_f156513 -> 3.0pre20200923_8d9402f hydra-unstable: 2020-09-02 -> 2020-10-20, nixUnstable: 3.0pre20200829_f156513 -> 3.0pre20201020_e0ca98c Oct 21, 2020
Ma27 added 2 commits Oct 21, 2020
This should NOT be backported to 20.09!

When 21.03 is released, the DB changes are about a year old and
operators had two release cycles for the upgrade. At this point it
should be fair to remove the compat layer to reduce the complexity of
the module itself.
@Ma27 Ma27 changed the title hydra-unstable: 2020-09-02 -> 2020-10-20, nixUnstable: 3.0pre20200829_f156513 -> 3.0pre20201020_e0ca98c hydra-unstable: 2020-09-02 -> 2020-10-20 Oct 21, 2020
@Ma27
Copy link
Member Author

@Ma27 Ma27 commented Oct 22, 2020

@jonringer I think this should be good to go now :)

@edolstra edolstra merged commit 05bdfd6 into NixOS:master Oct 22, 2020
19 of 20 checks passed
@Ma27 Ma27 deleted the bump-hydra branch Oct 22, 2020
@Ma27
Copy link
Member Author

@Ma27 Ma27 commented Oct 22, 2020

@edolstra I'd be in favor of porting this to 20.09 as this contains a fix for declarative jobsets. To achieve this, I'd have to backport your last nixUnstable bump as well. Are you fine with that?

@edolstra
Copy link
Member

@edolstra edolstra commented Oct 22, 2020

@Ma27 Yes, I've just cherry-picked the nixUnstable bump.

@Ma27
Copy link
Member Author

@Ma27 Ma27 commented Oct 22, 2020

Ahh great, thanks! :)

@Ma27
Copy link
Member Author

@Ma27 Ma27 commented Oct 22, 2020

Ported to 20.09 as 3095f9c.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants