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

gitlab: 10.0.2 -> 10.1.1 #31208

Merged
merged 5 commits into from Nov 7, 2017
Merged

gitlab: 10.0.2 -> 10.1.1 #31208

merged 5 commits into from Nov 7, 2017

Conversation

afrepues
Copy link
Contributor

@afrepues afrepues commented Nov 3, 2017

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)
  • 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.

Cc @fpletz @globin

Obsoletes #31206

@afrepues afrepues mentioned this pull request Nov 3, 2017
8 tasks
@NeQuissimus
Copy link
Member

@afrepues Could you do me a favor and fix the gitlab test, then we should be able to merge this rather quickly. It is broken right now.

@globin
Copy link
Member

globin commented Nov 3, 2017

The gitlab test isn't easily fixable due to too much I/O for kvm to handle, I'd be happy if someone manages, but don't expect this to be easy

@NeQuissimus
Copy link
Member

Maybe we should get rid of it instead then?

@globin
Copy link
Member

globin commented Nov 3, 2017

It generally probably would work if it didn't timeout so I'm reluctant of removing it..

@afrepues
Copy link
Contributor Author

afrepues commented Nov 3, 2017

@NeQuissimus how do I test it?

@NeQuissimus
Copy link
Member

@afrepues

λ nix-build ./nixos/tests/gitlab.nix
error: The option `services.gitlab.secrets.secret' is used but not defined.
(use ‘--show-trace’ to show detailed location information)

@globin It does not run at all for me, it is missing config.

@globin
Copy link
Member

globin commented Nov 3, 2017

Ah I had fixed that locally but not pushed it since it timed out always..

@srhb
Copy link
Contributor

srhb commented Nov 6, 2017

I also have a local branch of the test (which also includes an nginx proxy in front of http://unix:/run/gitlab/gitlab-workhorse.socket which is necessary with the current module) but it times out even after 20 minutes in preStart) so I don't think it's very critical to fix it here. I can PR what I have soon, if we want a timing-out-test rather than a broken one.

I'm currently refactoring secret handling to allow a safe, filed-based solution,

@globin
Copy link
Member

globin commented Nov 6, 2017

You also need to update Gemfile and Gemfile.lock and rerun bundix, also probably needs to update gitlab-shell, gitlab-workhorse and gitaly to the versions in the XXX_VERSION files in the sources.

@srhb
Copy link
Contributor

srhb commented Nov 6, 2017

#31317 tries to improve the test situation slightly. As explained in this thread, it still dies due to timeouts.

@afrepues
Copy link
Contributor Author

afrepues commented Nov 6, 2017

@NeQuissimus Just reading through this... the test failure seems unrelated to this change.

@globin I will take a look at the changes in Gemfile*, and the versioning of the related programs.

@srhb
Copy link
Contributor

srhb commented Nov 6, 2017

@afrepues Just to clarify: Yes, the test failure is entirely unrelated to this change. :)

@afrepues
Copy link
Contributor Author

afrepues commented Nov 6, 2017

@srhb thanks!

@NeQuissimus @globin I have pushed a new set of commits that include the updates to the Gemfile* and the result of running bundix, updated versions of the related packages, and rebased to the master branch.

@NeQuissimus
Copy link
Member

LGTM, it's too bad the test times out. I am going to assume you have tried actually running Gitlab?! :D

@afrepues
Copy link
Contributor Author

afrepues commented Nov 7, 2017

@NeQuissimus I am running Gitlab, though at 10.0.4 ATM.

@NeQuissimus NeQuissimus merged commit 4db6d35 into NixOS:master Nov 7, 2017
@afrepues afrepues deleted the gitlab-10.1.1 branch November 7, 2017 14:35
@fpletz
Copy link
Member

fpletz commented Nov 9, 2017

@NeQuissimus Why did you merge this PR even though @afrepues admitted he didn't test it? Why didn't you at least test it before merging? Please wait for someone else to test it.

@NeQuissimus
Copy link
Member

hmmm? as per discussion, the test times out. "the test failure is entirely unrelated to this change"

I reviewed the PR with nox (hence building it), I ran the test until it times out.
I was not too worried about this causing issues...

@afrepues
Copy link
Contributor Author

afrepues commented Nov 9, 2017

@fpletz @NeQuissimus for what it's worth, the changes weren't made by just downloading the archives and pasting the hashes, I actually read the released notes and besides the updates to the newer versions, no changes were needed to the Gitlab service.

@fpletz
Copy link
Member

fpletz commented Nov 14, 2017

Please do not do this again in the future without actually testing a fresh install and an upgrade of an existing instance. On my many gitlab bumps in the past, I've experienced a fair share of problems.

Gitlab frequently breaks compatibility for instance in regard to system configuration. They can fix this themselves with their omnibus packaging and the docker images but won't mention every change in the release notes. You should also read the upgrade notes but they aren't complete either. 😿

@fpletz
Copy link
Member

fpletz commented Nov 14, 2017

But of course: Thanks for the bump, very much appreciated. 👍

@afrepues afrepues restored the gitlab-10.1.1 branch November 22, 2017 23:59
@afrepues afrepues deleted the gitlab-10.1.1 branch November 9, 2019 16:17
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