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.

Sign up for GitHub

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

Jump to bottom

Fix gitlab #30939

Merged
merged 3 commits into from Oct 30, 2017
Merged

Fix gitlab #30939

merged 3 commits into from Oct 30, 2017

Conversation

brainrake
Copy link
Contributor

@brainrake brainrake commented Oct 29, 2017 •
edited

Motivation for this change

There were several mistakes in the setup script, including hardcoded values and secret generation that didn't work.
I'm trying to get the gitlab nixos test running again but RoR is very slow in qemu. So I'm submitting these in the mean time.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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](https://github.com/NixOS/nixpkgs/blob/master/nixos/
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

bjornfor
bjornfor requested changes Oct 29, 2017
View reviewed changes
Copy link
Contributor

@bjornfor bjornfor left a comment

Choose a reason for hiding this comment

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

The content looks good, but I'd like to see an explanation (in the commit message) which problem the last commit fixes.

@manveru
Copy link
Contributor

manveru commented Oct 29, 2017

Can you maybe try running the nix-build nixos/tests/gitlab.nix?

@brainrake
nixos/gitlab: fix secret generation
f97b2c4 
This line previously produced an error and an empty secret file.
@brainrake
Copy link
Contributor Author

@bjornfor updated, thanks

@brainrake
Copy link
Contributor Author

Yeah as I said I updated the gitlab test (needs a lot of updating), but the gitlab service doesn't start in 30 min in qemu... bundle runs for a long time. I'll check back if I get it up.

@bjornfor
Copy link
Contributor

Do the VM tests pass --enable-kvm to QEMU? (Speed up.)

fpletz
fpletz approved these changes Oct 30, 2017
View reviewed changes
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

The fixes are correct and valid. Thanks!

@globin
Copy link
Member

globin commented Oct 30, 2017

I have tried making the test work again a few times, but currently gitlab is doing too much I/O for 9pfs to cope, I'd be really happy if someone fixes that but I can't see us blocking a merge on that..

@globin globin merged commit c556c72 into NixOS:master Oct 30, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjornfor bjornfor bjornfor requested changes

@fpletz fpletz fpletz approved these changes

Assignees
No one assigned
Labels
6.topic: nixos
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@brainrake @manveru @bjornfor @globin @fpletz @FRidh