diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-06-05 14:04:25 +0200 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-06-25 10:32:50 +0200 |
| commit | 266451e68dbe680c4fab702ef0140bf23e71d9fa (patch) | |
| tree | d07c8174cf49e521b065c3f2fe06474b9b3424e8 | |
| parent | 9490c378338bd415ad0a53897a85b6acda4ec676 (diff) | |
| download | gitlab-ce-266451e68dbe680c4fab702ef0140bf23e71d9fa.tar.gz | |
Change path to CI job traces
| -rw-r--r-- | doc/administration/high_availability/gitlab.md | 3 | ||||
| -rw-r--r-- | doc/administration/high_availability/nfs.md | 4 | ||||
| -rw-r--r-- | doc/administration/job_traces.md | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/doc/administration/high_availability/gitlab.md b/doc/administration/high_availability/gitlab.md index 0d9c10687f2..2da23d60af3 100644 --- a/doc/administration/high_availability/gitlab.md +++ b/doc/administration/high_availability/gitlab.md @@ -28,7 +28,6 @@ for each GitLab application server in your environment. 10.1.0.1:/var/opt/gitlab/.ssh /var/opt/gitlab/.ssh nfs defaults,soft,rsize=1048576,wsize=1048576,noatime,nofail,lookupcache=positive 0 2 10.1.0.1:/var/opt/gitlab/gitlab-rails/uploads /var/opt/gitlab/gitlab-rails/uploads nfs defaults,soft,rsize=1048576,wsize=1048576,noatime,nofail,lookupcache=positive 0 2 10.1.0.1:/var/opt/gitlab/gitlab-rails/shared /var/opt/gitlab/gitlab-rails/shared nfs defaults,soft,rsize=1048576,wsize=1048576,noatime,nofail,lookupcache=positive 0 2 - 10.1.0.1:/var/opt/gitlab/gitlab-ci/builds /var/opt/gitlab/gitlab-ci/builds nfs defaults,soft,rsize=1048576,wsize=1048576,noatime,nofail,lookupcache=positive 0 2 10.1.0.1:/var/opt/gitlab/git-data /var/opt/gitlab/git-data nfs defaults,soft,rsize=1048576,wsize=1048576,noatime,nofail,lookupcache=positive 0 2 ``` @@ -36,7 +35,7 @@ for each GitLab application server in your environment. mount locations. ``` - mkdir -p /var/opt/gitlab/.ssh /var/opt/gitlab/gitlab-rails/uploads /var/opt/gitlab/gitlab-rails/shared /var/opt/gitlab/gitlab-ci/builds /var/opt/gitlab/git-data + mkdir -p /var/opt/gitlab/.ssh /var/opt/gitlab/gitlab-rails/uploads /var/opt/gitlab/gitlab-rails/shared /var/opt/gitlab/git-data ``` 1. Download/install GitLab Omnibus using **steps 1 and 2** from diff --git a/doc/administration/high_availability/nfs.md b/doc/administration/high_availability/nfs.md index 87e96b71dd4..94084ee9b8c 100644 --- a/doc/administration/high_availability/nfs.md +++ b/doc/administration/high_availability/nfs.md @@ -130,7 +130,6 @@ NFS mount point is `/gitlab-nfs`. Then, add the following bind mounts in /gitlab-nfs/gitlab-data/.ssh /var/opt/gitlab/.ssh none bind 0 0 /gitlab-nfs/gitlab-data/uploads /var/opt/gitlab/gitlab-rails/uploads none bind 0 0 /gitlab-nfs/gitlab-data/shared /var/opt/gitlab/gitlab-rails/shared none bind 0 0 -/gitlab-nfs/gitlab-data/builds /var/opt/gitlab/gitlab-ci/builds none bind 0 0 ``` Using bind mounts will require manually making sure the data directories @@ -148,8 +147,7 @@ following are the 5 locations need to be shared: | `/var/opt/gitlab/git-data` | Git repository data. This will account for a large portion of your data | `git_data_dirs({"default" => "/var/opt/gitlab/git-data"})` | `/var/opt/gitlab/.ssh` | SSH `authorized_keys` file and keys used to import repositories from some other Git services | `user['home'] = '/var/opt/gitlab/'` | `/var/opt/gitlab/gitlab-rails/uploads` | User uploaded attachments | `gitlab_rails['uploads_directory'] = '/var/opt/gitlab/gitlab-rails/uploads'` -| `/var/opt/gitlab/gitlab-rails/shared` | Build artifacts, GitLab Pages, LFS objects, temp files, etc. If you're using LFS this may also account for a large portion of your data | `gitlab_rails['shared_path'] = '/var/opt/gitlab/gitlab-rails/shared'` -| `/var/opt/gitlab/gitlab-ci/builds` | GitLab CI build traces | `gitlab_ci['builds_directory'] = '/var/opt/gitlab/gitlab-ci/builds'` +| `/var/opt/gitlab/gitlab-rails/shared` | Job artifacts, job traces, GitLab Pages, LFS objects, temp files, etc. If you're using LFS this may also account for a large portion of your data | `gitlab_rails['shared_path'] = '/var/opt/gitlab/gitlab-rails/shared'` Other GitLab directories should not be shared between nodes. They contain node-specific files and GitLab code that does not need to be shared. To ship diff --git a/doc/administration/job_traces.md b/doc/administration/job_traces.md index a5cd2b642dc..54697f09b75 100644 --- a/doc/administration/job_traces.md +++ b/doc/administration/job_traces.md @@ -1,6 +1,6 @@ # Job traces (logs) -By default, all job traces (logs) are saved to `/var/opt/gitlab/gitlab-ci/builds` +By default, all job traces (logs) are saved to `/var/opt/gitlab/shared/asrtifacts` and `/home/git/gitlab/builds` for Omnibus packages and installations from source respectively. The job logs are organized by year and month (for example, `2017_03`), and then by project ID. |