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

Conversation

@flokli
Copy link
Contributor

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

This comment has been minimized.

Copy link
Member

commented Aug 17, 2019

@GrahamcOfBorg test gitlab

@flokli flokli force-pushed the flokli:19.03-gitlab-12.1.6 branch 2 times, most recently from b4278f1 to b4103da Aug 17, 2019

@flokli

This comment has been minimized.

Copy link
Contributor Author

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

This comment has been minimized.

Copy link
Member

commented Aug 20, 2019

gitlab🐚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

This comment has been minimized.

Copy link
Contributor Author

commented Aug 20, 2019

@flokli flokli force-pushed the flokli:19.03-gitlab-12.1.6 branch from 5d0dcb3 to 3cdea22 Aug 20, 2019

globin and others added some commits Jul 15, 2019

gitlab module: clean up permission handling
This is WIP to get rid of PermissionsStartOnly=true

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

(cherry picked from commit f2bdc91)
gitlab: 11.10.8 -> 12.0.3
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 #63056).

(cherry picked from commit 363b352)
gitlab-runner: 12.0.2 -> 12.1.0
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)
gitlab-runner: Fix prebuilt hash
(cherry picked from commit 8761bc0)
gitaly: add `go mod` deps
(cherry picked from commit 6c98b0f)
gitaly: Fix IFD import
(cherry picked from commit 9f77b4a)
gitlab-shell: better gitlab_shell_secret location
So this won't be cleaned up by removing config/*

(cherry picked from commit 3469c20)
gitaly: fix hashes
It seems the sha256 hashes of 3 gitaly dependencies were wrong or
changed.

(cherry picked from commit 89aae90)

bgamari and others added some commits Jul 30, 2019

nixos/gitlab: Delete stale hooks directories with -R
These can be directories.

(cherry picked from commit d7d873b)
gitlab: remove gitlab-deb-data.tar after extracting from it
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)
gitlab-ce: 12.0.3 -> 12.1.6
(cherry picked from commit 8ce1c4c)
gitlab-ee: 12.0.3 -> 12.1.6
(cherry picked from commit 362076c)
gitaly: 1.47.0 -> 1.53.2
(cherry picked from commit 48da993)
gitaly: use libgit2_0_27 explicitly
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.

@flokli flokli force-pushed the flokli:19.03-gitlab-12.1.6 branch from 3cdea22 to 175269c Aug 20, 2019

@flokli

This comment has been minimized.

Copy link
Contributor Author

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

This comment has been minimized.

Copy link
Contributor Author

commented Aug 20, 2019

@GrahamcOfBorg test gitlab

@flokli

This comment has been minimized.

Copy link
Contributor Author

commented Aug 21, 2019

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

@ciil

This comment has been minimized.

Copy link
Contributor

commented Aug 21, 2019

@flokli just tested with our instance, lgtm!

@flokli flokli merged commit b8572d3 into NixOS:release-19.03 Aug 21, 2019

16 of 18 checks passed

gitaly, gitlab, gitlab-ee, gitlab-runner, gitlab-shell on x86_64-darwin Failure
Details
tests.gitlab on x86_64-linux Failure
Details
Evaluation Performance Report Evaluator Performance Report
Details
gitaly, gitlab, gitlab-ee, gitlab-runner, gitlab-shell on aarch64-linux Success
Details
gitaly, gitlab, gitlab-ee, gitlab-runner, gitlab-shell on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
tests.gitlab on aarch64-linux Success
Details

@flokli flokli deleted the flokli:19.03-gitlab-12.1.6 branch Aug 21, 2019

@flokli

This comment has been minimized.

Copy link
Contributor Author

commented Aug 21, 2019

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.