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

[19.03] gitlab updates #66622

Merged
merged 22 commits into from Aug 21, 2019
Merged

[19.03] gitlab updates #66622

merged 22 commits into from Aug 21, 2019

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Aug 14, 2019

Motivation for this change

#66621

had to cherry-pick some changes from unstable as well.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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 nix-review --run "nix-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.
Notify maintainers

cc @lheckemann @talyz @bgamari

@adisbladis
Copy link
Member

@GrahamcOfBorg test gitlab

@flokli flokli force-pushed the 19.03-gitlab-12.1.6 branch 2 times, most recently from b4278f1 to b4103da Compare August 17, 2019 14:20
@flokli
Copy link
Contributor Author

flokli commented Aug 17, 2019

For some reason, gitlab-rake gitlab:shell:create_hooks is failing like this:

gitlab# [  359.493137] 0qa9yb6sfx690qahdhljghmryvm2yjwf-unit-script-gitlab-pre-start[1105]: rake aborted!
gitlab# [  359.494934] 0qa9yb6sfx690qahdhljghmryvm2yjwf-unit-script-gitlab-pre-start[1105]: Don't know how to build task 'gitlab:shell:create_hooks' (See the list of available tasks with `rake --tasks`)
gitlab# [  359.501036] 0qa9yb6sfx690qahdhljghmryvm2yjwf-unit-script-gitlab-pre-start[1105]: /nix/store/gb4ggiirx02310n9z421jwgwk2qg366n-gitlab-env-12.1.6/lib/ruby/gems/2.5.0/gems/rake-12.3.2/exe/rake:27:in `<top (required)>'
gitlab# [  359.503296] 0qa9yb6sfx690qahdhljghmryvm2yjwf-unit-script-gitlab-pre-start[1105]: (See full trace by running task with --trace)

Interestingly, this works just fine on unstable (with pretty much the same codebase in pkgs/applications/version-management/gitlab), so I don't really understand what's going on.

@globin
Copy link
Member

globin commented Aug 20, 2019

gitlab:shell:create_hooks has been removed upstream, I'm pretty sure i removed this on master, will try to get to test this on our instance tomorrow. But don't necessarily block merging on this, looks fine generally.

@flokli
Copy link
Contributor Author

flokli commented Aug 20, 2019 via email

globin and others added 14 commits August 21, 2019 01:27
This is WIP to get rid of PermissionsStartOnly=true

(cherry picked from commit 783c2f6)
(cherry picked from commit 52fd300)
This adds a configuration option allowing the addition of additional
initializers in config/extra-gitlab.rb.

(cherry picked from commit f2bdc91)
Corresponding runner for GitLab version 12.1.0

Changelog: https://gitlab.com/gitlab-org/gitlab-runner/blob/12-1-stable/CHANGELOG.md
(cherry picked from commit bc6366b)
(cherry picked from commit 8761bc0)
This is a major version bump but things were generally straightforward
save two wrinkles:

 * it is necessary to ignore collisions in the gitlab bundler
   environment as both `omniauth_oauth2_generic` and
   `apollo_upload_server` provide a `console` executable.

 * grpc had to be patched since its build system expects the `AR`
   environment variable to contain not just the path to `ar` but
   also the `rpc` flags (see the discussion in nixpkgs NixOS#63056).

(cherry picked from commit 363b352)
(cherry picked from commit 9f77b4a)
(cherry picked from commit 8ce1c4c)
(cherry picked from commit 362076c)
There's no reason to ship a 1.6GiB .tar file in the output.
Slims down that output from 1.9GiB to ~350MiB

(cherry picked from commit 765491c)
globin and others added 8 commits August 21, 2019 01:31
(cherry picked from commit 6c98b0f)
It seems the sha256 hashes of 3 gitaly dependencies were wrong or
changed.

(cherry picked from commit 89aae90)
(cherry picked from commit 48da993)
gitaly's git2go build with libgit2 0.26.6 due to missing
C.GIT_DIFF_INDENT_HEURISTIC.

nixpkgs unstable already defaults to 0.27, so it's not a problem there.
These can be directories.

(cherry picked from commit d7d873b)
So this won't be cleaned up by removing config/*

(cherry picked from commit 3469c20)
@flokli
Copy link
Contributor Author

flokli commented Aug 20, 2019

I gave this a close look - the removal of the create_hooks command happened inside 783c2f6.

I managed to spot some other missed commits, the nixos module on master and in this PR are now in sync (except 3f4a353 not applied).

@flokli
Copy link
Contributor Author

flokli commented Aug 20, 2019

@GrahamcOfBorg test gitlab

@flokli
Copy link
Contributor Author

flokli commented Aug 21, 2019

@globin did you get a chance to give this a test run on your instance?

@ciil
Copy link
Member

ciil commented Aug 21, 2019

@flokli just tested with our instance, lgtm!

@flokli flokli merged commit b8572d3 into NixOS:release-19.03 Aug 21, 2019
@flokli flokli deleted the 19.03-gitlab-12.1.6 branch August 21, 2019 16:11
@flokli
Copy link
Contributor Author

flokli commented Aug 21, 2019

Thanks!

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

9 participants