Skip to content

[19.03] gitlab updates#66622

Merged
flokli merged 22 commits intoNixOS:release-19.03from
flokli:19.03-gitlab-12.1.6
Aug 21, 2019
Merged

[19.03] gitlab updates#66622
flokli merged 22 commits intoNixOS:release-19.03from
flokli:19.03-gitlab-12.1.6

Conversation

@flokli
Copy link
Member

@flokli flokli commented Aug 14, 2019 •
edited
Loading

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

@flokli flokli requested review from fpletz and globin August 14, 2019 13:22
@flokli flokli requested a review from infinisil as a code owner August 14, 2019 13:22
@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Aug 14, 2019
@flokli flokli force-pushed the 19.03-gitlab-12.1.6 branch from 7a1ffad to 85ae5b7 Compare August 14, 2019 13:41
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Aug 14, 2019
@flokli flokli added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Aug 14, 2019
@adisbladis
Copy link
Member

adisbladis commented Aug 17, 2019

@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
Member 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
Member Author

flokli commented Aug 20, 2019 via email

@flokli flokli force-pushed the 19.03-gitlab-12.1.6 branch from 5d0dcb3 to 3cdea22 Compare August 20, 2019 23:21
globin and others added 14 commits August 21, 2019 01:27
@globin @flokli
gitlab module: clean up permission handling
9c9caf3 
This is WIP to get rid of PermissionsStartOnly=true

(cherry picked from commit 783c2f6)
@globin @flokli
gitlab module: fix permissions
286f8c1 
(cherry picked from commit 52fd300)
@bgamari @flokli
nixos/gitlab: Allow configuration of extra initializers
29a37fe 
This adds a configuration option allowing the addition of additional
initializers in config/extra-gitlab.rb.

(cherry picked from commit f2bdc91)
@max-wittig @flokli
gitlab-runner: 12.0.2 -> 12.1.0
01b30bb 
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)
@srhb @flokli
gitlab-runner: Fix prebuilt hash
0e1068e 
(cherry picked from commit 8761bc0)
@bgamari @flokli
gitlab: 11.10.8 -> 12.0.3
6cdadbe 
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)
@bgamari @flokli
gitaly: Fix IFD import
352219c 
(cherry picked from commit 9f77b4a)
@globin @flokli
gitlab: add gitaly go mod handling for the updater
f452306 
(cherry picked from commit 722ee77)
@globin @flokli
gitlab: add all necessary gem groups
8b0f6c1 
(cherry picked from commit 5589612)
@jslight90 @flokli
nixos/gitlab: fix config initializer permissions
a51e8ba 
(cherry picked from commit 7efcbea)
@jslight90 @flokli
nixos/gitlab: properly clear out initializers
4994e8a 
(cherry picked from commit 2ee14c3)
@flokli
gitlab-ce: 12.0.3 -> 12.1.6
ef19c0d 
(cherry picked from commit 8ce1c4c)
@flokli
gitlab-ee: 12.0.3 -> 12.1.6
06ff4e1 
(cherry picked from commit 362076c)
@flokli
gitlab: remove gitlab-deb-data.tar after extracting from it
83e2ab1 
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
@globin @flokli
gitaly: add go mod deps
a4252fe 
(cherry picked from commit 6c98b0f)
@flokli
gitaly: fix hashes
8c16fa4 
It seems the sha256 hashes of 3 gitaly dependencies were wrong or
changed.

(cherry picked from commit 89aae90)
@flokli
gitaly: 1.47.0 -> 1.53.2
8d2774a 
(cherry picked from commit 48da993)
@flokli
gitaly: use libgit2_0_27 explicitly
aa3a437 
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.
@globin @flokli
gitlab-shell: fix fallback bin searching
d273327 
(cherry picked from commit a33ddd7)
@Ekleog @flokli
gitlab: add link to nixos test in passthru.tests
3434042 
(cherry picked from commit 42170cb)
@bgamari @flokli
nixos/gitlab: Delete stale hooks directories with -R
126d992 
These can be directories.

(cherry picked from commit d7d873b)
@globin @flokli
gitlab-shell: better gitlab_shell_secret location
175269c 
So this won't be cleaned up by removing config/*

(cherry picked from commit 3469c20)
@flokli flokli force-pushed the 19.03-gitlab-12.1.6 branch from 3cdea22 to 175269c Compare August 20, 2019 23:32
@flokli
Copy link
Member 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
Member Author

flokli commented Aug 20, 2019

@GrahamcOfBorg test gitlab

@flokli
Copy link
Member 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
Member 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

Reviewers

@fpletz fpletz Awaiting requested review from fpletz

@globin globin Awaiting requested review from globin

@infinisil infinisil Awaiting requested review from infinisil infinisil is a code owner

Assignees

No one assigned

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@flokli @adisbladis @globin @ciil @bgamari @max-wittig @srhb @jslight90 @Ekleog