Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
slapos
slapos
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Merge Requests 73
    • Merge Requests 73
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Jobs
  • Commits
  • nexedi
  • slaposslapos
  • Merge Requests
  • !124

Closed
Opened Dec 15, 2016 by iv@iv11 of 11 tasks completed11/11 tasks
  • Report abuse
Report abuse

WIP: gitlab: Upgrade to 8.8.9 + start automation of gitlab-backup

Upgrade

* GitLab Software + patches ported to GitLab 8.8.9;
* Configs synced with upstream and SlapOS-ified;
* Fix promises due to curl upgrade

@jerome @kazuhiko @kirr: if you have any comments, I would be glad to read them. There is a demo instance you can try.

Check on the demo instance for the Gitlab configuration:

  • migrations are all up, when running: gitlab-rake db:migrate:status
  • promises don't fail (including slow ones)
  • web UI seems fine
  • git clone/fetch/push works well
  • email notifications are sent

and Nexedi edition patches:

  • raw blobs download
  • private ones with gitlab-ci token curl -v https://user:token@testinstance/kirr/test/raw/master/hello.txt
  • applying patches in merge-request
  • merge as topic in merge-request
  • "Nexedi edition" being present on front page and on page footers with ICP
  • clone protocol is only HTTPS (not SSH)

No changes are made in gitlab-workhorse and gitlab-shell upstream this time, but Nexedi patches and a cherry-picked commit are applied in a merge request on gitlab-ce.

Note: in order to build the gitlab SR, you need to change gitlab-ce repository to my own, as it is not merged yet:

--- a/software/gitlab/software.cfg
+++ b/software/gitlab/software.cfg
@@ -115,7 +115,7 @@ 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/iv/gitlab-ce.git

Gitlab backup (pull automation)

The idea is to regularly do a gitlab-backup pull for now, so that later, we can add some code to configure the other gitlab instance (not in production) to pull the created backup repo.

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://lab.nexedi.com/iv/slapos.git gitlab-8.8.9
git checkout -b iv/slapos-gitlab-8.8.9 FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/master
git merge --no-ff iv/slapos-gitlab-8.8.9

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 18
  • Commits 3
  • Changes 4
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: nexedi/slapos!124
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7