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

gitlab: 10.8.0 -> 11.3.0, gitlab-ee: init at 11.3.0 #45574

Merged
merged 12 commits into from Sep 25, 2018
Merged

gitlab: 10.8.0 -> 11.3.0, gitlab-ee: init at 11.3.0 #45574

merged 12 commits into from Sep 25, 2018

Conversation

krav
Copy link
Contributor

@krav krav commented Aug 24, 2018

gitlab-shell: 7.1.2 -> 8.1.1, nixos/gitlab: fixes

Motivation for this change

This adds support for GitLab enterprise edition.

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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

globin
globin previously requested changes Aug 24, 2018
View reviewed changes
Copy link
Member

@globin globin left a comment

Choose a reason for hiding this comment

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

Small question and per GITLAB_WORKHORSE_VERSION and GITALY_SERVER_VERSION in the gitlab repository, workhorse should be updated to 5.1.0 and gitaly to 0.117.2

Thank you otherwise! I was planning on doing an update the next few days but you saved me some time!

pkgs/applications/version-management/gitlab-shell/default.nix Outdated Show resolved Hide resolved
@krav krav force-pushed the gitlab-ee branch 2 times, most recently from e709944 to 0bcbe00 Compare August 27, 2018 12:49
@andir
Copy link
Member

andir commented Aug 29, 2018

Could you update this to the latest release? 11.2.3 was released today.

Should this also be backported?

@krav
Copy link
Contributor Author

krav commented Aug 31, 2018 •
edited

@andir Done. This should probably be backported as there is a security release 10.8.6 out and current in 18.03 is 10.8.0.

@afrepues
Copy link
Contributor

afrepues commented Sep 6, 2018

Can you split your commits to make them atomic? That would make them easier to review and rollback if necessary. This would mean having separate commits for:

  • the introduction of the enterprise version
  • the different updates in versions
  • changes to the gitlab module
  • other fixes/changes

@krav
Copy link
Contributor Author

krav commented Sep 21, 2018

@afrepues Done

@andir
Copy link
Member

andir commented Sep 23, 2018

@GrahamcOfBorg test gitlab

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: tests.gitlab

Partial log (click to expand)

Cannot nix-instantiate `tests.gitlab' because:
error: attribute 'gitlab' in selection path 'tests.gitlab' not found

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: tests.gitlab

Partial log (click to expand)

Cannot nix-instantiate `tests.gitlab' because:
error: attribute 'gitlab' in selection path 'tests.gitlab' not found

@globin globin self-assigned this Sep 25, 2018
globin and others added 3 commits September 25, 2018 03:13
@globin
gitlab: 11.2.3 -> 11.3.0
a29e52e
@globin
gitlab module: workhorse may start before gitlab
bf6909b
@WilliButz @globin
nixos/gitlab: rebuild authorized_keys during preStart
64113f1 
This updates the path to the 'gitlab-shell' to the
correct store path when gitlab is restarted.
@globin globin changed the title gitlab: 10.8.0 -> 11.2.1, gitlab-ee: init at 11.2.1 gitlab: 10.8.0 -> 11.3.0, gitlab-ee: init at 11.3.0 Sep 25, 2018
@globin
Copy link
Member

globin commented Sep 25, 2018

@GrahamcOfBorg build gitlab, gitlab-workhorse, gitlab-shell, gitaly

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: gitaly

The following builds were skipped because they don't evaluate on x86_64-darwin: gitlab,, gitlab-workhorse,, gitlab-shell,

Partial log (click to expand)

Successfully installed github-linguist-6.2.0
1 gem installed
post-installation fixup
patching script interpreter paths in /nix/store/a3wvlyhpyqp0602r6bnx9r9dasnkcmwg-ruby2.5.1-github-linguist-6.2.0
/nix/store/a3wvlyhpyqp0602r6bnx9r9dasnkcmwg-ruby2.5.1-github-linguist-6.2.0/lib/ruby/gems/2.5.0/gems/github-linguist-6.2.0/bin/linguist: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/7s5p6cwgz63pp1wgln9f7bg7sgy5jyrm-ruby-2.5.1/bin/ruby"
/nix/store/a3wvlyhpyqp0602r6bnx9r9dasnkcmwg-ruby2.5.1-github-linguist-6.2.0/lib/ruby/gems/2.5.0/gems/github-linguist-6.2.0/bin/git-linguist: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/7s5p6cwgz63pp1wgln9f7bg7sgy5jyrm-ruby-2.5.1/bin/ruby"
cannot build derivation '/nix/store/7zcgfzw5w42p2qcg07jfym2crnc6s51a-gitaly-env.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/k4cgxb1niwqrmc5921i5swrjydv4jvkz-wrapped-ruby-gitaly-env.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/v414x45zkxag8z77s8zgv2519iaaas6q-gitaly-0.120.0.drv': 1 dependencies couldn't be built
error: build of '/nix/store/v414x45zkxag8z77s8zgv2519iaaas6q-gitaly-0.120.0.drv' failed

