Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
slapos slapos
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Labels
    • Labels
  • Merge requests 122
    • Merge requests 122
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Environments
  • Analytics
    • Analytics
    • CI/CD
    • Repository
    • Value Stream
  • Snippets
    • Snippets
  • Members
    • Members
  • Activity
  • Graph
  • Jobs
  • Commits
Collapse sidebar
  • nexedi
  • slaposslapos
  • Merge requests
  • !92

You need to sign in or sign up before continuing.
Merged
Created Aug 02, 2016 by Kirill Smelkov@kirrOwner

gitlab: Upgrade to 8.6

  • Overview 3
  • Commits 11
  • Changes 16
  • GitLab Software + patches ported to GitLab 8.6.X;
  • Configs synced with upstream;
  • Base software upgraded where appropriate;
  • misc adjustments.

Demo instance: https://softinst64196.host.vifib.net/

@jerome @kazuhiko @iv Please have a look. I've verified it works but there is always a chance one can miss some detail. If all ok I'd like to deploy this tomorrow (3 Aug) evening to lab.nexedi.com

P.S. as our updated patches to gitlab-* have not been integrated to nexedi/ yet ( they are there queud to review in

gitlab-ce!1 (merged)
gitlab-workhorse!1 (merged)
gitlab-shell!1 (merged) )

to build updated gitlab the following patch has to be applied by hand:

diff --git a/software/gitlab/software.cfg b/software/gitlab/software.cfg
index df395c1..003f98c 100644
--- a/software/gitlab/software.cfg
+++ b/software/gitlab/software.cfg
@@ -112,7 +112,8 @@ git-executable = ${git:location}/bin/git
 [gitlab-repository]
 <= git-repository
 #repository = https://gitlab.com/gitlab-org/gitlab-ce.git
-repository = https://lab.nexedi.com/nexedi/gitlab-ce.git
+#repository = https://lab.nexedi.com/nexedi/gitlab-ce.git
+repository = https://lab.nexedi.com/kirr/gitlab-ce.git
 # 8.6.X + NXD patches:
 revision = v8.6.9-9-g1aafce0d0634afa9b3cfaf1e3a5b090c8c980076
 location = ${buildout:parts-directory}/gitlab
@@ -120,7 +121,8 @@ location = ${buildout:parts-directory}/gitlab
 [gitlab-shell-repository]
 <= git-repository
 #repository = https://gitlab.com/gitlab-org/gitlab-shell.git
-repository = https://lab.nexedi.com/nexedi/gitlab-shell.git
+#repository = https://lab.nexedi.com/nexedi/gitlab-shell.git
+repository = https://lab.nexedi.com/kirr/gitlab-shell.git
 # gitlab 8.6 wants gitlab-shell 2.6.12
 # 2.6.12 + NXD patches
 revision = v2.6.12-1-g03df9d7f9cfaa9e058f4c7053a497069b9b52657
@@ -129,7 +131,8 @@ location = ${buildout:parts-directory}/gitlab-shell
 [gitlab-workhorse-repository]
 <= git-repository
 #repository = https://gitlab.com/gitlab-org/gitlab-workhorse.git
-repository = https://lab.nexedi.com/nexedi/gitlab-workhorse.git
+#repository = https://lab.nexedi.com/nexedi/gitlab-workhorse.git
+repository = https://lab.nexedi.com/kirr/gitlab-workhorse.git
 # 0.7.1 + NXD patches
 revision = v0.7.1-5-gd23a3247829fc3200e3dc784dcd57b5a0febac48
 location = ${buildout:parts-directory}/gitlab-workhorse

Once patches to gitlab-* are pushed to nexedi/ there will be no need for this tweak.

Thanks beforehand for feedback,
Kirill

Assignee
Assign to
Reviewer
Request review from
None
Milestone
None
Assign milestone
Time tracking
Source branch: y/gitlab8.6
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7