@globin
Copy link
Member

globin commented Sep 25, 2018

@GrahamcOfBorg build gitlab gitlab-workhorse gitlab-shell gitaly

@GrahamcOfBorg
Copy link

Unexpected error: command failed with exit code 1 on x86_64-darwin (full log)

Attempted: gitlab-workhorse, gitlab-shell, gitaly

The following builds were skipped because they don't evaluate on x86_64-darwin: gitlab

Partial log (click to expand)

copying path '/nix/store/qvl1h4ji9rn6fzrj8gwxbckyqvbb3cx8-ruby2.5.1-tzinfo-1.2.2' from 'https://cache.nixos.org'...
copying path '/nix/store/4scpk844y6sjf5jpwsi50q25jhy3g0jv-signet-0.8.1.gem' from 'https://cache.nixos.org'...
copying path '/nix/store/3ma8rzx01fppv76nwr1abr92ir9w1lny-ruby2.5.1-activesupport-5.0.6' from 'https://cache.nixos.org'...
/nix/store/cz8xwi6lmz86lbhj7a1nzlhz2n8j6i9f-stdenv-darwin/setup: fork: retry: Resource temporarily unavailable
copying path '/nix/store/myqi11yf1mv6ygsvwqqc8j3l40r25dij-ruby2.5.1-rubocop-gitlab-security-0.1.0' from 'https://cache.nixos.org'...
copying path '/nix/store/dlfq8xjwsca0y59xlidn6q76jikb2ywc-ruby2.5.1-rubocop-rspec-1.17.0' from 'https://cache.nixos.org'...
building '/nix/store/hd1wnwhsf01n5f1ysszcbdqz82hnd1f8-escape_utils-1.2.1.gem.drv'...
/nix/store/cz8xwi6lmz86lbhj7a1nzlhz2n8j6i9f-stdenv-darwin/setup: fork: retry: Resource temporarily unavailable
error (ignored): unable to fork: Resource temporarily unavailable
error: unable to fork: Resource temporarily unavailable

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: gitaly

The following builds were skipped because they don't evaluate on x86_64-linux: gitlab,, gitlab-workhorse,, gitlab-shell,

Partial log (click to expand)

checking for references to /build in /nix/store/f7d0mqkyn5cldgzgqm8liqkr9wdqpvrc-gitaly-0.120.0-bin...
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
shrinking RPATHs of ELF executables and libraries in /nix/store/a2s28cjp4dwm0hnlvy9kqmyr6hwsac4s-gitaly-0.120.0-ruby
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/a2s28cjp4dwm0hnlvy9kqmyr6hwsac4s-gitaly-0.120.0-ruby/lib  /nix/store/a2s28cjp4dwm0hnlvy9kqmyr6hwsac4s-gitaly-0.120.0-ruby/bin
patching script interpreter paths in /nix/store/a2s28cjp4dwm0hnlvy9kqmyr6hwsac4s-gitaly-0.120.0-ruby
/nix/store/a2s28cjp4dwm0hnlvy9kqmyr6hwsac4s-gitaly-0.120.0-ruby/bin/gitaly-ruby: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/6nj00flqjl2qn7kbm1d97abv5q4jf0xj-wrapped-ruby-gitaly-env/bin/ruby"
/nix/store/a2s28cjp4dwm0hnlvy9kqmyr6hwsac4s-gitaly-0.120.0-ruby/bin/ruby-cd: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/6nj00flqjl2qn7kbm1d97abv5q4jf0xj-wrapped-ruby-gitaly-env/bin/ruby"
/nix/store/f7d0mqkyn5cldgzgqm8liqkr9wdqpvrc-gitaly-0.120.0-bin
checking for references to /build in /nix/store/a2s28cjp4dwm0hnlvy9kqmyr6hwsac4s-gitaly-0.120.0-ruby...

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: gitaly

The following builds were skipped because they don't evaluate on aarch64-linux: gitlab,, gitlab-workhorse,, gitlab-shell,

Partial log (click to expand)

patching script interpreter paths in /nix/store/kdpsml5g1grmz0fxx6gk6ccdk7khjy7a-gitaly-0.120.0-bin
checking for references to /build in /nix/store/kdpsml5g1grmz0fxx6gk6ccdk7khjy7a-gitaly-0.120.0-bin...
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
shrinking RPATHs of ELF executables and libraries in /nix/store/58rjvr2icnr3hhg66c9xsphimkmwg22d-gitaly-0.120.0-ruby
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/58rjvr2icnr3hhg66c9xsphimkmwg22d-gitaly-0.120.0-ruby/lib  /nix/store/58rjvr2icnr3hhg66c9xsphimkmwg22d-gitaly-0.120.0-ruby/bin
patching script interpreter paths in /nix/store/58rjvr2icnr3hhg66c9xsphimkmwg22d-gitaly-0.120.0-ruby
/nix/store/58rjvr2icnr3hhg66c9xsphimkmwg22d-gitaly-0.120.0-ruby/bin/ruby-cd: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/xpzhjhhiqnlqcw7fdyxrrw3jbv2madhg-wrapped-ruby-gitaly-env/bin/ruby"
/nix/store/58rjvr2icnr3hhg66c9xsphimkmwg22d-gitaly-0.120.0-ruby/bin/gitaly-ruby: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/xpzhjhhiqnlqcw7fdyxrrw3jbv2madhg-wrapped-ruby-gitaly-env/bin/ruby"
checking for references to /build in /nix/store/58rjvr2icnr3hhg66c9xsphimkmwg22d-gitaly-0.120.0-ruby...

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: gitlab, gitlab-workhorse, gitlab-shell, gitaly

Partial log (click to expand)

strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/a2s28cjp4dwm0hnlvy9kqmyr6hwsac4s-gitaly-0.120.0-ruby/lib  /nix/store/a2s28cjp4dwm0hnlvy9kqmyr6hwsac4s-gitaly-0.120.0-ruby/bin
patching script interpreter paths in /nix/store/a2s28cjp4dwm0hnlvy9kqmyr6hwsac4s-gitaly-0.120.0-ruby
/nix/store/a2s28cjp4dwm0hnlvy9kqmyr6hwsac4s-gitaly-0.120.0-ruby/bin/ruby-cd: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/6nj00flqjl2qn7kbm1d97abv5q4jf0xj-wrapped-ruby-gitaly-env/bin/ruby"
/nix/store/a2s28cjp4dwm0hnlvy9kqmyr6hwsac4s-gitaly-0.120.0-ruby/bin/gitaly-ruby: interpreter directive changed from "/usr/bin/env ruby" to "/nix/store/6nj00flqjl2qn7kbm1d97abv5q4jf0xj-wrapped-ruby-gitaly-env/bin/ruby"
checking for references to /build in /nix/store/a2s28cjp4dwm0hnlvy9kqmyr6hwsac4s-gitaly-0.120.0-ruby...
/nix/store/89pbkf4ryrqcmpf5w020z1zashbgb3va-gitlab-11.3.0
/nix/store/yqlj3mcxh0wwjl2s5lf9fpnlrgiiqsrh-gitlab-workhorse-6.1.0
/nix/store/dm3kxwrby0nb57nc0a9qdm0ylzb06v6q-gitlab-shell-8.3.3
/nix/store/f7d0mqkyn5cldgzgqm8liqkr9wdqpvrc-gitaly-0.120.0-bin

@globin globin merged commit 78ad8d4 into NixOS:master Sep 25, 2018
@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: gitlab, gitlab-workhorse, gitlab-shell, gitaly

Partial log (click to expand)

patching file lib/system_check/app/uploads_path_tmp_permission_check.rb
updateAutotoolsGnuConfigScriptsPhase
configuring
no configure script, doing nothing
building
tar: Skipping to next header
tar: Skipping to next header
tar: Exiting with failure status due to previous errors
builder for '/nix/store/2768lgmqps0yzbvz0s29mlpghwps9pmw-gitlab-11.3.0.drv' failed with exit code 2
error: build of '/nix/store/2768lgmqps0yzbvz0s29mlpghwps9pmw-gitlab-11.3.0.drv' failed

krav pushed a commit to krav/nixpkgs that referenced this pull request Oct 8, 2018
gitlab-ee: Add ee rubyEnv, fixes regression introduced by 11.3.0 in N…
0083ca1 
…ixOS#45574
globin pushed a commit that referenced this pull request Oct 10, 2018
@globin
gitlab-ee: Add ee rubyEnv, fixes regression introduced by 11.3.0 in #…
71f1957 
…45574

(cherry picked from commit 0083ca1)
globin pushed a commit to mayflower/nixpkgs that referenced this pull request Oct 10, 2018
@globin
gitlab-ee: Add ee rubyEnv, fixes regression introduced by 11.3.0 in N…
3a4d70f 
…ixOS#45574

(cherry picked from commit 0083ca1)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@globin globin globin left review comments

Assignees

@globin globin

Labels
6.topic: nixos 8.has: module (update) 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@krav @andir @afrepues @GrahamcOfBorg @globin @WilliButz